vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sun Aug 9 18:26:03 2015 +0200| [beab9340fc8ce1362dfb95efefce5091d0b06091] | committer: David Fuhrmann
macosx: set window delegate for messages panel, remove singleton > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=beab9340fc8ce1362dfb95efefce5091d0b06091 --- .../Resources/English.lproj/DebugMessageVisualizer.xib | 12 ++++++++++-- modules/gui/macosx/DebugMessageVisualizer.h | 1 - modules/gui/macosx/DebugMessageVisualizer.m | 12 ------------ 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/extras/package/macosx/Resources/English.lproj/DebugMessageVisualizer.xib b/extras/package/macosx/Resources/English.lproj/DebugMessageVisualizer.xib index a35e4f1..5a8c27f 100644 --- a/extras/package/macosx/Resources/English.lproj/DebugMessageVisualizer.xib +++ b/extras/package/macosx/Resources/English.lproj/DebugMessageVisualizer.xib @@ -2,7 +2,7 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00"> <data> <int key="IBDocument.SystemTarget">1060</int> - <string key="IBDocument.SystemVersion">14F6a</string> + <string key="IBDocument.SystemVersion">14F25a</string> <string key="IBDocument.InterfaceBuilderVersion">7706</string> <string key="IBDocument.AppKitVersion">1348.17</string> <string key="IBDocument.HIToolboxVersion">758.70</string> @@ -325,6 +325,14 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="401114513"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">25</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> <string key="label">dataSource</string> <reference key="source" ref="277989700"/> <reference key="destination" ref="1001"/> @@ -476,7 +484,7 @@ <nil key="activeLocalization"/> <dictionary class="NSMutableDictionary" key="localizations"/> <nil key="sourceID"/> - <int key="maxID">24</int> + <int key="maxID">25</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <array class="NSMutableArray" key="referencedPartialClassDescriptions"> diff --git a/modules/gui/macosx/DebugMessageVisualizer.h b/modules/gui/macosx/DebugMessageVisualizer.h index 225174e..1b1ba23 100644 --- a/modules/gui/macosx/DebugMessageVisualizer.h +++ b/modules/gui/macosx/DebugMessageVisualizer.h @@ -31,7 +31,6 @@ IBOutlet NSButton * _msgs_refresh_btn; IBOutlet id _msgs_table; } -+ (VLCDebugMessageVisualizer *)sharedInstance; - (void)showWindow:(id)sender; diff --git a/modules/gui/macosx/DebugMessageVisualizer.m b/modules/gui/macosx/DebugMessageVisualizer.m index b784045..d832d12 100644 --- a/modules/gui/macosx/DebugMessageVisualizer.m +++ b/modules/gui/macosx/DebugMessageVisualizer.m @@ -67,18 +67,6 @@ static void MsgCallback(void *data, int type, const vlc_log_t *item, const char @implementation VLCDebugMessageVisualizer -+ (VLCDebugMessageVisualizer *)sharedInstance -{ - static VLCDebugMessageVisualizer *sharedInstance = nil; - static dispatch_once_t pred; - - dispatch_once(&pred, ^{ - sharedInstance = [VLCDebugMessageVisualizer new]; - }); - - return sharedInstance; -} - - (id)init { self = [super initWithWindowNibName:@"DebugMessageVisualizer"]; _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
