This fixes bugs 1285 and 1343

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index 8d54c51d914b3b38de8eacd4fb5d4480e12670de..0e95d43ac8bf71f27da268b04a2f63073a051e4d 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -2,7 +2,7 @@
  * libvlc.h: main libvlc header
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.h,v 1.110 2003/11/29 18:36:13 massiot Exp $
+ * $Id: libvlc.h,v 1.115 2003/12/09 00:46:03 yoann Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -98,7 +98,7 @@ static char *ppsz_language_text[] =
 #define AOUT_CAT_LONGTEXT N_( \
     "These options allow you to tune VLC's audio subsystem, " \
     "and to add audio filters which can be used for " \
-    "postprocessing or visual effects (spectrum analyser,...).\n" \
+    "postprocessing or visual effects (spectrum analyzer, ...).\n" \
     "To tune these filters, have a look at the \"audio filter\" " \
     "plugin options.")
 
@@ -221,6 +221,10 @@ static char *ppsz_language_text[] =
     "If enabled, VLC will try to take advantage of the overlay capabilities " \
     "of your graphics card.")
 
+#define VIDEO_ON_TOP_TEXT N_("Always on top")
+#define VIDEO_ON_TOP_LONGTEXT N_("Always place the video window on top of " \
+    "other windows" )
+
 #define SPUMARGIN_TEXT N_("Force SPU position")
 #define SPUMARGIN_LONGTEXT N_( \
     "You can use this option to place the subtitles under the movie, " \
@@ -335,6 +339,10 @@ static char *ppsz_language_text[] =
 #define VCD_DEV_LONGTEXT N_( \
     "This is the default VCD device to use.")
 
+#define CDAUDIO_DEV_TEXT N_("CD Audio device")
+#define CDAUDIO_DEV_LONGTEXT N_( \
+    "This is the default CD Audio device to use.")
+                                                                                                                            
 #define IPV6_TEXT N_("Force IPv6")
 #define IPV6_LONGTEXT N_( \
     "If you check this box, IPv6 will be used by default for all UDP and " \
@@ -436,7 +444,7 @@ static char *ppsz_language_text[] =
     "advantage of them.")
 
 #define PLAYLIST_CAT_LONGTEXT N_( \
-     "These options define the behaviour of the playlist. Some " \
+     "These options define the behavior of the playlist. Some " \
      "of them can be overriden in the playlist dialog box." )
 
 #define RANDOM_TEXT N_("Play files randomly forever")
@@ -479,6 +487,9 @@ static char *ppsz_language_text[] =
     "slow. You should only activate this if you know what you're " \
     "doing.")
 
+#define MINIMIZE_THREADS_TXT N_("Minimize number of threads needed to run VLC")
+#define MINIMIZE_THREADS_LONGTXT N_("Minimize number of threads needed to run VLC")
+
 #define ONEINSTANCE_TEXT N_("Allow only one running instance of VLC")
 #define ONEINSTANCE_LONGTEXT N_( \
     "Allowing only one running instance of VLC can sometimes be useful, " \
@@ -653,7 +664,7 @@ vlc_module_begin();
     add_bool( "video", 1, NULL, VIDEO_TEXT, VIDEO_LONGTEXT, VLC_TRUE );
     add_integer( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, VLC_TRUE );
     add_integer( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, VLC_TRUE );
-    add_integer( "align", -1, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, VLC_TRUE );
+    add_integer( "align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, VLC_TRUE );
     add_float( "zoom", 1, NULL, ZOOM_TEXT, ZOOM_LONGTEXT, VLC_TRUE );
     add_bool( "grayscale", 0, NULL, GRAYSCALE_TEXT, GRAYSCALE_LONGTEXT, VLC_TRUE );
     add_bool( "fullscreen", 0, NULL, FULLSCREEN_TEXT,
@@ -661,6 +672,8 @@ vlc_module_begin();
 #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 );
     add_integer( "spumargin", -1, NULL, SPUMARGIN_TEXT,
                         SPUMARGIN_LONGTEXT, VLC_TRUE );
     add_bool( "osd", 1, NULL, OSD_TEXT, OSD_LONGTEXT, VLC_FALSE );
@@ -699,6 +712,7 @@ vlc_module_begin();
 
     add_file( "dvd", DVD_DEVICE, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT, VLC_FALSE );
     add_file( "vcd", VCD_DEVICE, NULL, VCD_DEV_TEXT, VCD_DEV_LONGTEXT, VLC_FALSE );
+    add_file( "cd-audio", CDAUDIO_DEVICE, NULL, CDAUDIO_DEV_TEXT, CDAUDIO_DEV_LONGTEXT, VLC_FALSE );
 
     add_bool( "ipv6", 0, NULL, IPV6_TEXT, IPV6_LONGTEXT, VLC_FALSE );
         change_short('6');
@@ -761,6 +775,8 @@ vlc_module_begin();
     add_module( "access", "access", NULL, NULL, ACCESS_TEXT, ACCESS_LONGTEXT, VLC_TRUE );
     add_module( "demux", "demux", NULL, NULL, DEMUX_TEXT, DEMUX_LONGTEXT, VLC_TRUE );
 
+    add_bool( "minimize-threads", 0, NULL, MINIMIZE_THREADS_TXT, MINIMIZE_THREADS_LONGTXT, VLC_TRUE );
+
 #if !defined(SYS_DARWIN) && !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H)
     add_bool( "rt-priority", 0, NULL, RT_PRIORITY_TEXT, RT_PRIORITY_LONGTEXT, VLC_TRUE );
 #endif