* extras/MacOSX/Resources/English.lproj/MainMenu.nib

* modules/gui/macosx/output.m:
  - changed the textfields for bitrate into comboboxes with suggested values
    identical to the ones in wxwindows intf.
  - changed "bitrate (bps)" into "bitrate (kb/s)
* modules/gui/macosx/prefs.?:
  - update the current view when advanced is changed.
  - module_lists now use the description strings.
  - always wraptext on tooltips. Currently japanese language is breaking.
  - we now have sliders for int/float config options with ranges.
  - fixed a warning message about an un-init'ed module_t.
* modules/video_filter/adjust.c:
  - added the ranges to the description strings of the config options.
  - blur-factor now uses a range as according to it's description string
    it already should have used this.

modules/gui/macosx/output.m

@@ -2,7 +2,7 @@
  * output.m: MacOS X Output Dialog
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: output.m,v 1.6 2003/05/25 17:27:13 massiot Exp $
+ * $Id: output.m,v 1.7 2003/05/26 01:25:12 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -112,6 +112,10 @@
 
 - (void)initStrings
 {
+    NSArray *o_a_bitrates = [NSArray arrayWithObjects:@"96", @"128", @"192", @"256", @"512", nil];
+    NSArray *o_v_bitrates = [NSArray arrayWithObjects:
+        @"100", @"150", @"200", @"400", @"500", @"500", @"750", @"1000", @"2000", @"3000", nil];
+    
     [o_output_ckbox setTitle: _NS("Advanced output:")];
     [o_output_settings setTitle: _NS("Settings...")];
     [o_btn_ok setTitle: _NS("OK")];
@@ -146,11 +150,13 @@
     [[o_transcode_video_selector itemAtIndex: 5] setTitle: @"H263"];
     [[o_transcode_video_selector itemAtIndex: 6] setTitle: @"I263"];
     [[o_transcode_video_selector itemAtIndex: 7] setTitle: @"WMV1"];
-    [o_transcode_video_bitrate_lbl setStringValue: _NS("Bitrate (bps)")];
+    [o_transcode_video_bitrate_lbl setStringValue: _NS("Bitrate (kb/s)")];
+    [o_transcode_video_bitrate addItemsWithObjectValues: o_v_bitrates];
     [o_transcode_audio_chkbox setTitle: _NS("Audio")];
-    [[o_transcode_audio_selector itemAtIndex: 0] setTitle: _NS("mpga")];
-    [[o_transcode_audio_selector itemAtIndex: 1] setTitle: _NS("a52 ")];
-    [o_transcode_audio_bitrate_lbl setStringValue: _NS("Bitrate (bps)")];
+    [[o_transcode_audio_selector itemAtIndex: 0] setTitle: @"mpga"];
+    [[o_transcode_audio_selector itemAtIndex: 1] setTitle: @"a52 "];
+    [o_transcode_audio_bitrate_lbl setStringValue: _NS("Bitrate (kb/s)")];
+    [o_transcode_audio_bitrate addItemsWithObjectValues: o_a_bitrates];
 }
 
 - (IBAction)outputChanged:(id)sender;

modules/gui/macosx/prefs.h

@@ -2,7 +2,7 @@
  * prefs.h: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: prefs.h,v 1.7 2003/05/25 17:27:13 massiot Exp $
+ * $Id: prefs.h,v 1.8 2003/05/26 01:25:12 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *
@@ -155,6 +155,7 @@ INTF_CONTROL_CONFIG(Button);
 INTF_CONTROL_CONFIG(PopUpButton);
 INTF_CONTROL_CONFIG(ComboBox);
 INTF_CONTROL_CONFIG(TextField);
+INTF_CONTROL_CONFIG(Slider);
 
 #define CONTROL_CONFIG( obj, mname, ctype, cname ) \
     { \

modules/video_filter/adjust.c

@@ -2,7 +2,7 @@
  * adjust.c : Contrast/Hue/Saturation/Brightness video plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
- * $Id: adjust.c,v 1.12 2003/05/15 22:27:37 massiot Exp $
+ * $Id: adjust.c,v 1.13 2003/05/26 01:25:12 hartman Exp $
  *
  * Authors: Simon Latapie <garf@via.ecp.fr>
  *
@@ -58,13 +58,13 @@ static int  SendEvents( vlc_object_t *, char const *,
  *****************************************************************************/
 
 #define CONT_TEXT N_("Set image contrast")
-#define CONT_LONGTEXT N_("Set the image contrast. Defaults to 1")
+#define CONT_LONGTEXT N_("Set the image contrast, between 0 and 2. Defaults to 1")
 #define HUE_TEXT N_("Set image hue")
 #define HUE_LONGTEXT N_("Set the image hue, between 0 and 360. Defaults to 0")
 #define SAT_TEXT N_("Set image saturation")
-#define SAT_LONGTEXT N_("Set the image saturation. Defaults to 1")
+#define SAT_LONGTEXT N_("Set the image saturation, between 0 and 3. Defaults to 1")
 #define LUM_TEXT N_("Set image brightness")
-#define LUM_LONGTEXT N_("Set the image brightness. Defaults to 1")
+#define LUM_LONGTEXT N_("Set the image brightness, between 0 and 2. Defaults to 1")
 
 
 vlc_module_begin();

modules/video_filter/motionblur.c

@@ -2,7 +2,7 @@
  * motion_blur.c : motion blur filter for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
- * $Id: motionblur.c,v 1.11 2003/05/15 22:27:37 massiot Exp $
+ * $Id: motionblur.c,v 1.12 2003/05/26 01:25:12 hartman Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *
@@ -56,7 +56,7 @@ static int  SendEvents( vlc_object_t *, char const *,
 
 vlc_module_begin();
     add_category_hint( N_("Miscellaneous"), NULL, VLC_FALSE );
-    add_integer( "blur-factor", 80, NULL, MODE_TEXT, MODE_LONGTEXT, VLC_FALSE );
+    add_integer_with_range( "blur-factor", 80, 1, 127, NULL, MODE_TEXT, MODE_LONGTEXT, VLC_FALSE );
     set_description( _("motion blur filter") );
     set_capability( "video filter", 0 );
     set_callbacks( Create, Destroy );