Commit ad6a0c79 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

macosx/framework: Slim down to the minimum VLCMediaPlayer -play and -pause methods.

parent f364cfb4
...@@ -464,24 +464,11 @@ static void HandleMediaInstanceStateChanged(const libvlc_event_t * event, void * ...@@ -464,24 +464,11 @@ static void HandleMediaInstanceStateChanged(const libvlc_event_t * event, void *
return; return;
} }
// Return if there is no media available or if the stream is not paused or
// playing something else
if (!media || (![self isPlaying] && [self state] != VLCMediaPlayerStatePaused))
return;
// Should never get here.
if (!instance)
return;
// Pause the stream // Pause the stream
libvlc_exception_t ex; libvlc_exception_t ex;
libvlc_exception_init( &ex ); libvlc_exception_init( &ex );
libvlc_media_player_pause( (libvlc_media_player_t *)instance, &ex ); libvlc_media_player_pause( (libvlc_media_player_t *)instance, &ex );
catch_exception( &ex ); catch_exception( &ex );
// TODO: Should we record the time in case the media instance is destroyed
// then rebuilt?
} }
- (void)stop - (void)stop
...@@ -495,11 +482,6 @@ static void HandleMediaInstanceStateChanged(const libvlc_event_t * event, void * ...@@ -495,11 +482,6 @@ static void HandleMediaInstanceStateChanged(const libvlc_event_t * event, void *
[self performSelectorInBackground:@selector(stop) withObject:nil]; [self performSelectorInBackground:@selector(stop) withObject:nil];
return; return;
} }
// Return if there is no media available or if the system is not in play status
// or pause status.
if (!media)
return;
libvlc_exception_t ex; libvlc_exception_t ex;
libvlc_exception_init( &ex ); libvlc_exception_init( &ex );
......
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