* all: now both GLX 1.2 and 1.3 are supported

modules/visualization/galaktos/glx.h

@@ -26,8 +26,7 @@
 
 #include "plugin.h"
 
-int galaktos_glx_init( galaktos_thread_t *p_thread, int i_width, int i_height,
-                       int b_fullscreen );
+int galaktos_glx_init( galaktos_thread_t *p_thread );
 void galaktos_glx_done( galaktos_thread_t *p_thread );
 int galaktos_glx_handle_events( galaktos_thread_t *p_thread );
 void galaktos_glx_activate_pbuffer( galaktos_thread_t *p_thread );

modules/visualization/galaktos/main.c

@@ -127,8 +127,8 @@ int galaktos_init( galaktos_thread_t *p_thread )
     initPresetLoader();
 
     /* Load default preset directory */
- //   loadPresetDir("/home/cyril/.vlc/galaktos");
-    loadPresetDir("/etc/projectM/presets");
+    loadPresetDir("/home/cyril/.vlc/galaktos");
+//    loadPresetDir("/etc/projectM/presets");
 
     initPCM(maxsamples);
     initBeatDetect();
@@ -207,7 +207,7 @@ int galaktos_update( galaktos_thread_t *p_thread )
     //and then we perform our manipulations on it
     //in pass 2 we will copy the texture into texture memory
 
- //   galaktos_glx_activate_pbuffer( p_thread );
+  //  galaktos_glx_activate_pbuffer( p_thread );
 
     glPushAttrib( GL_ALL_ATTRIB_BITS ); /* Overkill, but safe */
 

modules/visualization/galaktos/plugin.c

@@ -113,7 +113,10 @@ static int Open( vlc_object_t *p_this )
     p_thread->i_cur_sample = 0;
     bzero( p_thread->p_data, 2*2*512 );
 
-    galaktos_glx_init( p_thread, 600, 600, 0 );
+    p_thread->i_width = 600;
+    p_thread->i_height = 600;
+    p_thread->b_fullscreen = 0;
+    galaktos_glx_init( p_thread );
     galaktos_init( p_thread );
 
     p_thread->i_channels = aout_FormatNbChannels( &p_filter->input );
@@ -199,10 +202,9 @@ static void Thread( vlc_object_t *p_this )
     int timed=0;
     int timestart=0;
     int mspf=0;
-    int w = 600, h = 600;
 
     galaktos_glx_activate_window( p_thread );
-    setup_opengl( w, h );
+    setup_opengl( p_thread->i_width, p_thread->i_height );
     CreateRenderTarget(512, &RenderTargetTextureID, NULL);
 
     timestart=mdate()/1000;

modules/visualization/galaktos/plugin.h

@@ -35,9 +35,15 @@ typedef struct
 
     char          *psz_title;
 
+    /* Window properties */
+    int           i_width;
+    int           i_height;
+    int           b_fullscreen;
+
     /* Audio properties */
     int           i_channels;
 
+    /* Audio buffer */
     int16_t       p_data[2][512];
     int           i_cur_sample;