Commit 967acfe7 authored by Felix Paul Kühne's avatar Felix Paul Kühne

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

parent a9654857
...@@ -268,7 +268,6 @@ ...@@ -268,7 +268,6 @@
eyetvLaunch = id; eyetvLaunch = id;
eyetvSwitchChannel = id; eyetvSwitchChannel = id;
openCaptureModeChanged = id; openCaptureModeChanged = id;
openCaptureStepperChanged = id;
openDisc = id; openDisc = id;
openDiscMenusChanged = id; openDiscMenusChanged = id;
openDiscStepperChanged = id; openDiscStepperChanged = id;
...@@ -283,6 +282,7 @@ ...@@ -283,6 +282,7 @@
openVTSBrowse = id; openVTSBrowse = id;
panelCancel = id; panelCancel = id;
panelOk = id; panelOk = id;
screenStepperChanged = id;
subCloseSheet = id; subCloseSheet = id;
subDelayStepperChanged = id; subDelayStepperChanged = id;
subFileBrowse = id; subFileBrowse = id;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<key>2304</key> <key>2304</key>
<string>366 462 547 183 0 0 1280 778 </string> <string>366 462 547 183 0 0 1280 778 </string>
<key>2346</key> <key>2346</key>
<string>366 462 548 183 0 0 1280 778 </string> <string>15 513 548 183 0 0 1280 778 </string>
</dict> </dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>489.0</string> <string>489.0</string>
...@@ -24,6 +24,11 @@ ...@@ -24,6 +24,11 @@
<integer>2206</integer> <integer>2206</integer>
<integer>2199</integer> <integer>2199</integer>
</array> </array>
<key>IBOpenObjects</key>
<array>
<integer>636</integer>
<integer>2346</integer>
</array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>9D34</string> <string>9D34</string>
</dict> </dict>
......
...@@ -159,12 +159,13 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); ...@@ -159,12 +159,13 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
- (void)openCapture; - (void)openCapture;
- (void)showCaptureView: theView; - (void)showCaptureView: theView;
- (IBAction)openCaptureStepperChanged:(id)sender;
- (IBAction)openCaptureModeChanged:(id)sender; - (IBAction)openCaptureModeChanged:(id)sender;
- (IBAction)eyetvSwitchChannel:(id)sender; - (IBAction)eyetvSwitchChannel:(id)sender;
- (IBAction)eyetvLaunch:(id)sender; - (IBAction)eyetvLaunch:(id)sender;
- (void)eyetvChanged:(NSNotification *)o_notification; - (void)eyetvChanged:(NSNotification *)o_notification;
- (void)setupChannelInfo; - (void)setupChannelInfo;
- (IBAction)screenStepperChanged:(id)sender;
- (void)screenFPSfieldChanged:(NSNotification *)o_notification;
- (IBAction)subsChanged:(id)sender; - (IBAction)subsChanged:(id)sender;
- (IBAction)subSettings:(id)sender; - (IBAction)subSettings:(id)sender;
......
...@@ -258,17 +258,17 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -258,17 +258,17 @@ static VLCOpen *_o_sharedMainInstance = nil;
name: NSControlTextDidChangeNotification name: NSControlTextDidChangeNotification
object: o_net_http_url]; object: o_net_http_url];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(screenFPSChanged:)
name: NSControlTextDidChangeNotification
object: o_screen_fps_fld];
[[NSDistributedNotificationCenter defaultCenter] addObserver: self [[NSDistributedNotificationCenter defaultCenter] addObserver: self
selector: @selector(eyetvChanged:) selector: @selector(eyetvChanged:)
name: NULL name: NULL
object: @"VLCEyeTVSupport" object: @"VLCEyeTVSupport"
suspensionBehavior: NSNotificationSuspensionBehaviorDeliverImmediately]; suspensionBehavior: NSNotificationSuspensionBehaviorDeliverImmediately];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(screenFPSfieldChanged:)
name: NSControlTextDidChangeNotification
object: o_screen_fps_fld];
/* register clicks on text fields */ /* register clicks on text fields */
[[NSNotificationCenter defaultCenter] addObserver: self [[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(textFieldWasClicked:) selector: @selector(textFieldWasClicked:)
...@@ -877,13 +877,21 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -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_screen_fps_fld setIntValue: [o_screen_fps_stp intValue]];
[o_panel makeFirstResponder: o_screen_fps_fld]; [o_panel makeFirstResponder: o_screen_fps_fld];
[o_mrl setStringValue: [NSString stringWithFormat:@"screen:// :screen-fps=%@", [o_screen_fps_fld stringValue]]]; [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 - (IBAction)eyetvSwitchChannel:(id)sender
{ {
if( sender == o_eyetv_nextProgram_btn ) if( sender == o_eyetv_nextProgram_btn )
...@@ -942,7 +950,7 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -942,7 +950,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
} }
else else
msg_Warn( VLCIntf, "unknown external notify '%s' received", [[o_notification name] UTF8String] ); 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 */ /* little helper method, since this code needs to be run by multiple objects */
- (void)setupChannelInfo - (void)setupChannelInfo
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment