avmedia/source/vlc/vlcplayer.cxx | 7 +++++-- avmedia/source/vlc/vlcwindow.cxx | 3 +-- avmedia/source/vlc/vlcwindow.hxx | 4 +--- 3 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 99208858b934773d73fd0bd905c190a067c02947 Author: Stephan Bergmann <[email protected]> Date: Tue Sep 3 21:21:50 2013 +0200 Make --enable-vlc at least compile on Mac OS X ...no idea whether the change is actually any good, though. Change-Id: Ib9e9bfbc894e9e0dde1f1a2e882bd09944f4d6d4 diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx index 15e1b1f..060abcc 100644 --- a/avmedia/source/vlc/vlcplayer.cxx +++ b/avmedia/source/vlc/vlcplayer.cxx @@ -167,7 +167,10 @@ namespace if (pEnvData == NULL) return -1; -#if defined WNT +#if defined MACOSX + // Explicit converts from NSView* to int + const int id = reinterpret_cast<int>( pEnvData->pView ); +#elif defined WNT // Explicit converts from HWND to int const int id = reinterpret_cast<int>( pEnvData->hWnd ); #else commit 728e2f41dbe5cf29fecfe4a96fbe3f6ce78517d8 Author: Stephan Bergmann <[email protected]> Date: Tue Sep 3 21:21:12 2013 +0200 -Werror,-Wunused-private-field Change-Id: I18c800b581337ef0b6fc6cc862f60e69531e0336 diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx index 2671571..15e1b1f 100644 --- a/avmedia/source/vlc/vlcplayer.cxx +++ b/avmedia/source/vlc/vlcplayer.cxx @@ -184,7 +184,7 @@ uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWind { ::osl::MutexGuard aGuard(m_aMutex); - VLCWindow * const window = new VLCWindow( *this ); + VLCWindow * const window = new VLCWindow; const int winID = GetWindowID( aArguments ); diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx index 9306392..b004875 100644 --- a/avmedia/source/vlc/vlcwindow.cxx +++ b/avmedia/source/vlc/vlcwindow.cxx @@ -9,8 +9,7 @@ namespace vlc { const ::rtl::OUString AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Window_VLC"; const ::rtl::OUString AVMEDIA_VLC_WINDOW_SERVICENAME = "com.sun.star.media.Window_VLC"; -VLCWindow::VLCWindow(VLCPlayer& player) - : mPlayer( player ) +VLCWindow::VLCWindow() { } diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx index 17a8c88..2aa3e47 100644 --- a/avmedia/source/vlc/vlcwindow.hxx +++ b/avmedia/source/vlc/vlcwindow.hxx @@ -23,14 +23,12 @@ namespace avmedia { namespace vlc { -class VLCPlayer; class VLCWindow : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XPlayerWindow, ::com::sun::star::lang::XServiceInfo > { - VLCPlayer& mPlayer; public: - VLCWindow(VLCPlayer& player); + VLCWindow(); void SAL_CALL update() throw (css::uno::RuntimeException); ::sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
