Improvements to preferences

[vlc] / modules / control / rc.c

diff --git a/modules/control/rc.c b/modules/control/rc.c
index c0bdfa08564ec94492b4fa252d890c038e0f8d6f..23fdd2c764ce2dd197c7941214b6421313b57d07 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -150,6 +150,8 @@ void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... )
 #endif
 
 vlc_module_begin();
+    set_category( CAT_INTERFACE );
+    set_subcategory( SUBCAT_INTERFACE_CONTROL );
     set_description( _("Remote control interface") );
     add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE );
 #ifdef HAVE_ISATTY
@@ -474,7 +476,7 @@ static void Run( intf_thread_t *p_intf )
 
             val.psz_string = psz_arg;
             i_ret = var_Set( p_intf, psz_cmd, val );
-            msg_rc( _("%s: returned %i (%s)\n"),
+            msg_rc( "%s: returned %i (%s)\n",
                     psz_cmd, i_ret, vlc_error( i_ret ) );
         }
         /* Or maybe it's a global command */
@@ -489,7 +491,7 @@ static void Run( intf_thread_t *p_intf )
             i_ret = var_Set( p_intf->p_libvlc, psz_cmd, val );
             if( i_ret != 0 )
             {
-                msg_rc( _("%s: returned %i (%s)\n"),
+                msg_rc( "%s: returned %i (%s)\n",
                          psz_cmd, i_ret, vlc_error( i_ret ) );
             }
         }
@@ -523,12 +525,12 @@ static void Run( intf_thread_t *p_intf )
                     }
                     msg_rc( "| \n" );
                 }
-                msg_rc( _("+----[ end of stream info ]\n") );
+                msg_rc( "+----[ end of stream info ]\n" );
                 vlc_mutex_unlock( &p_input->input.p_item->lock );
             }
             else
             {
-                msg_rc( _("no input\n") );
+                msg_rc( "no input\n" );
             }
         }
         else if( !strcmp( psz_cmd, "is_playing" ) )
@@ -728,7 +730,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
                 var_Get( p_input, "chapter", &val );
                 var_Change( p_input, "chapter", VLC_VAR_GETCHOICES,
                             &val_list, NULL );
-                msg_rc( _("Currently playing chapter %d/%d\n"),
+                msg_rc( "Currently playing chapter %d/%d\n",
                         val.i_int, val_list.p_list->i_count );
                 var_Change( p_this, "chapter", VLC_VAR_FREELIST,
                             &val_list, NULL );
@@ -768,7 +770,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
                 var_Get( p_input, "title", &val );
                 var_Change( p_input, "title", VLC_VAR_GETCHOICES,
                             &val_list, NULL );
-                msg_rc( _("Currently playing title %d/%d\n"),
+                msg_rc( "Currently playing title %d/%d\n",
                         val.i_int, val_list.p_list->i_count );
                 var_Change( p_this, "title", VLC_VAR_FREELIST,
                             &val_list, NULL );
@@ -830,7 +832,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
 
         if( p_item )
         {
-            msg_rc( _("trying to add %s to playlist\n"), newval.psz_string );
+            msg_rc( "trying to add %s to playlist\n", newval.psz_string );
             playlist_AddItem( p_playlist, p_item,
                               PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END );
         }
@@ -846,7 +848,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
         }
         if ( i == 0 )
         {
-            msg_rc( _("| no entries\n") );
+            msg_rc( "| no entries\n" );
         }
     }
  
@@ -855,7 +857,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
      */
     else
     {
-        msg_rc( _("unknown command!\n") );
+        msg_rc( "unknown command!\n" );
     }
 
     vlc_object_release( p_playlist );
@@ -890,12 +892,12 @@ static int Other( vlc_object_t *p_this, char const *psz_cmd,
         if( strlen( newval.psz_string ) > 0 )
         {
             val.psz_string = newval.psz_string;
-            var_Set( p_inp, "marq-marquee", val );
+            var_Set( p_inp->p_libvlc, "marq-marquee", val );
         }
         else 
         {
                 val.psz_string = "";
-                var_Set( p_inp, "marq-marquee", val);
+                var_Set( p_inp->p_libvlc, "marq-marquee", val);
         }
     }
     else if( !strcmp( psz_cmd, "marq-x" ) )
@@ -903,7 +905,7 @@ static int Other( vlc_object_t *p_this, char const *psz_cmd,
         if( strlen( newval.psz_string ) > 0) 
         {
             val.i_int = atoi( newval.psz_string );
-            var_Set( p_inp, "marq-x", val );
+            var_Set( p_inp->p_libvlc, "marq-x", val );
         }
     }
     else if( !strcmp( psz_cmd, "marq-y" ) )
@@ -911,7 +913,7 @@ static int Other( vlc_object_t *p_this, char const *psz_cmd,
         if( strlen( newval.psz_string ) > 0) 
         {
             val.i_int = atoi( newval.psz_string );
-            var_Set( p_inp, "marq-y", val );
+            var_Set( p_inp->p_libvlc, "marq-y", val );
         }
     }
     else if( !strcmp( psz_cmd, "marq-timeout" ) )
@@ -928,7 +930,7 @@ static int Other( vlc_object_t *p_this, char const *psz_cmd,
      */
     else
     {
-        msg_rc( _("unknown command!\n") );
+        msg_rc( "unknown command!\n" );
     }
 
     vlc_object_release( p_pl );
@@ -975,7 +977,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd,
         audio_volume_t i_volume = atoi( newval.psz_string );
         if ( i_volume > AOUT_VOLUME_MAX )
         {
-            msg_rc( _("Volume must be in the range %d-%d\n"), AOUT_VOLUME_MIN,
+            msg_rc( "Volume must be in the range %d-%d\n", AOUT_VOLUME_MIN,
                     AOUT_VOLUME_MAX );
             i_error = VLC_EBADVAR;
         }
@@ -991,7 +993,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd,
         }
         else
         {
-            msg_rc( _("Volume is %d\n"), i_volume );
+            msg_rc( "Volume is %d\n", i_volume );
             i_error = VLC_SUCCESS;
         }
     }
@@ -1023,7 +1025,7 @@ static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd,
             i_error = VLC_EGENERIC;
     }
 
-    if ( !i_error ) msg_rc( _("Volume is %d\n"), i_volume );
+    if ( !i_error ) msg_rc( "Volume is %d\n", i_volume );
     return i_error;
 }
 
@@ -1085,7 +1087,7 @@ static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd,
         }
         var_Change( (vlc_object_t *)p_aout, psz_variable, VLC_VAR_FREELIST,
                     &val, &text );
-        msg_rc( _("+----[ end of %s ]\n"), val_name.psz_string );
+        msg_rc( "+----[ end of %s ]\n", val_name.psz_string );
 
         if( val_name.psz_string ) free( val_name.psz_string );
         i_error = VLC_SUCCESS;