Changeset 967acfe76318ec2999308a47ee7fa43318d5723d

Timestamp:

06/15/08 00:04:43 (3 months ago)

Author:

Felix Paul Kühne <fkuehne@videolan.org>

git-committer:

Felix Paul Kühne <fkuehne@videolan.org> 1213481083 +0200

git-parent:

[a9654857c29c01272d235c1a85a3e4df95057d6a]

git-author:

Felix Paul Kühne <fkuehne@videolan.org> 1213392149 +0200

Message:

Added some stuff to make sure that we get nice fps values for screen capture (range: 1 to 30)

Files:

• extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib (modified) (2 diffs)
• extras/package/macosx/Resources/English.lproj/Open.nib/info.nib (modified) (2 diffs)
• extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib (modified) (previous)
• modules/gui/macosx/open.h (modified) (2 diffs)
• modules/gui/macosx/open.m (modified) (4 diffs)

extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib

@@ -269 +269 @@
-                eyetvSwitchChannel = id;
-                openCaptureModeChanged = id;
-                openCaptureStepperChanged = id;
-                openDisc = id;
-                openDiscMenusChanged = id;
@@ -284 +283 @@
-                panelCancel = id;
-                panelOk = id;
+                screenStepperChanged = id;
-                subCloseSheet = id;
-                subDelayStepperChanged = id;

extras/package/macosx/Resources/English.lproj/Open.nib/info.nib

@@ -14 +14 @@
-        <string>366 462 547 183 0 0 1280 778 </string>
-        <key>2346</key>
-366 462
+15 513
-    </dict>
-    <key>IBFramework Version</key>
@@ -25 +25 @@
-        <integer>2199</integer>
-    </array>
+    <key>IBOpenObjects</key>
+    <array>
+        <integer>636</integer>
+        <integer>2346</integer>
+    </array>
-    <key>IBSystem Version</key>
-    <string>9D34</string>

modules/gui/macosx/open.h

@@ -160 +160 @@
-- (void)openCapture;
-- (void)showCaptureView: theView;
-- (IBAction)openCaptureStepperChanged:(id)sender;
-- (IBAction)openCaptureModeChanged:(id)sender;
-- (IBAction)eyetvSwitchChannel:(id)sender;
@@ -166 +165 @@
-- (void)eyetvChanged:(NSNotification *)o_notification;
-- (void)setupChannelInfo;
+- (IBAction)screenStepperChanged:(id)sender;
+- (void)screenFPSfieldChanged:(NSNotification *)o_notification;
-
-- (IBAction)subsChanged:(id)sender;

modules/gui/macosx/open.m

@@ -259 +259 @@
-        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:)
@@ -269 +264 @@
-                                                          object: @"VLCEyeTVSupport"
-                                              suspensionBehavior: NSNotificationSuspensionBehaviorDeliverImmediately];
-
+
+
+
+
+
+
-    /* register clicks on text fields */
-    [[NSNotificationCenter defaultCenter] addObserver: self
@@ -878 +878 @@
-}
-
-openCapture
+screen
-{
-    [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]]];
-}
-
@@ -943 +951 @@
-    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 */