Changeset 2e3847698a715d877bf4506f4d100ba927ca0696

Timestamp:

03/10/05 14:05:43 (3 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[dc2014f8d4f72015139e552b3fa67a14a33227d5]

git-author:

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

Message:

More prefs fixes
- String fixes
- Sort some large panels
- Change some advanced flags
- Fix & move audio-channel-mixer
- hide picture vout
- Remove saved-volume, replaced by a variable

Files:

• include/vlc_config_cat.h (modified) (1 diff)
• modules/audio_filter/equalizer.c (modified) (1 diff)
• modules/video_output/directx/glwin32.c (modified) (1 diff)
• modules/video_output/image.c (modified) (1 diff)
• modules/video_output/picture.c (modified) (1 diff)
• modules/video_output/x11/glx.c (modified) (1 diff)
• modules/visualization/visual/visual.c (modified) (1 diff)
• src/audio_output/intf.c (modified) (4 diffs)
• src/libvlc.h (modified) (13 diffs)

include/vlc_config_cat.h

@@ -176 +176 @@
-
-#define CPU_TITLE N_( "CPU features" )
-a
+
-
-#define MISC_TITLE N_( "Other" )

modules/audio_filter/equalizer.c

@@ -70 +70 @@
-
-    add_string( "equalizer-preset", "flat", NULL, PRESET_TEXT,
-TRU
+FALS
-        change_string_list( preset_list, preset_list_text, 0 );
-    add_string( "equalizer-bands", NULL, NULL, BANDS_TEXT,

modules/video_output/directx/glwin32.c

@@ -62 +62 @@
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-
+
+
-    set_capability( "opengl provider", 100 );
-    add_shortcut( "glwin32" );

modules/video_output/image.c

@@ -61 +61 @@
-
-vlc_module_begin( );
-
+ file
-    set_description( _( "Image video output" ) );
-    set_category( CAT_VIDEO );

modules/video_output/picture.c

@@ -106 +106 @@
-    set_shortname( _( "Picture" ) );
-    set_description(_("VLC internal picture video output") );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    set_capability( "video output", 0 );
-

modules/video_output/x11/glx.c

@@ -113 +113 @@
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-X11 OpenGL provider
+OpenGL video output
-    set_capability( "opengl provider", 50 );
-    set_callbacks( CreateOpenGL, DestroyOpenGL );

modules/visualization/visual/visual.c

@@ -86 +86 @@
-    set_section( N_("Spectrum analyser") , NULL );
-    add_integer("visual-nbbands", 80, NULL,
-FALS
+TRU
-    add_integer("visual-separ", 1, NULL,
-FALS
+TRU
-    add_integer("visual-amp", 3, NULL,
-FALS
+TRU
-    add_bool("visual-peaks", VLC_TRUE, NULL,
-FALS
+TRU
-    set_section( N_( "Random effect") , NULL );
-    add_integer("visual-stars", 200, NULL,
-FALS
+TRU
-    set_capability( "visualization", 0 );
-    set_callbacks( Open, Close );

src/audio_output/intf.c

@@ -145 +145 @@
-    }
-    config_PutInt( p_object, "volume", i );
-
+
+
-    if ( pi_volume != NULL ) *pi_volume = (audio_volume_t)i;
-
@@ -181 +182 @@
-    }
-    config_PutInt( p_object, "volume", i );
-
+
+
-    if ( pi_volume != NULL ) *pi_volume = (audio_volume_t)i;
-
@@ -213 +215 @@
-        /* Mute */
-        i_result = aout_VolumeSet( p_object, AOUT_VOLUME_MIN );
-
+
+
-        if ( pi_volume != NULL ) *pi_volume = AOUT_VOLUME_MIN;
-    }
@@ -219 +222 @@
-    {
-        /* Un-mute */
-
+
+
+
-        i_result = aout_VolumeSet( p_object, i_volume );
-        if ( pi_volume != NULL ) *pi_volume = i_volume;

src/libvlc.h

@@ -527 +527 @@
-    "stream output subsystem." )
-
-Choose a stream output
+Default stream output chain
-#define SOUT_LONGTEXT N_( \
-
+
+
+
-
-#define SOUT_ALL_TEXT N_("Enable streaming of all ES")
@@ -625 +627 @@
-    "interrupted.")
-
-Loop playlist on end
+Repeat all
-#define LOOP_LONGTEXT N_( \
-    "If you want VLC to keep playing the playlist indefinitely then enable " \
-    "this option.")
-
-the 
+
-#define REPEAT_LONGTEXT N_( \
-    "When this is active, VLC will keep playing the current playlist item " \
@@ -637 +639 @@
-#define PAS_TEXT N_("Play and stop")
-#define PAS_LONGTEXT N_( \
-
-
+
-
-#define MISC_CAT_LONGTEXT N_( \
@@ -876 +877 @@
-                            AOUT_VOLUME_MAX, NULL, VOLUME_TEXT,
-                            VOLUME_LONGTEXT, VLC_FALSE );
-    add_integer_with_range( "saved-volume", AOUT_VOLUME_DEFAULT,
-                            AOUT_VOLUME_MIN, AOUT_VOLUME_MAX, NULL,
-                            VOLUME_SAVE_TEXT, VOLUME_SAVE_LONGTEXT, VLC_TRUE );
-    add_integer( "aout-rate", -1, NULL, AOUT_RATE_TEXT,
-                 AOUT_RATE_LONGTEXT, VLC_TRUE );
@@ -898 +896 @@
-    add_module( "audio-visual", "visualization",NULL, NULL,AUDIO_VISUAL_TEXT,
-                AUDIO_VISUAL_LONGTEXT, VLC_FALSE );
-    set_subcategory( SUBCAT_AUDIO_MISC );
-    add_module_cat( "audio-channel-mixer", SUBCAT_AUDIO_MISC, NULL, NULL,
-                AUDIO_CHANNEL_MIXER, AUDIO_CHANNEL_MIXER_LONGTEXT, VLC_FALSE );
-        change_short('A');
-
-    /* Video options */
@@ -907 +901 @@
-    set_subcategory( SUBCAT_VIDEO_GENERAL );
-    add_bool( "video", 1, NULL, VIDEO_TEXT, VIDEO_LONGTEXT, VLC_TRUE );
+    add_bool( "grayscale", 0, NULL, GRAYSCALE_TEXT,
+              GRAYSCALE_LONGTEXT, VLC_FALSE );
+    add_bool( "fullscreen", 0, NULL, FULLSCREEN_TEXT,
+              FULLSCREEN_LONGTEXT, VLC_FALSE );
+        change_short('f');
+    add_bool( "skip-frames", 1, NULL, SKIP_FRAMES_TEXT,
+              SKIP_FRAMES_LONGTEXT, VLC_TRUE );
+#ifndef SYS_DARWIN
+    add_bool( "overlay", 1, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT, VLC_TRUE );
+#endif
+    add_bool( "video-on-top", 0, NULL, VIDEO_ON_TOP_TEXT,
+              VIDEO_ON_TOP_LONGTEXT, VLC_FALSE );
+
+    set_section( N_("Snapshot") , NULL );
+    add_directory( "snapshot-path", NULL, NULL, SNAP_PATH_TEXT,
+                   SNAP_PATH_LONGTEXT, VLC_FALSE );
+    add_string( "snapshot-format", "png", NULL, SNAP_FORMAT_TEXT,
+                   SNAP_FORMAT_LONGTEXT, VLC_TRUE );
+        change_string_list( ppsz_snap_formats, NULL, 0 );
+
+    set_section( N_("Window properties" ), NULL );
-    add_integer( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, VLC_TRUE );
-    add_integer( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, VLC_TRUE );
-    add_integer( "video-x", -1, NULL, VIDEOX_TEXT, VIDEOX_LONGTEXT, VLC_TRUE );
-    add_integer( "video-y", -1, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, VLC_TRUE );
+    add_string( "aspect-ratio", "", NULL,
+               ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_TRUE );
-    add_bool( "video-deco", 1, NULL, VIDEO_DECO_TEXT,
-              VIDEO_DECO_LONGTEXT, VLC_TRUE );
@@ -918 +935 @@
-        change_integer_list( pi_align_values, ppsz_align_descriptions, 0 );
-    add_float( "zoom", 1, NULL, ZOOM_TEXT, ZOOM_LONGTEXT, VLC_TRUE );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    set_subcategory( SUBCAT_VIDEO_VOUT );
@@ -957 +956 @@
-
-    set_section( N_("Subtitles") , NULL );
+    add_file( "sub-file", NULL, NULL, SUB_FILE_TEXT,
+              SUB_FILE_LONGTEXT, VLC_FALSE );
-    add_bool( "sub-autodetect-file", VLC_TRUE, NULL,
-                 SUB_AUTO_TEXT, SUB_AUTO_LONGTEXT, VLC_FALSE );
@@ -968 +969 @@
-    add_string( "sub-autodetect-path", SUB_PATH, NULL,
-                 SUB_PATH_TEXT, SUB_PATH_LONGTEXT, VLC_TRUE );
-    add_file( "sub-file", NULL, NULL, SUB_FILE_TEXT,
-              SUB_FILE_LONGTEXT, VLC_TRUE );
-    add_integer( "sub-margin", -1, NULL, SUB_MARGIN_TEXT,
-                 SUB_MARGIN_LONGTEXT, VLC_TRUE );
@@ -976 +975 @@
-    add_module_list_cat( "sub-filter", SUBCAT_VIDEO_SUBPIC, NULL, NULL,
-                SUB_FILTER_TEXT, SUB_FILTER_LONGTEXT, VLC_TRUE );
-
-//    set_subcategory( SUBCAT_VIDEO_TEXT );
-
-    /* Input options */
@@ -1137 +1134 @@
-    /* Misc options */
-    set_subcategory( SUBCAT_ADVANCED_MISC );
+    set_section( N_("Special modules"), NULL );
-    add_module( "memcpy", "memcpy", NULL, NULL, MEMCPY_TEXT,
-                MEMCPY_LONGTEXT, VLC_TRUE );
-
-
+
+
+
+
+
-    add_bool( "plugins-cache", VLC_TRUE, NULL, PLUGINS_CACHE_TEXT,
-              PLUGINS_CACHE_LONGTEXT, VLC_TRUE );
-    add_directory( "plugin-path", NULL, NULL, PLUGIN_PATH_TEXT,
-                   PLUGIN_PATH_LONGTEXT, VLC_TRUE );
-
-
-
-
-
-
-
+
+
+
+
-
-#if !defined(SYS_DARWIN) && !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H)
@@ -1174 +1172 @@
-#endif
-
+    set_section( N_("Miscellaneous" ), NULL );
+    add_string( "vlm-conf", NULL, NULL, VLM_CONF_TEXT,
+                    VLM_CONF_LONGTEXT, VLC_TRUE );
+
+#if !defined(WIN32)
+    add_bool( "daemon", 0, NULL, DAEMON_TEXT, DAEMON_LONGTEXT, VLC_TRUE );
+        change_short('d');
+#endif
+
-    /* Playlist options */
-    set_category( CAT_PLAYLIST );
@@ -1182 +1189 @@
-    add_bool( "loop", 0, NULL, LOOP_TEXT, LOOP_LONGTEXT, VLC_FALSE );
-        change_short('L');
-TRU
+FALS
-        change_short('R');
-TRU
+FALS
-
-    set_subcategory( SUBCAT_PLAYLIST_SD );