Added some stuff to make sure that we get nice fps values for screen capture (range...

diff --git a/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib
index f0b6ef9c33db8862cd4f646f8e55ba80c2c12f7e..e221b68670a6ce6b99f2218f785e95c0178a1c45 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib
+++ b/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib
@@ -268,7 +268,6 @@
                 eyetvLaunch = id;
                 eyetvSwitchChannel = id;
                 openCaptureModeChanged = id;
-                openCaptureStepperChanged = id;
                 openDisc = id;
                 openDiscMenusChanged = id;
                 openDiscStepperChanged = id;
@@ -283,6 +282,7 @@
                 openVTSBrowse = id;
                 panelCancel = id;
                 panelOk = id;
+                screenStepperChanged = id;
                 subCloseSheet = id;
                 subDelayStepperChanged = id;
                 subFileBrowse = id;

diff --git a/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib
index 310979270609f850e8c6f78bd53c3f1ad9cb6dfc..c1735bcde48786db90b50cd17e0f6457846f1f67 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib
+++ b/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib
@@ -13,7 +13,7 @@
                <key>2304</key>
                <string>366 462 547 183 0 0 1280 778 </string>
                <key>2346</key>
-               <string>366 462 548 183 0 0 1280 778 </string>
+               <string>15 513 548 183 0 0 1280 778 </string>
        </dict>
        <key>IBFramework Version</key>
        <string>489.0</string>
@@ -24,6 +24,11 @@
                <integer>2206</integer>
                <integer>2199</integer>
        </array>
+       <key>IBOpenObjects</key>
+       <array>
+               <integer>636</integer>
+               <integer>2346</integer>
+       </array>
        <key>IBSystem Version</key>
        <string>9D34</string>
 </dict>

diff --git a/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib
index 0355b685d6535ee86edef31a98e163c5916407fb..abb86076583fcf9b3b343f4c783e5d1478c84e9c 100644 (file)
Binary files a/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h
index 4f9128fcae762f7f2636a7e67dbf9f652638185d..92ff6146d5f6ee3e78a25d934484c46fce2ca94b 100644 (file)
--- a/modules/gui/macosx/open.h
+++ b/modules/gui/macosx/open.h
@@ -159,12 +159,13 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
 
 - (void)openCapture;
 - (void)showCaptureView: theView;
-- (IBAction)openCaptureStepperChanged:(id)sender;
 - (IBAction)openCaptureModeChanged:(id)sender;
 - (IBAction)eyetvSwitchChannel:(id)sender;
 - (IBAction)eyetvLaunch:(id)sender;
 - (void)eyetvChanged:(NSNotification *)o_notification;
 - (void)setupChannelInfo;
+- (IBAction)screenStepperChanged:(id)sender;
+- (void)screenFPSfieldChanged:(NSNotification *)o_notification;
 
 - (IBAction)subsChanged:(id)sender;
 - (IBAction)subSettings:(id)sender;

diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index 163bab19dd70e993d2f34f10a8db8895e351b4b3..36fac3802ee4bb78b325bd078ee46e64499d64e2 100644 (file)
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -258,17 +258,17 @@ static VLCOpen *_o_sharedMainInstance = nil;
         name: NSControlTextDidChangeNotification
         object: o_net_http_url];
 
-    [[NSNotificationCenter defaultCenter] addObserver: self
-                                             selector: @selector(screenFPSChanged:)
-                                                 name: NSControlTextDidChangeNotification
-                                               object: o_screen_fps_fld];
-
     [[NSDistributedNotificationCenter defaultCenter] addObserver: self
                                                         selector: @selector(eyetvChanged:)
                                                             name: NULL
                                                           object: @"VLCEyeTVSupport"
                                               suspensionBehavior: NSNotificationSuspensionBehaviorDeliverImmediately];
- 
+
+    [[NSNotificationCenter defaultCenter] addObserver: self
+                                             selector: @selector(screenFPSfieldChanged:)
+                                                 name: NSControlTextDidChangeNotification
+                                               object: o_screen_fps_fld];
+
     /* register clicks on text fields */
     [[NSNotificationCenter defaultCenter] addObserver: self
                                              selector: @selector(textFieldWasClicked:)
@@ -877,13 +877,21 @@ static VLCOpen *_o_sharedMainInstance = nil;
     }
 }
 
-- (IBAction)openCaptureStepperChanged:(id)sender
+- (IBAction)screenStepperChanged:(id)sender
 {
     [o_screen_fps_fld setIntValue: [o_screen_fps_stp intValue]];
     [o_panel makeFirstResponder: o_screen_fps_fld];
     [o_mrl setStringValue: [NSString stringWithFormat:@"screen:// :screen-fps=%@", [o_screen_fps_fld stringValue]]];
 }
 
+- (void)screenFPSfieldChanged:(NSNotification *)o_notification
+{
+    [o_screen_fps_stp setIntValue: [o_screen_fps_fld intValue]];
+    if( [[o_screen_fps_fld stringValue] isEqualToString: @""] )
+        [o_screen_fps_fld setIntValue: 1];
+    [o_mrl setStringValue: [NSString stringWithFormat:@"screen:// :screen-fps=%i", [o_screen_fps_fld intValue]]];
+}
+
 - (IBAction)eyetvSwitchChannel:(id)sender
 {
     if( sender == o_eyetv_nextProgram_btn )
@@ -942,7 +950,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
     }
     else
         msg_Warn( VLCIntf, "unknown external notify '%s' received", [[o_notification name] UTF8String] );
-}
+}    
 
 /* little helper method, since this code needs to be run by multiple objects */
 - (void)setupChannelInfo