Changeset 1bccb7df0b792afdb9107d5da8d10a174d45778c

Timestamp:

01/23/06 20:09:22 (3 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1138043362 +0000

git-parent:

[3814df3b05159f91a38b1ed240fb623efaa2c917]

git-author:

Clément Stenac <zorglub@videolan.org> 1138043362 +0000

Message:

Add global options for netsync and showintf and hide them from interface (Closes:#508)

Files:

• modules/control/netsync.c (modified) (2 diffs)
• modules/control/showintf.c (modified) (1 diff)
• src/libvlc.c (modified) (1 diff)
• src/libvlc.h (modified) (5 diffs)

modules/control/netsync.c

@@ -66 +66 @@
-
-vlc_module_begin();
-s
+work S
-    set_description( _("Network synchronisation") );
-INTERFACE
-INTERFACE_CONTROL
+ADVANCED
+ADVANCED_MISC
-
-    add_bool( "netsync-master", 0, NULL,
@@ -96 +96 @@
-{
-    intf_thread_t *p_intf = (intf_thread_t*)p_this;
-
-    msg_Info( p_intf, "Using the netsync interface module..." );
-
-    p_intf->p_sys = malloc( sizeof( intf_sys_t ) );

modules/control/showintf.c

@@ -65 +65 @@
-vlc_module_begin();
-    set_shortname( "Showintf" );
-    set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_CONTROL );
-    add_integer( "showintf-threshold", 10, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT, VLC_TRUE );
-Interface showing control interfac
+Show interface with mous
-
-    set_capability( "interface", 0 );

src/libvlc.c

@@ -785 +785 @@
-        char *psz_logmode = "logmode=syslog";
-        AddIntfInternal( 0, "logger", VLC_FALSE, VLC_FALSE, 1, &psz_logmode );
+    }
+
+    if( config_GetInt( p_vlc, "show-intf" ) == 1 )
+    {
+        VLC_AddIntf( 0, "showintf", VLC_FALSE, VLC_FALSE );
+    }
+
+    if( config_GetInt( p_vlc, "network-synchronisation") == 1 )
+    {
+        VLC_AddIntf( 0, "netsync", VLC_FALSE, VLC_FALSE );
-    }
-

src/libvlc.h

@@ -101 +101 @@
-    "never touch.")
-
+#define SHOWINTF_TEXT N_("Show interface with mouse")
+#define SHOWINTF_LONGTEXT N_( \
+    "If this enabled, the interface will be shown when you move the mouse to "\
+    "the edge of the screen in fullscreen mode." )
+
-#define AOUT_CAT_LONGTEXT N_( \
-    "These options allow you to modify the behavior of the audio " \
@@ -345 +350 @@
-    "Allows you to enable/disable the input clock synchronisation for " \
-    "real-time sources.")
+
+#define NETSYNC_TEXT N_("Network synchronisation" )
+#define NETSYNC_LONGTEXT N_( "This allows you to remotely " \
+        "synchronise clocks for server and client. The detailed settings " \
+        "are available in Advanced / Others / Network Sync" )
-
-static int pi_clock_values[] = { -1, 0, 1 };
@@ -1257 +1267 @@
-        change_integer_list( pi_clock_values, ppsz_clock_descriptions, 0 );
-
+    add_bool( "network-synchronisation", VLC_FALSE, NULL, NETSYNC_TEXT,
+              NETSYNC_LONGTEXT, VLC_TRUE );
+
-/* Decoder options */
-    add_category_hint( N_("Decoders"), CODEC_CAT_LONGTEXT , VLC_TRUE );
@@ -1415 +1428 @@
-    set_subcategory( SUBCAT_INTERFACE_GENERAL );
-    add_category_hint( N_("Interface"), INTF_CAT_LONGTEXT , VLC_FALSE );
- module
+s
-    add_module_cat( "intf", SUBCAT_INTERFACE_GENERAL, NULL, NULL, INTF_TEXT,
-                INTF_LONGTEXT, VLC_FALSE );
-        change_short('I');
-
-    set_section ( N_("Extra interface modules" ),  NULL );
-    add_module_list_cat( "extraintf", SUBCAT_INTERFACE_GENERAL,
-                         NULL, NULL, EXTRAINTF_TEXT,
@@ -1437 +1449 @@
-    add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT,
-                    VLC_FALSE );
+
+    add_bool( "show-intf", VLC_FALSE, NULL, SHOWINTF_TEXT, SHOWINTF_LONGTEXT,
+              VLC_FALSE );
-
-    set_subcategory( SUBCAT_INTERFACE_CONTROL );