From a8498fbde2938c6bff0ed89bd2b4410e27fb64a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 15 Jul 2015 19:14:46 +0200
Subject: [PATCH] macosx/playlistinfo: remove object instance from xib file and
 set it up the proper way

---
 .../Resources/English.lproj/MediaInfo.xib     | 1188 +++++++++--------
 modules/gui/macosx/playlistinfo.h             |  127 +-
 modules/gui/macosx/playlistinfo.m             |  279 ++--
 3 files changed, 798 insertions(+), 796 deletions(-)

diff --git a/extras/package/macosx/Resources/English.lproj/MediaInfo.xib b/extras/package/macosx/Resources/English.lproj/MediaInfo.xib
index 344c9a4a5c55..e601c8faf3cc 100644
--- a/extras/package/macosx/Resources/English.lproj/MediaInfo.xib
+++ b/extras/package/macosx/Resources/English.lproj/MediaInfo.xib
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">14B25</string>
-		<string key="IBDocument.InterfaceBuilderVersion">6254</string>
-		<string key="IBDocument.AppKitVersion">1343.16</string>
-		<string key="IBDocument.HIToolboxVersion">755.00</string>
+		<string key="IBDocument.SystemVersion">14E46</string>
+		<string key="IBDocument.InterfaceBuilderVersion">7706</string>
+		<string key="IBDocument.AppKitVersion">1348.17</string>
+		<string key="IBDocument.HIToolboxVersion">758.70</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">6254</string>
+			<string key="NS.object.0">7706</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>NSBox</string>
@@ -37,7 +37,7 @@
 		</object>
 		<array class="NSMutableArray" key="IBDocument.RootObjects" id="731515038">
 			<object class="NSCustomObject" id="933980713">
-				<string key="NSClassName">NSObject</string>
+				<string key="NSClassName">VLCInfo</string>
 			</object>
 			<object class="NSCustomObject" id="228883915">
 				<string key="NSClassName">FirstResponder</string>
@@ -45,9 +45,6 @@
 			<object class="NSCustomObject" id="197177957">
 				<string key="NSClassName">NSApplication</string>
 			</object>
-			<object class="NSCustomObject" id="345087178">
-				<string key="NSClassName">VLCInfo</string>
-			</object>
 			<object class="NSWindowTemplate" id="391253886">
 				<int key="NSWindowStyleMask">8215</int>
 				<int key="NSWindowBacking">2</int>
@@ -64,6 +61,9 @@
 						<object class="NSTabView" id="267010932">
 							<reference key="NSNextResponder" ref="718606605"/>
 							<int key="NSvFlags">268</int>
+							<set class="NSMutableSet" key="NSDragTypes">
+								<string>public.item</string>
+							</set>
 							<string key="NSFrame">{{-28, -11}, {562, 482}}</string>
 							<reference key="NSSuperview" ref="718606605"/>
 							<reference key="NSWindow"/>
@@ -78,6 +78,7 @@
 											<object class="NSTextField" id="197505283">
 												<reference key="NSNextResponder" ref="537375861"/>
 												<int key="NSvFlags">268</int>
+												<array class="NSMutableArray" key="NSSubviews"/>
 												<string key="NSFrame">{{37, 396}, {468, 19}}</string>
 												<reference key="NSSuperview" ref="537375861"/>
 												<reference key="NSNextKeyView" ref="1001995492"/>
@@ -142,7 +143,7 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{37, 18}, {468, 19}}</string>
 												<reference key="NSSuperview" ref="537375861"/>
-												<reference key="NSNextKeyView" ref="267010932"/>
+												<reference key="NSNextKeyView"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="604389831">
 													<int key="NSCellFlags">-2073034687</int>
@@ -819,7 +820,7 @@
 														<int key="NSvFlags">-2147483392</int>
 														<string key="NSFrame">{{1, 420}, {501, 15}}</string>
 														<reference key="NSSuperview" ref="788794540"/>
-														<reference key="NSNextKeyView" ref="267010932"/>
+														<reference key="NSNextKeyView"/>
 														<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 														<string key="NSControlAction">_doScroller:</string>
 														<reference key="NSControlTarget" ref="788794540"/>
@@ -1535,7 +1536,7 @@
 																<string key="NSFrame">{{135, 15}, {89, 14}}</string>
 																<reference key="NSSuperview" ref="199826627"/>
 																<reference key="NSWindow"/>
-																<reference key="NSNextKeyView" ref="267010932"/>
+																<reference key="NSNextKeyView"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSTextFieldCell" key="NSCell" id="717744051">
 																	<int key="NSCellFlags">68157504</int>
@@ -1611,6 +1612,7 @@
 							<int key="NSTvFlags">0</int>
 							<bool key="NSAllowTruncatedLabels">YES</bool>
 							<bool key="NSDrawsBackground">YES</bool>
+							<reference key="NSDelegate"/>
 							<array class="NSMutableArray" key="NSSubviews">
 								<reference ref="571784830"/>
 							</array>
@@ -1619,8 +1621,9 @@
 					<string key="NSFrameSize">{506, 476}</string>
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="267010932"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1680, 1050}}</string>
+				<string key="NSScreenRect">{{0, 0}, {2560, 1417}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<string key="NSFrameAutosaveName">mediainfo</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -1630,611 +1633,603 @@
 			<array key="connectionRecords">
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_info_window</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">infoPanel</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="391253886"/>
 					</object>
-					<int key="connectionID">232</int>
+					<int key="connectionID">651</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_image_well</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="433583698"/>
-					</object>
-					<int key="connectionID">345</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">saveMetaData:</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="33949750"/>
+						<string key="label">authorLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="1001995492"/>
 					</object>
-					<int key="connectionID">416</int>
+					<int key="connectionID">652</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_saveMetaData_btn</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="33949750"/>
-					</object>
-					<int key="connectionID">417</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">metaFieldChanged:</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="197505283"/>
+						<string key="label">authorTextField</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="960295893"/>
 					</object>
-					<int key="connectionID">447</int>
+					<int key="connectionID">653</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_title_txt</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="197505283"/>
+						<string key="label">dateTextField</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="219116650"/>
 					</object>
-					<int key="connectionID">448</int>
+					<int key="connectionID">655</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_title_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="384274076"/>
+						<string key="label">dateLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="396874405"/>
 					</object>
-					<int key="connectionID">449</int>
+					<int key="connectionID">656</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_author_txt</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="960295893"/>
+						<string key="label">copyrightLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="198650750"/>
 					</object>
-					<int key="connectionID">450</int>
+					<int key="connectionID">658</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_author_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="1001995492"/>
-					</object>
-					<int key="connectionID">451</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">metaFieldChanged:</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="960295893"/>
-					</object>
-					<int key="connectionID">452</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">metaFieldChanged:</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="549422693"/>
+						<string key="label">copyrightTextField</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="26897698"/>
 					</object>
-					<int key="connectionID">453</int>
+					<int key="connectionID">659</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_collection_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="564085294"/>
+						<string key="label">encodedbyLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="489091867"/>
 					</object>
-					<int key="connectionID">454</int>
+					<int key="connectionID">660</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_collection_txt</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="549422693"/>
+						<string key="label">encodedbyTextField</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="741803865"/>
 					</object>
-					<int key="connectionID">455</int>
+					<int key="connectionID">661</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_date_txt</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="219116650"/>
+						<string key="label">genreLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="287058532"/>
 					</object>
-					<int key="connectionID">456</int>
+					<int key="connectionID">662</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_date_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="396874405"/>
+						<string key="label">genreTextField</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="196139401"/>
 					</object>
-					<int key="connectionID">457</int>
+					<int key="connectionID">663</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_seqNum_txt</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="478086893"/>
+						<string key="label">imageWell</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="433583698"/>
 					</object>
-					<int key="connectionID">458</int>
+					<int key="connectionID">664</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_seqNum_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="469251612"/>
-					</object>
-					<int key="connectionID">459</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">metaFieldChanged:</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="478086893"/>
+						<string key="label">languageLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="867392108"/>
 					</object>
-					<int key="connectionID">460</int>
+					<int key="connectionID">665</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">metaFieldChanged:</string>
-						<reference key="source" ref="345087178"/>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">languageTextField</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="634179593"/>
 					</object>
-					<int key="connectionID">470</int>
+					<int key="connectionID">666</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_genre_txt</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="196139401"/>
+						<string key="label">nowPlayingLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="324707670"/>
 					</object>
-					<int key="connectionID">471</int>
+					<int key="connectionID">667</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_genre_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="287058532"/>
+						<string key="label">nowPlayingTextField</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="784351663"/>
 					</object>
-					<int key="connectionID">472</int>
+					<int key="connectionID">668</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_language_txt</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="634179593"/>
+						<string key="label">publisherLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="238409727"/>
 					</object>
-					<int key="connectionID">473</int>
+					<int key="connectionID">669</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_language_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="867392108"/>
-					</object>
-					<int key="connectionID">474</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">metaFieldChanged:</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="196139401"/>
-					</object>
-					<int key="connectionID">475</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">metaFieldChanged:</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="784351663"/>
-					</object>
-					<int key="connectionID">480</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">metaFieldChanged:</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">publisherTextField</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="563490969"/>
 					</object>
-					<int key="connectionID">485</int>
+					<int key="connectionID">670</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">metaFieldChanged:</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="26897698"/>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">saveMetaDataButton</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="33949750"/>
 					</object>
-					<int key="connectionID">490</int>
+					<int key="connectionID">671</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_publisher_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="238409727"/>
+						<string key="label">seqNumLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="469251612"/>
 					</object>
-					<int key="connectionID">491</int>
+					<int key="connectionID">672</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_publisher_txt</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="563490969"/>
+						<string key="label">seqNumTextField</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="478086893"/>
 					</object>
-					<int key="connectionID">492</int>
+					<int key="connectionID">673</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_nowPlaying_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="324707670"/>
+						<string key="label">tabView</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="267010932"/>
 					</object>
-					<int key="connectionID">493</int>
+					<int key="connectionID">674</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_nowPlaying_txt</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="784351663"/>
+						<string key="label">titleLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="384274076"/>
 					</object>
-					<int key="connectionID">494</int>
+					<int key="connectionID">675</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_copyright_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="198650750"/>
+						<string key="label">titleTextField</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="197505283"/>
 					</object>
-					<int key="connectionID">495</int>
+					<int key="connectionID">676</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_copyright_txt</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="26897698"/>
+						<string key="label">uriLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="824286379"/>
 					</object>
-					<int key="connectionID">496</int>
+					<int key="connectionID">677</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">metaFieldChanged:</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="249789211"/>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">uriTextField</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="290294541"/>
 					</object>
-					<int key="connectionID">501</int>
+					<int key="connectionID">678</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_description_lbl</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">descriptionLabel</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="945582426"/>
 					</object>
-					<int key="connectionID">502</int>
+					<int key="connectionID">679</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_description_txt</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">descriptionTextField</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="249789211"/>
 					</object>
-					<int key="connectionID">503</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">metaFieldChanged:</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="741803865"/>
-					</object>
-					<int key="connectionID">508</int>
+					<int key="connectionID">680</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_uri_txt</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="290294541"/>
+						<string key="label">collectionLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="564085294"/>
 					</object>
-					<int key="connectionID">514</int>
+					<int key="connectionID">681</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_uri_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="824286379"/>
+						<string key="label">collectionTextField</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="196139401"/>
 					</object>
-					<int key="connectionID">515</int>
+					<int key="connectionID">682</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_outline_view</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">outlineView</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="744158692"/>
 					</object>
-					<int key="connectionID">525</int>
+					<int key="connectionID">683</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_audio_decoded_lbl</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">audioDecodedLabel</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="121157325"/>
 					</object>
-					<int key="connectionID">609</int>
+					<int key="connectionID">684</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_audio_decoded_txt</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">audioDecodedTextField</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="928992652"/>
 					</object>
-					<int key="connectionID">610</int>
+					<int key="connectionID">685</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">audioLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="393432656"/>
+					</object>
+					<int key="connectionID">686</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_demux_bytes_lbl</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">demuxBytesLabel</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="907635383"/>
 					</object>
-					<int key="connectionID">611</int>
+					<int key="connectionID">687</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_demux_bytes_txt</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">demuxBytesTextField</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="642436902"/>
 					</object>
-					<int key="connectionID">612</int>
+					<int key="connectionID">688</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_demux_bitrate_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="660058837"/>
+						<string key="label">inputBitrateLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="446298501"/>
 					</object>
-					<int key="connectionID">613</int>
+					<int key="connectionID">689</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_displayed_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="883548649"/>
+						<string key="label">inputBitrateTextField</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="373001305"/>
 					</object>
-					<int key="connectionID">615</int>
+					<int key="connectionID">690</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_displayed_txt</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="833853365"/>
+						<string key="label">inputLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="967143573"/>
 					</object>
-					<int key="connectionID">616</int>
+					<int key="connectionID">691</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_input_bitrate_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="446298501"/>
+						<string key="label">lostAudioBuffersLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="301549329"/>
 					</object>
-					<int key="connectionID">619</int>
+					<int key="connectionID">692</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_input_bitrate_txt</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="373001305"/>
+						<string key="label">demuxBitrateLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="660058837"/>
 					</object>
-					<int key="connectionID">620</int>
+					<int key="connectionID">693</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_lost_abuffers_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="301549329"/>
+						<string key="label">demuxBitrateTextField</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="618243223"/>
 					</object>
-					<int key="connectionID">621</int>
+					<int key="connectionID">694</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_lost_abuffers_txt</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">lostAudioBuffersTextField</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="467739347"/>
 					</object>
-					<int key="connectionID">622</int>
+					<int key="connectionID">695</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_lost_frames_lbl</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">lostFramesLabel</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="888685062"/>
 					</object>
-					<int key="connectionID">623</int>
+					<int key="connectionID">696</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_lost_frames_txt</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">lostFramesTextField</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="755389250"/>
 					</object>
-					<int key="connectionID">624</int>
+					<int key="connectionID">697</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_played_abuffers_lbl</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">playedAudioBuffersLabel</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="94739041"/>
 					</object>
-					<int key="connectionID">625</int>
+					<int key="connectionID">698</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_played_abuffers_txt</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">playedAudioBuffersTextField</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="559541096"/>
 					</object>
-					<int key="connectionID">626</int>
+					<int key="connectionID">699</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_read_bytes_lbl</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">readBytesLabel</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="968656237"/>
 					</object>
-					<int key="connectionID">627</int>
+					<int key="connectionID">700</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_read_bytes_txt</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">readBytesTextField</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="438384771"/>
 					</object>
-					<int key="connectionID">628</int>
+					<int key="connectionID">701</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_sent_bitrate_lbl</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">sentBitrateLabel</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="309941063"/>
 					</object>
-					<int key="connectionID">629</int>
+					<int key="connectionID">702</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_sent_bitrate_txt</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">sentBitrateTextField</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="701785620"/>
 					</object>
-					<int key="connectionID">630</int>
+					<int key="connectionID">703</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_sent_bytes_lbl</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">sentBytesLabel</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="16553861"/>
 					</object>
-					<int key="connectionID">631</int>
+					<int key="connectionID">704</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_sent_bytes_txt</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">sentBytesTextField</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="271488835"/>
 					</object>
-					<int key="connectionID">632</int>
+					<int key="connectionID">705</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_sent_packets_lbl</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">sentPacketsLabel</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="601071967"/>
 					</object>
-					<int key="connectionID">633</int>
+					<int key="connectionID">706</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_sent_packets_txt</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">sentPacketsTextField</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="397386062"/>
 					</object>
-					<int key="connectionID">634</int>
+					<int key="connectionID">707</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_video_decoded_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="635203615"/>
+						<string key="label">soutLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="232197245"/>
 					</object>
-					<int key="connectionID">635</int>
+					<int key="connectionID">708</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_video_decoded_txt</string>
-						<reference key="source" ref="345087178"/>
+						<string key="label">video_decodedTextField</string>
+						<reference key="source" ref="933980713"/>
 						<reference key="destination" ref="638896850"/>
 					</object>
-					<int key="connectionID">636</int>
+					<int key="connectionID">710</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_tab_view</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="267010932"/>
+						<string key="label">videoLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="394289136"/>
 					</object>
-					<int key="connectionID">637</int>
+					<int key="connectionID">711</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_sout_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="232197245"/>
+						<string key="label">displayedLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="883548649"/>
 					</object>
-					<int key="connectionID">638</int>
+					<int key="connectionID">712</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_video_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="394289136"/>
+						<string key="label">displayedTextField</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="833853365"/>
 					</object>
-					<int key="connectionID">639</int>
+					<int key="connectionID">713</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_input_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="967143573"/>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">saveMetaData:</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="33949750"/>
 					</object>
-					<int key="connectionID">640</int>
+					<int key="connectionID">714</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_audio_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="393432656"/>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">metaFieldChanged:</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="563490969"/>
 					</object>
-					<int key="connectionID">641</int>
+					<int key="connectionID">715</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_demux_bitrate_txt</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="618243223"/>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">metaFieldChanged:</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="741803865"/>
 					</object>
-					<int key="connectionID">646</int>
+					<int key="connectionID">716</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_encodedby_lbl</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="489091867"/>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">metaFieldChanged:</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="26897698"/>
 					</object>
-					<int key="connectionID">647</int>
+					<int key="connectionID">717</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_encodedby_txt</string>
-						<reference key="source" ref="345087178"/>
-						<reference key="destination" ref="741803865"/>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">metaFieldChanged:</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="249789211"/>
 					</object>
-					<int key="connectionID">648</int>
+					<int key="connectionID">718</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="391253886"/>
-						<reference key="destination" ref="744158692"/>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">metaFieldChanged:</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="784351663"/>
+					</object>
+					<int key="connectionID">719</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">metaFieldChanged:</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="196139401"/>
+					</object>
+					<int key="connectionID">720</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">metaFieldChanged:</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="634179593"/>
+					</object>
+					<int key="connectionID">721</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">metaFieldChanged:</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="549422693"/>
 					</object>
-					<int key="connectionID">528</int>
+					<int key="connectionID">722</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">metaFieldChanged:</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="478086893"/>
+					</object>
+					<int key="connectionID">723</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">metaFieldChanged:</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="960295893"/>
+					</object>
+					<int key="connectionID">724</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">metaFieldChanged:</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="219116650"/>
+					</object>
+					<int key="connectionID">725</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">metaFieldChanged:</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="197505283"/>
+					</object>
+					<int key="connectionID">726</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">dataSource</string>
-						<reference key="source" ref="744158692"/>
-						<reference key="destination" ref="345087178"/>
+						<string key="label">videoDecodedLabel</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="635203615"/>
 					</object>
-					<int key="connectionID">526</int>
+					<int key="connectionID">727</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="744158692"/>
-						<reference key="destination" ref="345087178"/>
+						<string key="label">videoDecodedTextField</string>
+						<reference key="source" ref="933980713"/>
+						<reference key="destination" ref="638896850"/>
 					</object>
-					<int key="connectionID">527</int>
+					<int key="connectionID">728</int>
 				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -2263,12 +2258,6 @@
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Application</string>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="345087178"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">VLCInfo</string>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2</int>
 						<reference key="object" ref="391253886"/>
@@ -3247,7 +3236,6 @@
 				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2.IBWindowTemplateEditedContentRect">{{357, 196}, {506, 476}}</string>
 				<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4390,7 +4378,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">648</int>
+			<int key="maxID">728</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -4417,312 +4405,312 @@
 						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="o_audio_decoded_lbl">id</string>
-						<string key="o_audio_decoded_txt">id</string>
-						<string key="o_audio_lbl">id</string>
-						<string key="o_author_lbl">id</string>
-						<string key="o_author_txt">id</string>
-						<string key="o_collection_lbl">id</string>
-						<string key="o_collection_txt">id</string>
-						<string key="o_copyright_lbl">id</string>
-						<string key="o_copyright_txt">id</string>
-						<string key="o_date_lbl">id</string>
-						<string key="o_date_txt">id</string>
-						<string key="o_demux_bitrate_lbl">id</string>
-						<string key="o_demux_bitrate_txt">id</string>
-						<string key="o_demux_bytes_lbl">id</string>
-						<string key="o_demux_bytes_txt">id</string>
-						<string key="o_description_lbl">id</string>
-						<string key="o_description_txt">id</string>
-						<string key="o_displayed_lbl">id</string>
-						<string key="o_displayed_txt">id</string>
-						<string key="o_encodedby_lbl">id</string>
-						<string key="o_encodedby_txt">id</string>
-						<string key="o_genre_lbl">id</string>
-						<string key="o_genre_txt">id</string>
-						<string key="o_image_well">id</string>
-						<string key="o_info_window">id</string>
-						<string key="o_input_bitrate_lbl">id</string>
-						<string key="o_input_bitrate_txt">id</string>
-						<string key="o_input_lbl">id</string>
-						<string key="o_language_lbl">id</string>
-						<string key="o_language_txt">id</string>
-						<string key="o_lost_abuffers_lbl">id</string>
-						<string key="o_lost_abuffers_txt">id</string>
-						<string key="o_lost_frames_lbl">id</string>
-						<string key="o_lost_frames_txt">id</string>
-						<string key="o_nowPlaying_lbl">id</string>
-						<string key="o_nowPlaying_txt">id</string>
-						<string key="o_outline_view">id</string>
-						<string key="o_played_abuffers_lbl">id</string>
-						<string key="o_played_abuffers_txt">id</string>
-						<string key="o_publisher_lbl">id</string>
-						<string key="o_publisher_txt">id</string>
-						<string key="o_read_bytes_lbl">id</string>
-						<string key="o_read_bytes_txt">id</string>
-						<string key="o_saveMetaData_btn">id</string>
-						<string key="o_sent_bitrate_lbl">id</string>
-						<string key="o_sent_bitrate_txt">id</string>
-						<string key="o_sent_bytes_lbl">id</string>
-						<string key="o_sent_bytes_txt">id</string>
-						<string key="o_sent_packets_lbl">id</string>
-						<string key="o_sent_packets_txt">id</string>
-						<string key="o_seqNum_lbl">id</string>
-						<string key="o_seqNum_txt">id</string>
-						<string key="o_sout_lbl">id</string>
-						<string key="o_tab_view">id</string>
-						<string key="o_title_lbl">id</string>
-						<string key="o_title_txt">id</string>
-						<string key="o_uri_lbl">id</string>
-						<string key="o_uri_txt">id</string>
-						<string key="o_video_decoded_lbl">id</string>
-						<string key="o_video_decoded_txt">id</string>
-						<string key="o_video_lbl">id</string>
+						<string key="audioDecodedLabel">NSTextField</string>
+						<string key="audioDecodedTextField">NSTextField</string>
+						<string key="audioLabel">NSTextField</string>
+						<string key="authorLabel">NSTextField</string>
+						<string key="authorTextField">NSTextField</string>
+						<string key="collectionLabel">NSTextField</string>
+						<string key="collectionTextField">NSTextField</string>
+						<string key="copyrightLabel">NSTextField</string>
+						<string key="copyrightTextField">NSTextField</string>
+						<string key="dateLabel">NSTextField</string>
+						<string key="dateTextField">NSTextField</string>
+						<string key="demuxBitrateLabel">NSTextField</string>
+						<string key="demuxBitrateTextField">NSTextField</string>
+						<string key="demuxBytesLabel">NSTextField</string>
+						<string key="demuxBytesTextField">NSTextField</string>
+						<string key="descriptionLabel">NSTextField</string>
+						<string key="descriptionTextField">NSTextField</string>
+						<string key="displayedLabel">NSTextField</string>
+						<string key="displayedTextField">NSTextField</string>
+						<string key="encodedbyLabel">NSTextField</string>
+						<string key="encodedbyTextField">NSTextField</string>
+						<string key="genreLabel">NSTextField</string>
+						<string key="genreTextField">NSTextField</string>
+						<string key="imageWell">NSTextField</string>
+						<string key="infoPanel">NSPanel</string>
+						<string key="inputBitrateLabel">NSTextField</string>
+						<string key="inputBitrateTextField">NSTextField</string>
+						<string key="inputLabel">NSTextField</string>
+						<string key="languageLabel">NSTextField</string>
+						<string key="languageTextField">NSTextField</string>
+						<string key="lostAudioBuffersLabel">NSTextField</string>
+						<string key="lostAudioBuffersTextField">NSTextField</string>
+						<string key="lostFramesLabel">NSTextField</string>
+						<string key="lostFramesTextField">NSTextField</string>
+						<string key="nowPlayingLabel">NSTextField</string>
+						<string key="nowPlayingTextField">NSTextField</string>
+						<string key="outlineView">NSOutlineView</string>
+						<string key="playedAudioBuffersLabel">NSTextField</string>
+						<string key="playedAudioBuffersTextField">NSTextField</string>
+						<string key="publisherLabel">NSTextField</string>
+						<string key="publisherTextField">NSTextField</string>
+						<string key="readBytesLabel">NSTextField</string>
+						<string key="readBytesTextField">NSTextField</string>
+						<string key="saveMetaDataButton">NSButton</string>
+						<string key="sentBitrateLabel">NSTextField</string>
+						<string key="sentBitrateTextField">NSTextField</string>
+						<string key="sentBytesLabel">NSTextField</string>
+						<string key="sentBytesTextField">NSTextField</string>
+						<string key="sentPacketsLabel">NSTextField</string>
+						<string key="sentPacketsTextField">NSTextField</string>
+						<string key="seqNumLabel">NSTextField</string>
+						<string key="seqNumTextField">NSTextField</string>
+						<string key="soutLabel">NSTextField</string>
+						<string key="tabView">NSTabView</string>
+						<string key="titleLabel">NSTextField</string>
+						<string key="titleTextField">NSTextField</string>
+						<string key="uriLabel">NSTextField</string>
+						<string key="uriTextField">NSTextField</string>
+						<string key="videoDecodedLabel">id</string>
+						<string key="videoDecodedTextField">id</string>
+						<string key="videoLabel">NSTextField</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="o_audio_decoded_lbl">
-							<string key="name">o_audio_decoded_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="audioDecodedLabel">
+							<string key="name">audioDecodedLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_audio_decoded_txt">
-							<string key="name">o_audio_decoded_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="audioDecodedTextField">
+							<string key="name">audioDecodedTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_audio_lbl">
-							<string key="name">o_audio_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="audioLabel">
+							<string key="name">audioLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_author_lbl">
-							<string key="name">o_author_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="authorLabel">
+							<string key="name">authorLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_author_txt">
-							<string key="name">o_author_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="authorTextField">
+							<string key="name">authorTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_collection_lbl">
-							<string key="name">o_collection_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="collectionLabel">
+							<string key="name">collectionLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_collection_txt">
-							<string key="name">o_collection_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="collectionTextField">
+							<string key="name">collectionTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_copyright_lbl">
-							<string key="name">o_copyright_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="copyrightLabel">
+							<string key="name">copyrightLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_copyright_txt">
-							<string key="name">o_copyright_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="copyrightTextField">
+							<string key="name">copyrightTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_date_lbl">
-							<string key="name">o_date_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="dateLabel">
+							<string key="name">dateLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_date_txt">
-							<string key="name">o_date_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="dateTextField">
+							<string key="name">dateTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_demux_bitrate_lbl">
-							<string key="name">o_demux_bitrate_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="demuxBitrateLabel">
+							<string key="name">demuxBitrateLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_demux_bitrate_txt">
-							<string key="name">o_demux_bitrate_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="demuxBitrateTextField">
+							<string key="name">demuxBitrateTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_demux_bytes_lbl">
-							<string key="name">o_demux_bytes_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="demuxBytesLabel">
+							<string key="name">demuxBytesLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_demux_bytes_txt">
-							<string key="name">o_demux_bytes_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="demuxBytesTextField">
+							<string key="name">demuxBytesTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_description_lbl">
-							<string key="name">o_description_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="descriptionLabel">
+							<string key="name">descriptionLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_description_txt">
-							<string key="name">o_description_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="descriptionTextField">
+							<string key="name">descriptionTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_displayed_lbl">
-							<string key="name">o_displayed_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="displayedLabel">
+							<string key="name">displayedLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_displayed_txt">
-							<string key="name">o_displayed_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="displayedTextField">
+							<string key="name">displayedTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_encodedby_lbl">
-							<string key="name">o_encodedby_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="encodedbyLabel">
+							<string key="name">encodedbyLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_encodedby_txt">
-							<string key="name">o_encodedby_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="encodedbyTextField">
+							<string key="name">encodedbyTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_genre_lbl">
-							<string key="name">o_genre_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="genreLabel">
+							<string key="name">genreLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_genre_txt">
-							<string key="name">o_genre_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="genreTextField">
+							<string key="name">genreTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_image_well">
-							<string key="name">o_image_well</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="imageWell">
+							<string key="name">imageWell</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_info_window">
-							<string key="name">o_info_window</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="infoPanel">
+							<string key="name">infoPanel</string>
+							<string key="candidateClassName">NSPanel</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_input_bitrate_lbl">
-							<string key="name">o_input_bitrate_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="inputBitrateLabel">
+							<string key="name">inputBitrateLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_input_bitrate_txt">
-							<string key="name">o_input_bitrate_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="inputBitrateTextField">
+							<string key="name">inputBitrateTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_input_lbl">
-							<string key="name">o_input_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="inputLabel">
+							<string key="name">inputLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_language_lbl">
-							<string key="name">o_language_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="languageLabel">
+							<string key="name">languageLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_language_txt">
-							<string key="name">o_language_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="languageTextField">
+							<string key="name">languageTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_lost_abuffers_lbl">
-							<string key="name">o_lost_abuffers_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="lostAudioBuffersLabel">
+							<string key="name">lostAudioBuffersLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_lost_abuffers_txt">
-							<string key="name">o_lost_abuffers_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="lostAudioBuffersTextField">
+							<string key="name">lostAudioBuffersTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_lost_frames_lbl">
-							<string key="name">o_lost_frames_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="lostFramesLabel">
+							<string key="name">lostFramesLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_lost_frames_txt">
-							<string key="name">o_lost_frames_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="lostFramesTextField">
+							<string key="name">lostFramesTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_nowPlaying_lbl">
-							<string key="name">o_nowPlaying_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="nowPlayingLabel">
+							<string key="name">nowPlayingLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_nowPlaying_txt">
-							<string key="name">o_nowPlaying_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="nowPlayingTextField">
+							<string key="name">nowPlayingTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_outline_view">
-							<string key="name">o_outline_view</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="outlineView">
+							<string key="name">outlineView</string>
+							<string key="candidateClassName">NSOutlineView</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_played_abuffers_lbl">
-							<string key="name">o_played_abuffers_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="playedAudioBuffersLabel">
+							<string key="name">playedAudioBuffersLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_played_abuffers_txt">
-							<string key="name">o_played_abuffers_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="playedAudioBuffersTextField">
+							<string key="name">playedAudioBuffersTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_publisher_lbl">
-							<string key="name">o_publisher_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="publisherLabel">
+							<string key="name">publisherLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_publisher_txt">
-							<string key="name">o_publisher_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="publisherTextField">
+							<string key="name">publisherTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_read_bytes_lbl">
-							<string key="name">o_read_bytes_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="readBytesLabel">
+							<string key="name">readBytesLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_read_bytes_txt">
-							<string key="name">o_read_bytes_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="readBytesTextField">
+							<string key="name">readBytesTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_saveMetaData_btn">
-							<string key="name">o_saveMetaData_btn</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="saveMetaDataButton">
+							<string key="name">saveMetaDataButton</string>
+							<string key="candidateClassName">NSButton</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_sent_bitrate_lbl">
-							<string key="name">o_sent_bitrate_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="sentBitrateLabel">
+							<string key="name">sentBitrateLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_sent_bitrate_txt">
-							<string key="name">o_sent_bitrate_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="sentBitrateTextField">
+							<string key="name">sentBitrateTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_sent_bytes_lbl">
-							<string key="name">o_sent_bytes_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="sentBytesLabel">
+							<string key="name">sentBytesLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_sent_bytes_txt">
-							<string key="name">o_sent_bytes_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="sentBytesTextField">
+							<string key="name">sentBytesTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_sent_packets_lbl">
-							<string key="name">o_sent_packets_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="sentPacketsLabel">
+							<string key="name">sentPacketsLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_sent_packets_txt">
-							<string key="name">o_sent_packets_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="sentPacketsTextField">
+							<string key="name">sentPacketsTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_seqNum_lbl">
-							<string key="name">o_seqNum_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="seqNumLabel">
+							<string key="name">seqNumLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_seqNum_txt">
-							<string key="name">o_seqNum_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="seqNumTextField">
+							<string key="name">seqNumTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_sout_lbl">
-							<string key="name">o_sout_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="soutLabel">
+							<string key="name">soutLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_tab_view">
-							<string key="name">o_tab_view</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="tabView">
+							<string key="name">tabView</string>
+							<string key="candidateClassName">NSTabView</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_title_lbl">
-							<string key="name">o_title_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="titleLabel">
+							<string key="name">titleLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_title_txt">
-							<string key="name">o_title_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="titleTextField">
+							<string key="name">titleTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_uri_lbl">
-							<string key="name">o_uri_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="uriLabel">
+							<string key="name">uriLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_uri_txt">
-							<string key="name">o_uri_txt</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="uriTextField">
+							<string key="name">uriTextField</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_video_decoded_lbl">
-							<string key="name">o_video_decoded_lbl</string>
+						<object class="IBToOneOutletInfo" key="videoDecodedLabel">
+							<string key="name">videoDecodedLabel</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_video_decoded_txt">
-							<string key="name">o_video_decoded_txt</string>
+						<object class="IBToOneOutletInfo" key="videoDecodedTextField">
+							<string key="name">videoDecodedTextField</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_video_lbl">
-							<string key="name">o_video_lbl</string>
-							<string key="candidateClassName">id</string>
+						<object class="IBToOneOutletInfo" key="videoLabel">
+							<string key="name">videoLabel</string>
+							<string key="candidateClassName">NSTextField</string>
 						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -4830,6 +4818,14 @@
 						<string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSOutlineView</string>
+					<string key="superclassName">NSTableView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSPanel</string>
 					<string key="superclassName">NSWindow</string>
@@ -4846,6 +4842,14 @@
 						<string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTabView</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTabView.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSTableColumn</string>
 					<string key="superclassName">NSObject</string>
@@ -4854,6 +4858,14 @@
 						<string key="minorKey">AppKit.framework/Headers/NSTableColumn.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTableView</string>
+					<string key="superclassName">NSControl</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSTextField</string>
 					<string key="superclassName">NSControl</string>
diff --git a/modules/gui/macosx/playlistinfo.h b/modules/gui/macosx/playlistinfo.h
index f717f6426efd..6511a5fdf5aa 100644
--- a/modules/gui/macosx/playlistinfo.h
+++ b/modules/gui/macosx/playlistinfo.h
@@ -29,73 +29,72 @@
 @class VLCInfoTreeItem;
 
 @interface VLCInfo : NSObject
-{
-    IBOutlet id o_info_window;
-    IBOutlet id o_uri_lbl;
-    IBOutlet id o_title_lbl;
-    IBOutlet id o_author_lbl;
-    IBOutlet id o_uri_txt;
-    IBOutlet id o_title_txt;
-    IBOutlet id o_author_txt;
-    IBOutlet id o_outline_view;
 
-    IBOutlet id o_tab_view;
+@property (readonly) input_item_t *item;
 
-    IBOutlet id o_collection_lbl;
-    IBOutlet id o_collection_txt;
-    IBOutlet id o_copyright_lbl;
-    IBOutlet id o_copyright_txt;
-    IBOutlet id o_date_lbl;
-    IBOutlet id o_date_txt;
-    IBOutlet id o_description_lbl;
-    IBOutlet id o_description_txt;
-    IBOutlet id o_encodedby_lbl;
-    IBOutlet id o_encodedby_txt;
-    IBOutlet id o_genre_lbl;
-    IBOutlet id o_genre_txt;
-    IBOutlet id o_language_lbl;
-    IBOutlet id o_language_txt;
-    IBOutlet id o_nowPlaying_lbl;
-    IBOutlet id o_nowPlaying_txt;
-    IBOutlet id o_publisher_lbl;
-    IBOutlet id o_publisher_txt;
-    IBOutlet id o_seqNum_lbl;
-    IBOutlet id o_seqNum_txt;
-    IBOutlet id o_image_well;
-    IBOutlet id o_saveMetaData_btn;
+@property (readwrite, weak) IBOutlet NSPanel *infoPanel;
+@property (readwrite, weak) IBOutlet NSOutlineView *outlineView;
+@property (readwrite, weak) IBOutlet NSTabView *tabView;
 
-    IBOutlet id o_audio_lbl;
-    IBOutlet id o_audio_decoded_lbl;
-    IBOutlet id o_audio_decoded_txt;
-    IBOutlet id o_demux_bitrate_lbl;
-    IBOutlet id o_demux_bitrate_txt;
-    IBOutlet id o_demux_bytes_lbl;
-    IBOutlet id o_demux_bytes_txt;
-    IBOutlet id o_displayed_lbl;
-    IBOutlet id o_displayed_txt;
-    IBOutlet id o_input_bitrate_lbl;
-    IBOutlet id o_input_bitrate_txt;
-    IBOutlet id o_input_lbl;
-    IBOutlet id o_lost_abuffers_lbl;
-    IBOutlet id o_lost_abuffers_txt;
-    IBOutlet id o_lost_frames_lbl;
-    IBOutlet id o_lost_frames_txt;
-    IBOutlet id o_played_abuffers_lbl;
-    IBOutlet id o_played_abuffers_txt;
-    IBOutlet id o_read_bytes_lbl;
-    IBOutlet id o_read_bytes_txt;
-    IBOutlet id o_sent_bitrate_lbl;
-    IBOutlet id o_sent_bitrate_txt;
-    IBOutlet id o_sent_bytes_lbl;
-    IBOutlet id o_sent_bytes_txt;
-    IBOutlet id o_sent_packets_lbl;
-    IBOutlet id o_sent_packets_txt;
-    IBOutlet id o_sout_lbl;
-    IBOutlet id o_video_lbl;
-    IBOutlet id o_video_decoded_lbl;
-    IBOutlet id o_video_decoded_txt;
-}
-@property (readonly) input_item_t *item;
+@property (readwrite, weak) IBOutlet NSTextField *uriLabel;
+@property (readwrite, weak) IBOutlet NSTextField *titleLabel;
+@property (readwrite, weak) IBOutlet NSTextField *authorLabel;
+@property (readwrite, weak) IBOutlet NSTextField *uriTextField;
+@property (readwrite, weak) IBOutlet NSTextField *titleTextField;
+@property (readwrite, weak) IBOutlet NSTextField *authorTextField;
+@property (readwrite, weak) IBOutlet NSTextField *collectionLabel;
+@property (readwrite, weak) IBOutlet NSTextField *collectionTextField;
+@property (readwrite, weak) IBOutlet NSTextField *copyrightLabel;
+@property (readwrite, weak) IBOutlet NSTextField *copyrightTextField;
+@property (readwrite, weak) IBOutlet NSTextField *dateLabel;
+@property (readwrite, weak) IBOutlet NSTextField *dateTextField;
+@property (readwrite, weak) IBOutlet NSTextField *descriptionLabel;
+@property (readwrite, weak) IBOutlet NSTextField *descriptionTextField;
+@property (readwrite, weak) IBOutlet NSTextField *encodedbyLabel;
+@property (readwrite, weak) IBOutlet NSTextField *encodedbyTextField;
+@property (readwrite, weak) IBOutlet NSTextField *genreLabel;
+@property (readwrite, weak) IBOutlet NSTextField *genreTextField;
+@property (readwrite, weak) IBOutlet NSTextField *languageLabel;
+@property (readwrite, weak) IBOutlet NSTextField *languageTextField;
+@property (readwrite, weak) IBOutlet NSTextField *nowPlayingLabel;
+@property (readwrite, weak) IBOutlet NSTextField *nowPlayingTextField;
+@property (readwrite, weak) IBOutlet NSTextField *publisherLabel;
+@property (readwrite, weak) IBOutlet NSTextField *publisherTextField;
+@property (readwrite, weak) IBOutlet NSTextField *seqNumLabel;
+@property (readwrite, weak) IBOutlet NSTextField *seqNumTextField;
+@property (readwrite, weak) IBOutlet NSImageView *imageWell;
+@property (readwrite, weak) IBOutlet NSButton *saveMetaDataButton;
+
+@property (readwrite, weak) IBOutlet NSTextField *audioLabel;
+@property (readwrite, weak) IBOutlet NSTextField *audioDecodedLabel;
+@property (readwrite, weak) IBOutlet NSTextField *audioDecodedTextField;
+@property (readwrite, weak) IBOutlet NSTextField *demuxBitrateLabel;
+@property (readwrite, weak) IBOutlet NSTextField *demuxBitrateTextField;
+@property (readwrite, weak) IBOutlet NSTextField *demuxBytesLabel;
+@property (readwrite, weak) IBOutlet NSTextField *demuxBytesTextField;
+@property (readwrite, weak) IBOutlet NSTextField *displayedLabel;
+@property (readwrite, weak) IBOutlet NSTextField *displayedTextField;
+@property (readwrite, weak) IBOutlet NSTextField *inputBitrateLabel;
+@property (readwrite, weak) IBOutlet NSTextField *inputBitrateTextField;
+@property (readwrite, weak) IBOutlet NSTextField *inputLabel;
+@property (readwrite, weak) IBOutlet NSTextField *lostAudioBuffersLabel;
+@property (readwrite, weak) IBOutlet NSTextField *lostAudioBuffersTextField;
+@property (readwrite, weak) IBOutlet NSTextField *lostFramesLabel;
+@property (readwrite, weak) IBOutlet NSTextField *lostFramesTextField;
+@property (readwrite, weak) IBOutlet NSTextField *playedAudioBuffersLabel;
+@property (readwrite, weak) IBOutlet NSTextField *playedAudioBuffersTextField;
+@property (readwrite, weak) IBOutlet NSTextField *readBytesLabel;
+@property (readwrite, weak) IBOutlet NSTextField *readBytesTextField;
+@property (readwrite, weak) IBOutlet NSTextField *sentBitrateLabel;
+@property (readwrite, weak) IBOutlet NSTextField *sentBitrateTextField;
+@property (readwrite, weak) IBOutlet NSTextField *sentBytesLabel;
+@property (readwrite, weak) IBOutlet NSTextField *sentBytesTextField;
+@property (readwrite, weak) IBOutlet NSTextField *sentPacketsLabel;
+@property (readwrite, weak) IBOutlet NSTextField *sentPacketsTextField;
+@property (readwrite, weak) IBOutlet NSTextField *soutLabel;
+@property (readwrite, weak) IBOutlet NSTextField *videoLabel;
+@property (readwrite, weak) IBOutlet NSTextField *videoDecodedLabel;
+@property (readwrite, weak) IBOutlet NSTextField *videoDecodedTextField;
 
 - (void)updateCocoaWindowLevel:(NSInteger)i_level;
 - (void)initPanel;
diff --git a/modules/gui/macosx/playlistinfo.m b/modules/gui/macosx/playlistinfo.m
index b3eb8d292560..8da48fafbec8 100644
--- a/modules/gui/macosx/playlistinfo.m
+++ b/modules/gui/macosx/playlistinfo.m
@@ -1,5 +1,5 @@
 /*****************************************************************************
- r playlistinfo.m: MacOS X interface module
+ * playlistinfo.m: MacOS X interface module
  *****************************************************************************
  * Copyright (C) 2002-2015 VLC authors and VideoLAN
  * $Id$
@@ -20,11 +20,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
+ ******************************************************************************/
 
 #import "CompatibilityFixes.h"
 #import "intf.h"
@@ -32,16 +28,13 @@
 #import "playlist.h"
 #import <vlc_url.h>
 
-/*****************************************************************************
- * VLCPlaylistInfo Implementation
- *****************************************************************************/
-
-@interface VLCInfo ()
+@interface VLCInfo () <NSOutlineViewDataSource, NSOutlineViewDelegate>
 {
     VLCInfoTreeItem *rootItem;
 
     input_item_t *p_item;
 
+    BOOL b_nibLoaded;
     BOOL b_awakeFromNib;
     BOOL b_stats;
 }
@@ -49,85 +42,79 @@ @interface VLCInfo ()
 
 @implementation VLCInfo
 
-static VLCInfo *_o_sharedInstance = nil;
-
 + (VLCInfo *)sharedInstance
 {
-    return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init];
-}
-
-- (id)init
-{
-    if (!_o_sharedInstance) {
-        _o_sharedInstance = [super init];
+    static VLCInfo *sharedInstance = nil;
+    static dispatch_once_t pred;
 
-        if (_o_sharedInstance != nil) {
-            p_item = NULL;
-            [self updatePanelWithItem: NULL];
-            rootItem = [[VLCInfoTreeItem alloc] init];
-        }
-    }
+    dispatch_once(&pred, ^{
+        sharedInstance = [VLCInfo new];
+    });
 
-    return _o_sharedInstance;
+    return sharedInstance;
 }
 
 - (void)awakeFromNib
 {
-    [o_info_window setExcludedFromWindowsMenu: YES];
+    [_infoPanel setExcludedFromWindowsMenu: YES];
     if (!OSX_SNOW_LEOPARD)
-        [o_info_window setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
+        [_infoPanel setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
+
+    [_infoPanel setTitle: _NS("Media Information")];
 
-    [o_info_window setTitle: _NS("Media Information")];
-    [o_uri_lbl setStringValue: _NS("Location")];
-    [o_title_lbl setStringValue: _NS("Title")];
-    [o_author_lbl setStringValue: _NS("Artist")];
-    [o_saveMetaData_btn setStringValue: _NS("Save Metadata")];
+    _outlineView.dataSource = self;
+    _outlineView.delegate = self;
 
-    [[o_tab_view tabViewItemAtIndex: 0] setLabel: _NS("General")];
-    [[o_tab_view tabViewItemAtIndex: 1] setLabel: _NS("Codec Details")];
-    [[o_tab_view tabViewItemAtIndex: 2] setLabel: _NS("Statistics")];
-    [o_tab_view selectTabViewItemAtIndex: 0];
+    [_uriLabel setStringValue: _NS("Location")];
+    [_titleLabel setStringValue: _NS("Title")];
+    [_authorLabel setStringValue: _NS("Artist")];
+    [_saveMetaDataButton setStringValue: _NS("Save Metadata")];
+
+    [[_tabView tabViewItemAtIndex: 0] setLabel: _NS("General")];
+    [[_tabView tabViewItemAtIndex: 1] setLabel: _NS("Codec Details")];
+    [[_tabView tabViewItemAtIndex: 2] setLabel: _NS("Statistics")];
+    [_tabView selectTabViewItemAtIndex: 0];
 
     /* constants defined in vlc_meta.h */
-    [o_genre_lbl setStringValue: _NS(VLC_META_GENRE)];
-    [o_copyright_lbl setStringValue: _NS(VLC_META_COPYRIGHT)];
-    [o_collection_lbl setStringValue: _NS(VLC_META_ALBUM)];
-    [o_seqNum_lbl setStringValue: _NS(VLC_META_TRACK_NUMBER)];
-    [o_description_lbl setStringValue: _NS(VLC_META_DESCRIPTION)];
-    [o_date_lbl setStringValue: _NS(VLC_META_DATE)];
-    [o_language_lbl setStringValue: _NS(VLC_META_LANGUAGE)];
-    [o_nowPlaying_lbl setStringValue: _NS(VLC_META_NOW_PLAYING)];
-    [o_publisher_lbl setStringValue: _NS(VLC_META_PUBLISHER)];
-    [o_encodedby_lbl setStringValue: _NS(VLC_META_ENCODED_BY)];
+    [_genreLabel setStringValue: _NS(VLC_META_GENRE)];
+    [_copyrightLabel setStringValue: _NS(VLC_META_COPYRIGHT)];
+    [_collectionLabel setStringValue: _NS(VLC_META_ALBUM)];
+    [_seqNumLabel setStringValue: _NS(VLC_META_TRACK_NUMBER)];
+    [_descriptionLabel setStringValue: _NS(VLC_META_DESCRIPTION)];
+    [_dateLabel setStringValue: _NS(VLC_META_DATE)];
+    [_languageLabel setStringValue: _NS(VLC_META_LANGUAGE)];
+    [_nowPlayingLabel setStringValue: _NS(VLC_META_NOW_PLAYING)];
+    [_publisherLabel setStringValue: _NS(VLC_META_PUBLISHER)];
+    [_encodedbyLabel setStringValue: _NS(VLC_META_ENCODED_BY)];
 
     /* statistics */
-    [o_input_lbl setStringValue: _NS("Input")];
-    [o_read_bytes_lbl setStringValue: _NS("Read at media")];
-    [o_input_bitrate_lbl setStringValue: _NS("Input bitrate")];
-    [o_demux_bytes_lbl setStringValue: _NS("Demuxed")];
-    [o_demux_bitrate_lbl setStringValue: _NS("Stream bitrate")];
+    [_inputLabel setStringValue: _NS("Input")];
+    [_readBytesLabel setStringValue: _NS("Read at media")];
+    [_inputBitrateLabel setStringValue: _NS("Input bitrate")];
+    [_demuxBytesLabel setStringValue: _NS("Demuxed")];
+    [_demuxBitrateLabel setStringValue: _NS("Stream bitrate")];
 
-    [o_video_lbl setStringValue: _NS("Video")];
-    [o_video_decoded_lbl setStringValue: _NS("Decoded blocks")];
-    [o_displayed_lbl setStringValue: _NS("Displayed frames")];
-    [o_lost_frames_lbl setStringValue: _NS("Lost frames")];
+    [_videoLabel setStringValue: _NS("Video")];
+    [_videoDecodedLabel setStringValue: _NS("Decoded blocks")];
+    [_displayedLabel setStringValue: _NS("Displayed frames")];
+    [_lostFramesLabel setStringValue: _NS("Lost frames")];
 
-    [o_sout_lbl setStringValue: _NS("Streaming")];
-    [o_sent_packets_lbl setStringValue: _NS("Sent packets")];
-    [o_sent_bytes_lbl setStringValue: _NS("Sent bytes")];
-    [o_sent_bitrate_lbl setStringValue: _NS("Send rate")];
+    [_soutLabel setStringValue: _NS("Streaming")];
+    [_sentPacketsLabel setStringValue: _NS("Sent packets")];
+    [_sentBytesLabel setStringValue: _NS("Sent bytes")];
+    [_sentBitrateLabel setStringValue: _NS("Send rate")];
 
-    [o_audio_lbl setStringValue: _NS("Audio")];
-    [o_audio_decoded_lbl setStringValue: _NS("Decoded blocks")];
-    [o_played_abuffers_lbl setStringValue: _NS("Played buffers")];
-    [o_lost_abuffers_lbl setStringValue: _NS("Lost buffers")];
+    [_audioLabel setStringValue: _NS("Audio")];
+    [_audioDecodedLabel setStringValue: _NS("Decoded blocks")];
+    [_playedAudioBuffersLabel setStringValue: _NS("Played buffers")];
+    [_lostAudioBuffersLabel setStringValue: _NS("Lost buffers")];
 
-    [o_info_window setInitialFirstResponder: o_uri_txt];
+    [_infoPanel setInitialFirstResponder: _uriLabel];
 
     b_awakeFromNib = YES;
 
     /* We may be awoken from nib way after initialisation
-     * Update ourselves */
+     *Update ourselves */
     [self updatePanelWithItem:p_item];
 }
 
@@ -140,48 +127,50 @@ - (void)dealloc
 
 - (void)updateCocoaWindowLevel:(NSInteger)i_level
 {
-    if (o_info_window && [o_info_window isVisible] && [o_info_window level] != i_level)
-        [o_info_window setLevel: i_level];
+    if (_infoPanel && [_infoPanel isVisible] && [_infoPanel level] != i_level)
+        [_infoPanel setLevel: i_level];
 }
 
 - (void)initPanel
 {
+    if (!b_nibLoaded)
+        b_nibLoaded = [NSBundle loadNibNamed:@"MediaInfo" owner: self];
+
     b_stats = var_InheritBool(VLCIntf, "stats");
     if (!b_stats) {
-        if ([o_tab_view numberOfTabViewItems] > 2)
-            [o_tab_view removeTabViewItem: [o_tab_view tabViewItemAtIndex: 2]];
+        if ([_tabView numberOfTabViewItems] > 2)
+            [_tabView removeTabViewItem: [_tabView tabViewItemAtIndex: 2]];
     }
     else
         [self initMediaPanelStats];
 
     NSInteger i_level = [[[VLCMain sharedInstance] voutController] currentStatusWindowLevel];
-    [o_info_window setLevel: i_level];
-    [o_info_window makeKeyAndOrderFront:nil];
+    [_infoPanel setLevel: i_level];
+    [_infoPanel makeKeyAndOrderFront:nil];
 }
 
 - (void)initMediaPanelStats
 {
     //Initializing Input Variables
-    [o_read_bytes_txt setStringValue: [NSString stringWithFormat:_NS("%.1f KiB"), (float)0]];
-    [o_input_bitrate_txt setStringValue: [NSString stringWithFormat:@"%6.0f kb/s", (float)0]];
-    [o_demux_bytes_txt setStringValue: [NSString stringWithFormat:_NS("%.1f KiB"), (float)0]];
-    [o_demux_bitrate_txt setStringValue: [NSString stringWithFormat:@"%6.0f kb/s", (float)0]];
+    [_readBytesTextField setStringValue: [NSString stringWithFormat:_NS("%.1f KiB"), (float)0]];
+    [_inputBitrateTextField setStringValue: [NSString stringWithFormat:@"%6.0f kb/s", (float)0]];
+    [_demuxBytesTextField setStringValue: [NSString stringWithFormat:_NS("%.1f KiB"), (float)0]];
+    [_demuxBitrateTextField setStringValue: [NSString stringWithFormat:@"%6.0f kb/s", (float)0]];
 
     //Initializing Video Variables
-    [o_video_decoded_txt setIntValue:0];
-    [o_displayed_txt setIntValue:0];
-    [o_lost_frames_txt setIntValue:0];
+    [_videoDecodedTextField setIntValue:0];
+    [_displayedTextField setIntValue:0];
+    [_lostFramesTextField setIntValue:0];
 
     //Initializing Output Variables
-    [o_sent_packets_txt setIntValue: 0];
-    [o_sent_bytes_txt setStringValue: [NSString stringWithFormat:_NS("%.1f KiB"), (float)0]];
-    [o_sent_bitrate_txt setStringValue: [NSString stringWithFormat:@"%6.0f kb/s", (float)0]];
+    [_sentPacketsTextField setIntValue: 0];
+    [_sentBytesTextField setStringValue: [NSString stringWithFormat:_NS("%.1f KiB"), (float)0]];
+    [_sentBitrateTextField setStringValue: [NSString stringWithFormat:@"%6.0f kb/s", (float)0]];
 
     //Initializing Audio Variables
-    [o_audio_decoded_txt setIntValue:0];
-    [o_played_abuffers_txt setIntValue: 0];
-    [o_lost_abuffers_txt setIntValue: 0];
-
+    [_audioDecodedTextField setIntValue:0];
+    [_playedAudioBuffersTextField setIntValue: 0];
+    [_lostAudioBuffersTextField setIntValue: 0];
 }
 
 - (void)updateMetadata
@@ -195,17 +184,21 @@ - (void)updateMetadata
 - (void)updatePanelWithItem:(input_item_t *)_p_item;
 {
     @autoreleasepool {
+        rootItem = [[VLCInfoTreeItem alloc] init];
+
         if (_p_item != p_item) {
-            if (p_item) vlc_gc_decref(p_item);
-            [o_saveMetaData_btn setEnabled: NO];
-            if (_p_item) vlc_gc_incref(_p_item);
+            if (p_item)
+                vlc_gc_decref(p_item);
+            [_saveMetaDataButton setEnabled: NO];
+            if (_p_item)
+                vlc_gc_incref(_p_item);
             p_item = _p_item;
         }
 
         if (!p_item) {
             /* Erase */
         #define SET( foo ) \
-            [self setMeta: "" forLabel: o_##foo##_txt];
+            [self setMeta: "" forLabel: _##foo##TextField];
             SET( uri );
             SET( title );
             SET( author );
@@ -220,26 +213,26 @@ - (void)updatePanelWithItem:(input_item_t *)_p_item;
             SET( description );
             SET( encodedby );
         #undef SET
-            [o_image_well setImage: [NSImage imageNamed: @"noart.png"]];
+            [_imageWell setImage: [NSImage imageNamed: @"noart.png"]];
         } else {
             if (!input_item_IsPreparsed(p_item))
                 libvlc_MetaRequest(VLCIntf->p_libvlc, p_item, META_REQUEST_OPTION_NONE);
 
             /* fill uri info */
-            char * psz_url = decode_URI(input_item_GetURI(p_item));
-            [o_uri_txt setStringValue: [NSString stringWithUTF8String:psz_url ? psz_url : ""]];
+            char *psz_url = decode_URI(input_item_GetURI(p_item));
+            [_uriTextField setStringValue: [NSString stringWithUTF8String:psz_url ? psz_url : ""]];
             free(psz_url);
 
             /* fill title info */
-            char * psz_title = input_item_GetTitle(p_item);
+            char *psz_title = input_item_GetTitle(p_item);
             if (!psz_title)
                 psz_title = input_item_GetName(p_item);
-            [o_title_txt setStringValue: [NSString stringWithUTF8String:psz_title ? : ""]];
+            [_titleTextField setStringValue: [NSString stringWithUTF8String:psz_title ? : ""]];
             free(psz_title);
 
         #define SET( foo, bar ) \
             char *psz_##foo = input_item_Get##bar ( p_item ); \
-            [self setMeta: psz_##foo forLabel: o_##foo##_txt]; \
+            [self setMeta: psz_##foo forLabel: _##foo##TextField]; \
             FREENULL( psz_##foo );
 
             /* fill the other fields */
@@ -258,22 +251,22 @@ - (void)updatePanelWithItem:(input_item_t *)_p_item;
         #undef SET
 
             char *psz_meta;
-            NSImage *o_image;
+            NSImage *image;
             psz_meta = input_item_GetArtURL(p_item);
 
             /* FIXME Can also be attachment:// */
             if (psz_meta && strncmp(psz_meta, "attachment://", 13))
-                o_image = [[NSImage alloc] initWithContentsOfURL: [NSURL URLWithString:[NSString stringWithUTF8String:psz_meta]]];
+                image = [[NSImage alloc] initWithContentsOfURL: [NSURL URLWithString:[NSString stringWithUTF8String:psz_meta]]];
             else
-                o_image = [NSImage imageNamed: @"noart.png"];
-            [o_image_well setImage: o_image];
+                image = [NSImage imageNamed: @"noart.png"];
+            [_imageWell setImage: image];
             FREENULL(psz_meta);
         }
 
         /* reload the advanced table */
         [rootItem refresh];
-        [o_outline_view reloadData];
-        [o_outline_view expandItem:nil expandChildren:YES];
+        [_outlineView reloadData];
+        [_outlineView expandItem:nil expandChildren:YES];
 
         /* update the stats once to display p_item change faster */
         [self updateStatistics];
@@ -293,7 +286,7 @@ - (void)updateStatistics
     if (!b_awakeFromNib || !b_stats)
         return;
 
-    if ([o_info_window isVisible]) {
+    if ([_infoPanel isVisible]) {
         if (!p_item || !p_item->p_stats) {
             [self initMediaPanelStats];
             return;
@@ -302,31 +295,31 @@ - (void)updateStatistics
         vlc_mutex_lock(&p_item->p_stats->lock);
 
         /* input */
-        [o_read_bytes_txt setStringValue: [NSString stringWithFormat:
+        [_readBytesTextField setStringValue: [NSString stringWithFormat:
             @"%8.0f KiB", (float)(p_item->p_stats->i_read_bytes)/1024]];
-        [o_input_bitrate_txt setStringValue: [NSString stringWithFormat:
+        [_inputBitrateTextField setStringValue: [NSString stringWithFormat:
             @"%6.0f kb/s", (float)(p_item->p_stats->f_input_bitrate)*8000]];
-        [o_demux_bytes_txt setStringValue: [NSString stringWithFormat:
+        [_demuxBytesTextField setStringValue: [NSString stringWithFormat:
             @"%8.0f KiB", (float)(p_item->p_stats->i_demux_read_bytes)/1024]];
-        [o_demux_bitrate_txt setStringValue: [NSString stringWithFormat:
+        [_demuxBitrateTextField setStringValue: [NSString stringWithFormat:
             @"%6.0f kb/s", (float)(p_item->p_stats->f_demux_bitrate)*8000]];
 
         /* Video */
-        [o_video_decoded_txt setIntValue: p_item->p_stats->i_decoded_video];
-        [o_displayed_txt setIntValue: p_item->p_stats->i_displayed_pictures];
-        [o_lost_frames_txt setIntValue: p_item->p_stats->i_lost_pictures];
+        [_videoDecodedTextField setIntValue: p_item->p_stats->i_decoded_video];
+        [_displayedTextField setIntValue: p_item->p_stats->i_displayed_pictures];
+        [_lostFramesTextField setIntValue: p_item->p_stats->i_lost_pictures];
 
         /* Sout */
-        [o_sent_packets_txt setIntValue: p_item->p_stats->i_sent_packets];
-        [o_sent_bytes_txt setStringValue: [NSString stringWithFormat: @"%8.0f KiB",
+        [_sentPacketsTextField setIntValue: p_item->p_stats->i_sent_packets];
+        [_sentBytesTextField setStringValue: [NSString stringWithFormat: @"%8.0f KiB",
             (float)(p_item->p_stats->i_sent_bytes)/1024]];
-        [o_sent_bitrate_txt setStringValue: [NSString stringWithFormat:
+        [_sentBitrateTextField setStringValue: [NSString stringWithFormat:
             @"%6.0f kb/s", (float)(p_item->p_stats->f_send_bitrate*8)*1000]];
 
         /* Audio */
-        [o_audio_decoded_txt setIntValue: p_item->p_stats->i_decoded_audio];
-        [o_played_abuffers_txt setIntValue: p_item->p_stats->i_played_abuffers];
-        [o_lost_abuffers_txt setIntValue: p_item->p_stats->i_lost_abuffers];
+        [_audioDecodedTextField setIntValue: p_item->p_stats->i_decoded_audio];
+        [_playedAudioBuffersTextField setIntValue: p_item->p_stats->i_played_abuffers];
+        [_lostAudioBuffersTextField setIntValue: p_item->p_stats->i_lost_abuffers];
 
         vlc_mutex_unlock(&p_item->p_stats->lock);
     }
@@ -334,7 +327,7 @@ - (void)updateStatistics
 
 - (IBAction)metaFieldChanged:(id)sender
 {
-    [o_saveMetaData_btn setEnabled: YES];
+    [_saveMetaDataButton setEnabled: YES];
 }
 
 - (IBAction)saveMetaData:(id)sender
@@ -342,28 +335,28 @@ - (IBAction)saveMetaData:(id)sender
     if (!p_item)
         goto error;
 
-    #define utf8( o_blub ) \
-        [[o_blub stringValue] UTF8String]
-
-    input_item_SetName( p_item, utf8( o_title_txt ) );
-    input_item_SetTitle( p_item, utf8( o_title_txt ) );
-    input_item_SetArtist( p_item, utf8( o_author_txt ) );
-    input_item_SetAlbum( p_item, utf8( o_collection_txt ) );
-    input_item_SetGenre( p_item, utf8( o_genre_txt ) );
-    input_item_SetTrackNum( p_item, utf8( o_seqNum_txt ) );
-    input_item_SetDate( p_item, utf8( o_date_txt ) );
-    input_item_SetCopyright( p_item, utf8( o_copyright_txt ) );
-    input_item_SetPublisher( p_item, utf8( o_publisher_txt ) );
-    input_item_SetDescription( p_item, utf8( o_description_txt ) );
-    input_item_SetLanguage( p_item, utf8( o_language_txt ) );
-
-    playlist_t * p_playlist = pl_Get(VLCIntf);
+    #define utf8( _blub ) \
+        [[_blub stringValue] UTF8String]
+
+    input_item_SetName( p_item, utf8( _titleTextField ) );
+    input_item_SetTitle( p_item, utf8( _titleTextField ) );
+    input_item_SetArtist( p_item, utf8( _authorTextField ) );
+    input_item_SetAlbum( p_item, utf8( _collectionTextField ) );
+    input_item_SetGenre( p_item, utf8( _genreTextField ) );
+    input_item_SetTrackNum( p_item, utf8( _seqNumTextField ) );
+    input_item_SetDate( p_item, utf8( _dateTextField ) );
+    input_item_SetCopyright( p_item, utf8( _copyrightTextField ) );
+    input_item_SetPublisher( p_item, utf8( _publisherTextField ) );
+    input_item_SetDescription( p_item, utf8( _descriptionTextField ) );
+    input_item_SetLanguage( p_item, utf8( _languageTextField ) );
+
+    playlist_t *p_playlist = pl_Get(VLCIntf);
     input_item_WriteMeta(VLC_OBJECT(p_playlist), p_item);
 
     var_SetBool(p_playlist, "intf-change", true);
     [self updatePanelWithItem: p_item];
 
-    [o_saveMetaData_btn setEnabled: NO];
+    [_saveMetaDataButton setEnabled: NO];
     return;
 
 error:
@@ -374,7 +367,7 @@ - (IBAction)saveMetaData:(id)sender
 
 - (IBAction)downloadCoverArt:(id)sender
 {
-    playlist_t * p_playlist = pl_Get(VLCIntf);
+    playlist_t *p_playlist = pl_Get(VLCIntf);
     if (p_item) libvlc_ArtRequest(VLCIntf->p_libvlc, p_item, META_REQUEST_OPTION_NONE);
 }
 
@@ -388,11 +381,9 @@ - (input_item_t *)item
 
 @implementation VLCInfo (NSMenuValidation)
 
-- (BOOL)validateMenuItem:(NSMenuItem *)o_mi
+- (BOOL)validateMenuItem:(NSMenuItem *)mi
 {
-    BOOL bEnabled = TRUE;
-
-    if ([[o_mi title] isEqualToString: _NS("Information")]) {
+    if ([[mi title] isEqualToString: _NS("Information")]) {
         return ![[[VLCMain sharedInstance] playlist] isSelectionEmpty];
     }
 
@@ -430,7 +421,7 @@ - (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTabl
 @interface VLCInfoTreeItem ()
 {
     int i_object_id;
-    input_item_t * p_item;
+    input_item_t *p_item;
     VLCInfoTreeItem *_parent;
     NSMutableArray *_children;
     BOOL _isALeafNode;
@@ -452,7 +443,7 @@ - (id)initWithName:(NSString *)item_name
         _value = [item_value copy];
         i_object_id = i_id;
         _parent = parent_item;
-        p_item = [(VLCInfo *)[[VLCMain sharedInstance] info] item];
+        p_item = [[VLCInfo sharedInstance] item];
     }
     return self;
 }
@@ -469,7 +460,7 @@ - (void)dealloc
 }
 
 /* Creates and returns the array of children
- * Loads children incrementally */
+ *Loads children incrementally */
 - (void)_updateChildren
 {
     if (!p_item)
@@ -499,7 +490,7 @@ - (void)_updateChildren
     }
     else if (_parent->i_object_id == -1) {
         vlc_mutex_lock(&p_item->lock);
-        info_category_t * cat = p_item->pp_categories[i_object_id];
+        info_category_t *cat = p_item->pp_categories[i_object_id];
         for (int i = 0 ; i < cat->i_infos ; i++) {
             NSString *name;
             NSString *value;