Changeset 421866e2f073d8ff0fa0bf90477bb120b4dd5df5

Timestamp:

07/12/04 20:02:57 (4 years ago)

Author:

Cyril Deguet <asmax@videolan.org>

git-committer:

Cyril Deguet <asmax@videolan.org> 1089655377 +0000

git-parent:

[ce1924e31356b475e85cc73cdbe1e4ccee8913ca]

git-author:

Cyril Deguet <asmax@videolan.org> 1089655377 +0000

Message:

• all: skeleton of a coming-soon OpenGL visualization plugin, compatible
  with MilkDrop? for winamp.
  

Files:

• build-vlc (modified) (3 diffs)
• config.in (modified) (2 diffs)
• configure.ac (modified) (2 diffs)
• modules/visualization/galaktos/Modules.am (added)
• modules/visualization/galaktos/glx.c (added)
• modules/visualization/galaktos/glx.h (added)
• modules/visualization/galaktos/plugin.c (added)
• modules/visualization/galaktos/plugin.h (added)
• src/audio_output/input.c (modified) (4 diffs)

build-vlc

@@ -3 +3 @@
-FEATURES="
-SKINS skins
-
+
+
-WXWINDOWS wxwindows
-OPIE opie
@@ -81 +82 @@
-WITHFFMPEGMP3LAME ffmpeg-mp3lame
-WITHFFMPEGFAAC ffmpeg-faac
+GALAKTOS galaktos
-"
-PATHS="
@@ -137 +139 @@
-   if [ "$x" == "y" ]
-   then
-
-
-
-
+
-      then
-         echo -n "--with-$2 " >> .cmd
-      else
-         echo -n "--enable-$2 " >> .cmd
- fi
+
-   else
-
-
-
-
+
-      then
-         echo -n "--without-$2 " >> .cmd
-      else
-         echo -n "--disable-$2 " >> .cmd
- fi
+
-   fi
-   shift; shift

config.in

@@ -17 +17 @@
-  string 'xml2-config path' CONFIG_WITHXML2CONFIGPATH ""
-fi
+bool 'Familiar GTK+ support' CONFIG_FAMILIAR
-# TODO: --enable-pda
-bool 'wxWindows support' CONFIG_WXWINDOWS
@@ -37 +38 @@
-  string 'goom tree for static linking' CONFIG_WITHGOOMTREE ""
-fi
+bool 'GaLaktos visualization plugin' CONFIG_GALAKTOS
-bool 'SLP service discovery support' CONFIG_SLP
-if [ "$CONFIG_SLP" = "y" ]; then

configure.ac

@@ -3341 +3341 @@
-dnl
-AC_ARG_ENABLE(visual,
- 
+
-if test "${enable_visual}" != "no"
-then
-    VLC_ADD_PLUGINS([visual])
+fi
+
+dnl
+dnl OpenGL visualisation plugin
+dnl
+AC_ARG_ENABLE(galaktos,
+  [  --enable-galaktos       OpenGL visualisation plugin (default disabled)])
+if test "${enable_galaktos}" = "yes"
+then
+    VLC_ADD_PLUGINS([galaktos])
+    VLC_ADD_LDFLAGS([galaktos],[-lGL -lGLU])
-fi
-
@@ -3856 +3867 @@
-  modules/visualization/Makefile
-  modules/visualization/visual/Makefile
+  modules/visualization/galaktos/Makefile
-])
-

src/audio_output/input.c

@@ -123 +123 @@
-        }
-
+        /* Look for galaktos plugin */
+        p_module = config_FindModule( VLC_OBJECT(p_aout), "galaktos" );
+        if( p_module )
+        {
+            val.psz_string = "galaktos"; text.psz_string = _("GaLaktos");
+            var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
+        }
+
-        if( var_Get( p_aout, "effect-list", &val ) == VLC_SUCCESS )
-        {
@@ -564 +572 @@
-        ChangeFiltersString( p_aout, "goom", VLC_FALSE );
-        ChangeFiltersString( p_aout, "visual", VLC_FALSE );
+        ChangeFiltersString( p_aout, "galaktos", VLC_FALSE );
-    }
-    else
@@ -571 +580 @@
-            ChangeFiltersString( p_aout, "visual", VLC_FALSE );
-            ChangeFiltersString( p_aout, "goom", VLC_TRUE );
+            ChangeFiltersString( p_aout, "galaktos", VLC_FALSE );
+        }
+        else if( !strcmp( "galaktos", psz_mode ) )
+        {
+            ChangeFiltersString( p_aout, "visual", VLC_FALSE );
+            ChangeFiltersString( p_aout, "goom", VLC_FALSE );
+            ChangeFiltersString( p_aout, "galaktos", VLC_TRUE );
-        }
-        else
@@ -580 +596 @@
-            ChangeFiltersString( p_aout, "goom", VLC_FALSE );
-            ChangeFiltersString( p_aout, "visual", VLC_TRUE );
+            ChangeFiltersString( p_aout, "galaktos", VLC_FALSE );
-        }
-    }