[vlc-commits] macosx vout: public getter for vd should not be needed anymore

David Fuhrmann git at videolan.org
Fri May 11 17:32:37 CEST 2012


vlc/vlc-2.0 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Sun May  6 11:13:24 2012 +0200| [d9f614d8dc913bfeeb29cbca82bc8c7962c74222] | committer: David Fuhrmann

macosx vout: public getter for vd should not be needed anymore
(cherry picked from commit 3b3a8924773effa59c8e85b6075fd8c659c6e39a)

Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=d9f614d8dc913bfeeb29cbca82bc8c7962c74222
---

 modules/gui/macosx/VideoView.m |   10 ----------
 modules/video_output/macosx.m  |    6 ------
 2 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/modules/gui/macosx/VideoView.m b/modules/gui/macosx/VideoView.m
index ed0f005..3e90d3a 100644
--- a/modules/gui/macosx/VideoView.m
+++ b/modules/gui/macosx/VideoView.m
@@ -61,16 +61,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
 }
 
 /*****************************************************************************
- * VLCOpenGLVideoView interface excerpt
- * full implementation in modules/video_output/macosx.m:95
- *****************************************************************************/
- at interface VLCOpenGLVideoView : NSOpenGLView
-{
-}
-- (vout_display_t *)voutDisplay;
- at end
-
-/*****************************************************************************
  * VLCVoutView implementation
  *****************************************************************************/
 @implementation VLCVoutView
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 08efee8..a956be3 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -96,7 +96,6 @@ vlc_module_end ()
     BOOL _hasPendingReshape;
 }
 - (void)setVoutDisplay:(vout_display_t *)vd;
-- (vout_display_t *)voutDisplay;
 - (void)setVoutFlushing:(BOOL)flushing;
 @end
 
@@ -525,11 +524,6 @@ static void OpenglSwap (vlc_gl_t *gl)
     }
 }
 
-- (vout_display_t *)voutDisplay
-{
-    return vd;
-}
-
 /**
  * Gets called when the vout will aquire the lock and flush.
  * (Non main thread).



More information about the vlc-commits mailing list