es_out*: added ES_OUT_DEL_GROUP

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index fde8f6143defa29f679518aab06f3c95f024a396..d01e6c76372974eb292ec0b88d2ce9f07fd21659 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -29,11 +29,11 @@
 static char *ppsz_language[] =
 { "auto", "en", "en_GB", "bn", "da", "de", "el", "es",
   "fr", "hi", "hu", "it", "ja", "my", "ne", "nl", "no",
-  "pl", "ps", "pt_BR", "ru", "sv", "tet", "tl" };
+  "pl", "ps", "pt_BR", "ru", "sv", "tet", "tl", "zh_TW" };
 static char *ppsz_language_text[] =
 { N_("Auto"), N_("American"), N_("British"), N_("Bengali"), N_("Danish"), N_("German"), N_("Greek"), N_("Spanish"),
   N_("French"), N_("Hindi"), N_("Hungarian"), N_("Italian"), N_("Japanese"), N_("Burmese"), N_("Nepali"), N_("Dutch"), N_("Norwegian"),
-  N_("Polish"), N_("Pashto"), N_("Brazilian"), N_("Russian"), N_("Swedish"), N_("Tetum"), N_("Tagalog") };
+  N_("Polish"), N_("Pashto"), N_("Brazilian"), N_("Russian"), N_("Swedish"), N_("Tetum"), N_("Tagalog"), N_("Chinese Traditional") };
 
 static char *ppsz_snap_formats[] =
 { "png", "jpg" };
@@ -846,6 +846,10 @@ static char *ppsz_clock_descriptions[] =
 #define SNAP_KEY_TEXT N_("Take video snapshot")
 #define SNAP_KEY_LONGTEXT N_("Takes a video snapshot and writes it to disk.")
 
+#define RECORD_KEY_TEXT N_("Record")
+#define RECORD_KEY_LONGTEXT N_("Record access filter start/stop.")
+
+
 #define VLC_USAGE N_( \
     "Usage: %s [options] [playlistitems] ..." \
     "\nYou can specify multiple playlistitems on the commandline. They will be enqueued in the playlist." \
@@ -918,6 +922,7 @@ vlc_module_begin();
     set_subcategory( SUBCAT_AUDIO_AOUT );
     add_module( "aout", "audio output", NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT,
                 VLC_TRUE );
+        change_short('A');
     set_subcategory( SUBCAT_AUDIO_AFILTER );
     add_module_list_cat( "audio-filter", SUBCAT_AUDIO_AFILTER, 0,
                          NULL, AUDIO_FILTER_TEXT,
@@ -1165,7 +1170,7 @@ vlc_module_begin();
     set_subcategory( SUBCAT_ADVANCED_CPU );
     add_category_hint( N_("CPU"), CPU_CAT_LONGTEXT, VLC_TRUE );
     add_bool( "fpu", 1, NULL, FPU_TEXT, FPU_LONGTEXT, VLC_TRUE );
-#if defined( __i386__ )
+#if defined( __i386__ ) || defined( __x86_64__ )
     add_bool( "mmx", 1, NULL, MMX_TEXT, MMX_LONGTEXT, VLC_TRUE );
     add_bool( "3dn", 1, NULL, THREE_DN_TEXT, THREE_DN_LONGTEXT, VLC_TRUE );
     add_bool( "mmxext", 1, NULL, MMXEXT_TEXT, MMXEXT_LONGTEXT, VLC_TRUE );
@@ -1184,7 +1189,6 @@ vlc_module_begin();
                 MEMCPY_LONGTEXT, VLC_TRUE );
     add_module( "audio-channel-mixer", "audio mixer", NULL, NULL,
                 AUDIO_CHANNEL_MIXER, AUDIO_CHANNEL_MIXER_LONGTEXT, VLC_TRUE );
-        change_short('A');
 
     set_section( N_("Plugins" ), NULL );
     add_bool( "plugins-cache", VLC_TRUE, NULL, PLUGINS_CACHE_TEXT,
@@ -1363,6 +1367,7 @@ vlc_module_begin();
 #   define KEY_PLAY_BOOKMARK10    KEY_UNSET
 #   define KEY_HISTORY_BACK       KEY_MODIFIER_COMMAND|'['
 #   define KEY_HISTORY_FORWARD    KEY_MODIFIER_COMMAND|']'
+#   define KEY_RECORD             KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'r'
 
 #else
 #   define KEY_FULLSCREEN         'f'
@@ -1420,8 +1425,9 @@ vlc_module_begin();
 #   define KEY_PLAY_BOOKMARK8     KEY_F8
 #   define KEY_PLAY_BOOKMARK9     KEY_F9
 #   define KEY_PLAY_BOOKMARK10    KEY_F10
-#   define KEY_HISTORY_BACK       KEY_MODIFIER_CTRL|'['
-#   define KEY_HISTORY_FORWARD    KEY_MODIFIER_CTRL|']'
+#   define KEY_HISTORY_BACK       KEY_MODIFIER_CTRL|'v'
+#   define KEY_HISTORY_FORWARD    KEY_MODIFIER_CTRL|'b'
+#   define KEY_RECORD             KEY_MODIFIER_CTRL|'r'
 #endif
 
     add_key( "key-fullscreen", KEY_FULLSCREEN, NULL, FULLSCREEN_KEY_TEXT,
@@ -1537,6 +1543,8 @@ vlc_module_begin();
              HISTORY_BACK_LONGTEXT, VLC_TRUE );
     add_key( "key-history-forward", KEY_HISTORY_FORWARD, NULL,
              HISTORY_FORWARD_TEXT, HISTORY_FORWARD_LONGTEXT, VLC_TRUE );
+    add_key( "key-record", KEY_RECORD, NULL,
+             RECORD_KEY_TEXT, RECORD_KEY_LONGTEXT, VLC_TRUE );
 
     /* Usage (mainly useful for cmd line stuff) */
     /* add_usage_hint( PLAYLIST_USAGE ); */
@@ -1636,6 +1644,7 @@ static struct hotkey p_hotkeys[] =
     { "key-play-bookmark10", ACTIONID_PLAY_BOOKMARK10, 0},
     { "key-history-back", ACTIONID_HISTORY_BACK, 0},
     { "key-history-forward", ACTIONID_HISTORY_FORWARD, 0},
+    { "key-record", ACTIONID_RECORD, 0 },
     { NULL, 0, 0 }
 };