vlc | branch: master | Marvin Scholz <epira...@gmail.com> | Tue Sep 20 20:24:30 2016 +0200| [4f3e48abf74a76e29b58d94ae6dc0a2eef9c21fa] | committer: Felix Paul Kühne
macosx: Fix missing renderer discovery types Signed-off-by: Felix Paul Kühne <fkue...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4f3e48abf74a76e29b58d94ae6dc0a2eef9c21fa --- modules/gui/macosx/VLCRendererDialog.m | 2 +- modules/gui/macosx/VLCRendererDiscovery.h | 6 +++--- modules/gui/macosx/VLCRendererDiscovery.m | 10 +++++----- modules/gui/macosx/VLCRendererItem.h | 12 ++++++------ modules/gui/macosx/VLCRendererItem.m | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/gui/macosx/VLCRendererDialog.m b/modules/gui/macosx/VLCRendererDialog.m index afc8f40..2be0fe3 100644 --- a/modules/gui/macosx/VLCRendererDialog.m +++ b/modules/gui/macosx/VLCRendererDialog.m @@ -37,7 +37,7 @@ NSMutableArray<VLCRendererDiscovery*> *renderer_discoveries; intf_thread_t *p_intf; - vlc_renderer_discovery *p_rd; + vlc_renderer_discovery_t *p_rd; } @end diff --git a/modules/gui/macosx/VLCRendererDiscovery.h b/modules/gui/macosx/VLCRendererDiscovery.h index b45278a..2406689 100644 --- a/modules/gui/macosx/VLCRendererDiscovery.h +++ b/modules/gui/macosx/VLCRendererDiscovery.h @@ -1,5 +1,5 @@ /***************************************************************************** - * VLCRendererDiscovery.h: Wrapper class for vlc_renderer_discovery + * VLCRendererDiscovery.h: Wrapper class for vlc_renderer_discovery_t ***************************************************************************** * Copyright (C) 2016 VLC authors and VideoLAN * $Id$ @@ -29,7 +29,7 @@ /** \c VLCRendererDiscovery is a simple wrapper class for libvlc’s - \c vlc_renderer_discovery. It's initialized with the renderer name and + \c vlc_renderer_discovery_t. It's initialized with the renderer name and manages the underlying renderer discovery. */ @interface VLCRendererDiscovery : NSObject @@ -69,7 +69,7 @@ \param longname Renderer longname as C string \returns Initialized class that already created the underlying - \c vlc_renderer_discovery structure or nil on failure. + \c vlc_renderer_discovery_t structure or nil on failure. */ - (instancetype)initWithName:(const char*)name andLongname:(const char*)longname; diff --git a/modules/gui/macosx/VLCRendererDiscovery.m b/modules/gui/macosx/VLCRendererDiscovery.m index f54077c..00b98b3 100644 --- a/modules/gui/macosx/VLCRendererDiscovery.m +++ b/modules/gui/macosx/VLCRendererDiscovery.m @@ -1,5 +1,5 @@ /***************************************************************************** - * VLCRendererDiscovery.m: Wrapper class for vlc_renderer_discovery + * VLCRendererDiscovery.m: Wrapper class for vlc_renderer_discovery_t ***************************************************************************** * Copyright (C) 2016 VLC authors and VideoLAN * $Id$ @@ -30,8 +30,8 @@ @interface VLCRendererDiscovery () { - intf_thread_t *p_intf; - vlc_renderer_discovery *p_rd; + intf_thread_t *p_intf; + vlc_renderer_discovery_t *p_rd; } - (void)handleEvent:(const vlc_event_t *)event; @@ -120,7 +120,7 @@ static void renderer_event_received(const vlc_event_t *p_event, void *user_data) - (void)handleEvent:(const vlc_event_t *)event { if (event->type == vlc_RendererDiscoveryItemAdded) { - vlc_renderer_item *base_item = event->u.renderer_discovery_item_added.p_new_item; + vlc_renderer_item_t *base_item = event->u.renderer_discovery_item_added.p_new_item; VLCRendererItem *item = [[VLCRendererItem alloc] initWithRendererItem:base_item]; [_rendererItems addObject:item]; if (_delegate) @@ -128,7 +128,7 @@ static void renderer_event_received(const vlc_event_t *p_event, void *user_data) return; } if (event->type == vlc_RendererDiscoveryItemRemoved) { - vlc_renderer_item *base_item = event->u.renderer_discovery_item_removed.p_item; + vlc_renderer_item_t *base_item = event->u.renderer_discovery_item_removed.p_item; VLCRendererItem *result_item = nil; for (VLCRendererItem *item in _rendererItems) { diff --git a/modules/gui/macosx/VLCRendererItem.h b/modules/gui/macosx/VLCRendererItem.h index e46618a..d65c3b4 100644 --- a/modules/gui/macosx/VLCRendererItem.h +++ b/modules/gui/macosx/VLCRendererItem.h @@ -1,5 +1,5 @@ /***************************************************************************** - * VLCRendererItem.h: Wrapper class for vlc_renderer_item + * VLCRendererItem.h: Wrapper class for vlc_renderer_item_t ***************************************************************************** * Copyright (C) 2016 VLC authors and VideoLAN * $Id$ @@ -28,21 +28,21 @@ /** \c VLCRendererItem is a simple wrapper class for libvlc’s - \c vlc_renderer_item. It's initialized with the renderer item and + \c vlc_renderer_item_t. It's initialized with the renderer item and manages it's lifetime. */ @interface VLCRendererItem : NSObject /** Initialize the object with a renderer item, typically received from - a \c vlc_renderer_discovery event. + a \c vlc_renderer_discovery_t event. */ -- (instancetype)initWithRendererItem:(vlc_renderer_item*)item; +- (instancetype)initWithRendererItem:(vlc_renderer_item_t*)item; /** - The underlying \c vlc_renderer_item item + The underlying \c vlc_renderer_item_t item */ -@property (readonly) vlc_renderer_item* rendererItem; +@property (readonly) vlc_renderer_item_t* rendererItem; /** The name of the renderer item diff --git a/modules/gui/macosx/VLCRendererItem.m b/modules/gui/macosx/VLCRendererItem.m index d8efcfd..f9ebe69 100644 --- a/modules/gui/macosx/VLCRendererItem.m +++ b/modules/gui/macosx/VLCRendererItem.m @@ -1,5 +1,5 @@ /***************************************************************************** - * VLCRendererItem.m: Wrapper class for vlc_renderer_item + * VLCRendererItem.m: Wrapper class for vlc_renderer_item_t ***************************************************************************** * Copyright (C) 2016 VLC authors and VideoLAN * $Id$ @@ -29,7 +29,7 @@ @implementation VLCRendererItem -- (instancetype)initWithRendererItem:(vlc_renderer_item*)item +- (instancetype)initWithRendererItem:(vlc_renderer_item_t*)item { self = [super init]; if (self) { _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits