Use gettext_noop() consistently

[vlc] / modules / visualization / galaktos / plugin.c

diff --git a/modules/visualization/galaktos/plugin.c b/modules/visualization/galaktos/plugin.c
index 0fd0cc2bd805fd2d8dc1ef0a631985960c19875f..7d82a45a5b08740af613407159d3da90c147bfec 100644 (file)
--- a/modules/visualization/galaktos/plugin.c
+++ b/modules/visualization/galaktos/plugin.c
@@ -21,7 +21,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -34,9 +34,9 @@
 #include "video_init.h"
 #include <GL/glu.h>
 
-#include <vlc/input.h>
-#include <vlc/vout.h>
-#include "aout_internal.h"
+#include <vlc_input.h>
+#include <vlc_playlist.h>
+#include <vlc_plugin.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -45,7 +45,7 @@ static int  Open         ( vlc_object_t * );
 static void Close        ( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("GaLaktos visualization plugin") );
+    set_description( N_("GaLaktos visualization plugin") );
     set_capability( "visualization", 0 );
     set_callbacks( Open, Close );
     add_shortcut( "galaktos" );
@@ -82,7 +82,7 @@ static int Open( vlc_object_t *p_this )
     if ( p_filter->input.i_format != VLC_FOURCC('f','l','3','2' )
          || p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
     {
-        msg_Warn( p_filter, "Bad input or output format" );
+        msg_Warn( p_filter, "bad input or output format" );
         return VLC_EGENERIC;
     }
     if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
@@ -121,12 +121,12 @@ static int Open( vlc_object_t *p_this )
     p_thread->psz_title = TitleGet( VLC_OBJECT( p_filter ) );
 
     if( vlc_thread_create( p_thread, "galaktos update thread", Thread,
-                           VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
+                           VLC_THREAD_PRIORITY_LOW, false ) )
     {
         msg_Err( p_filter, "cannot lauch galaktos thread" );
-        if( p_thread->psz_title ) free( p_thread->psz_title );
+        free( p_thread->psz_title );
         vlc_object_detach( p_thread );
-        vlc_object_destroy( p_thread );
+        vlc_object_release( p_thread );
         free( p_sys );
         return VLC_EGENERIC;
     }
@@ -208,20 +208,29 @@ static void Thread( vlc_object_t *p_this )
     }
     vlc_object_attach( p_thread->p_opengl, p_this );
 
+    /* Initialize vout parameters */
+    vout_InitFormat( &p_thread->p_opengl->fmt_in,
+                     VLC_FOURCC('R','V','3','2'),
+                     p_thread->i_width, p_thread->i_height, 1 );
     p_thread->p_opengl->i_window_width = p_thread->i_width;
     p_thread->p_opengl->i_window_height = p_thread->i_height;
     p_thread->p_opengl->render.i_width = p_thread->i_width;
     p_thread->p_opengl->render.i_height = p_thread->i_width;
     p_thread->p_opengl->render.i_aspect = VOUT_ASPECT_FACTOR;
-    p_thread->p_opengl->b_scale = VLC_TRUE;
+    p_thread->p_opengl->b_scale = true;
+    p_thread->p_opengl->b_fullscreen = false;
+    p_thread->p_opengl->i_alignment = 0;
+    p_thread->p_opengl->fmt_in.i_sar_num = 1;
+    p_thread->p_opengl->fmt_in.i_sar_den = 1;
+    p_thread->p_opengl->fmt_render = p_thread->p_opengl->fmt_in;
 
     p_thread->p_module =
         module_Need( p_thread->p_opengl, "opengl provider", NULL, 0 );
     if( p_thread->p_module == NULL )
     {
-        msg_Err( p_thread, "No OpenGL provider found" );
+        msg_Err( p_thread, "unable to initialize OpenGL" );
         vlc_object_detach( p_thread->p_opengl );
-        vlc_object_destroy( p_thread->p_opengl );
+        vlc_object_release( p_thread->p_opengl );
         return;
     }
 
@@ -237,13 +246,10 @@ static void Thread( vlc_object_t *p_this )
         mspf = 1000 / 60;
         if( galaktos_update( p_thread ) == 1 )
         {
-            p_thread->b_die = 1;
-        }
-        if( p_thread->psz_title )
-        {
-            free( p_thread->psz_title );
-            p_thread->psz_title = NULL;
+            vlc_object_kill( p_thread );
         }
+        free( p_thread->psz_title );
+        p_thread->psz_title = NULL;
 
         if (++count%100==0)
         {
@@ -262,7 +268,7 @@ static void Thread( vlc_object_t *p_this )
     /* Free the openGL provider */
     module_Unneed( p_thread->p_opengl, p_thread->p_module );
     vlc_object_detach( p_thread->p_opengl );
-    vlc_object_destroy( p_thread->p_opengl );
+    vlc_object_release( p_thread->p_opengl );
 }
 
 /*****************************************************************************
@@ -274,7 +280,7 @@ static void Close( vlc_object_t *p_this )
     aout_filter_sys_t *p_sys = p_filter->p_sys;
 
     /* Stop galaktos Thread */
-    p_sys->p_thread->b_die = VLC_TRUE;
+    vlc_object_kill( p_sys->p_thread );
 
     galaktos_done( p_sys->p_thread );
 
@@ -282,7 +288,7 @@ static void Close( vlc_object_t *p_this )
 
     /* Free data */
     vlc_object_detach( p_sys->p_thread );
-    vlc_object_destroy( p_sys->p_thread );
+    vlc_object_release( p_sys->p_thread );
 
     free( p_sys );
 }
@@ -295,7 +301,8 @@ static char *TitleGet( vlc_object_t *p_this )
 
     if( p_input )
     {
-        char *psz = strrchr( p_input->input.p_item->psz_uri, '/' );
+        char *psz_orig = input_item_GetURI( input_GetItem( p_input ) );
+        char *psz = strrchr( psz_orig, '/' );
 
         if( psz )
         {
@@ -303,12 +310,13 @@ static char *TitleGet( vlc_object_t *p_this )
         }
         else
         {
-            psz = p_input->input.p_item->psz_uri;
+            psz = psz_orig;
         }
         if( psz && *psz )
         {
             psz_title = strdup( psz );
         }
+        free( psz_orig );
         vlc_object_release( p_input );
     }