[vlc-commits] Fix macos build

[Hugo Beauzée-Luyssen]

npapi-vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon May 11 15:48:53 2015 +0200| [8cefa76cbaaf650f9cf0156252573eec9ec834f1] | committer: Hugo Beauzée-Luyssen

Fix macos build

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=8cefa76cbaaf650f9cf0156252573eec9ec834f1
---

 npapi/vlcplugin_mac.mm      |   10 +++++-----
 npapi/vlcwindowless_mac.cpp |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/npapi/vlcplugin_mac.mm b/npapi/vlcplugin_mac.mm
index abe2759..ebb7caa 100644
--- a/npapi/vlcplugin_mac.mm
+++ b/npapi/vlcplugin_mac.mm
@@ -286,8 +286,8 @@ void VlcPluginMac::update_controls()
     }
 
     if ([(VLCPerInstanceStorage *)this->_perInstanceStorage controllerLayer] != nil) {
-        [[(VLCPerInstanceStorage *)this->_perInstanceStorage controllerLayer] setMediaPosition: libvlc_media_player_get_position(getMD())];
-        [[(VLCPerInstanceStorage *)this->_perInstanceStorage controllerLayer] setIsPlaying: playlist_isplaying()];
+        [[(VLCPerInstanceStorage *)this->_perInstanceStorage controllerLayer] setMediaPosition: m_player.get_mp().position()];
+        [[(VLCPerInstanceStorage *)this->_perInstanceStorage controllerLayer] setIsPlaying: player().mlp().isPlaying()];
         [[(VLCPerInstanceStorage *)this->_perInstanceStorage controllerLayer] setIsFullscreen:this->get_fullscreen()];
         [[(VLCPerInstanceStorage *)this->_perInstanceStorage controllerLayer] setNeedsDisplay];
     }
@@ -414,7 +414,7 @@ bool VlcPluginMac::handle_event(void *event)
                 toggle_fullscreen();
                 return true;
             } else if (cocoaEvent->data.key.keyCode == 49) {
-                playlist_togglePause();
+                m_player.mlp().pause();
                 return true;
             }
         }
@@ -865,7 +865,7 @@ bool VlcPluginMac::handle_event(void *event)
     }
 
     if (CGRectContainsPoint([self _playPauseButtonRect], point)) {
-        self.cppPlugin->playlist_togglePause();
+        self.cppPlugin->player().mlp().pause();
         return;
     }
     if (CGRectContainsPoint([self _fullscreenButtonRect], point)) {
@@ -979,7 +979,7 @@ bool VlcPluginMac::handle_event(void *event)
                 _cppPlugin->toggle_fullscreen();
                 return;
             } else if (key == ' ') {
-                _cppPlugin->playlist_togglePause();
+                _cppPlugin->player().mlp().pause();
                 return;
             }
         }
diff --git a/npapi/vlcwindowless_mac.cpp b/npapi/vlcwindowless_mac.cpp
index 2000ed0..f8c992c 100644
--- a/npapi/vlcwindowless_mac.cpp
+++ b/npapi/vlcwindowless_mac.cpp
@@ -249,7 +249,7 @@ bool VlcWindowlessMac::handle_event(void *event)
 
         CGContextClearRect(cgContext, CGRectMake(0, 0, npwindow.width, npwindow.height) );
 
-        if (m_media_width == 0 || m_media_height == 0 || (!lastFrame && !VlcPluginBase::playlist_isplaying()) || !get_player().is_open()) {
+        if (m_media_width == 0 || m_media_height == 0 || (!lastFrame && !player().mlp().isPlaying())) {
             drawNoPlayback(cgContext);
             return true;
         }