vlc | branch: master | Marvin Scholz <[email protected]> | Sat Feb 23 18:12:52 2019 +0100| [e55deae22bbbe68207e472e555316aeea1bcc9d9] | committer: Steve Lhomme
libvlc: Rename VLCOpenGLVideoViewEmbedding to VLCVideoViewEmbedding There is nothing specific to OpenGL about this protocol. Signed-off-by: Steve Lhomme <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e55deae22bbbe68207e472e555316aeea1bcc9d9 --- include/vlc/libvlc_media_player.h | 6 +++--- modules/video_output/macosx.m | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h index 2e4aff7a2b..e1d758956e 100644 --- a/include/vlc/libvlc_media_player.h +++ b/include/vlc/libvlc_media_player.h @@ -558,11 +558,11 @@ int libvlc_video_set_output_callbacks( libvlc_media_player_t *mp, * * Use the vout called "macosx". * - * The drawable is an NSObject that follow the VLCOpenGLVideoViewEmbedding + * The drawable is an NSObject that follow the VLCVideoViewEmbedding * protocol: * * @code{.m} - * \@protocol VLCOpenGLVideoViewEmbedding <NSObject> + * \@protocol VLCVideoViewEmbedding <NSObject> * - (void)addVoutSubview:(NSView *)view; * - (void)removeVoutSubview:(NSView *)view; * \@end @@ -585,7 +585,7 @@ int libvlc_video_set_output_callbacks( libvlc_media_player_t *mp, * * \param p_mi the Media Player * \param drawable the drawable that is either an NSView or an object following - * the VLCOpenGLVideoViewEmbedding protocol. + * the VLCVideoViewEmbedding protocol. */ LIBVLC_API void libvlc_media_player_set_nsobject ( libvlc_media_player_t *p_mi, void * drawable ); diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m index ccdd969c16..a95d2875e1 100644 --- a/modules/video_output/macosx.m +++ b/modules/video_output/macosx.m @@ -85,7 +85,7 @@ vlc_module_end () /** * Obj-C protocol declaration that drawable-nsobject should follow */ -@protocol VLCOpenGLVideoViewEmbedding <NSObject> +@protocol VLCVideoViewEmbedding <NSObject> - (void)addVoutSubview:(NSView *)view; - (void)removeVoutSubview:(NSView *)view; @end @@ -103,7 +103,7 @@ vlc_module_end () struct vout_display_sys_t { VLCOpenGLVideoView *glView; - id<VLCOpenGLVideoViewEmbedding> container; + id<VLCVideoViewEmbedding> container; vout_window_t *embed; vlc_gl_t *gl; @@ -196,7 +196,7 @@ static int Open (vout_display_t *vd, const vout_display_cfg_t *cfg, withObject:[NSValue valueWithPointer:parentView] waitUntilDone:NO]; } else { - msg_Err(vd, "Invalid drawable-nsobject object. drawable-nsobject must either be an NSView or comply to the @protocol VLCOpenGLVideoViewEmbedding."); + msg_Err(vd, "Invalid drawable-nsobject object. drawable-nsobject must either be an NSView or comply to the @protocol VLCVideoViewEmbedding."); goto error; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
