Removes trailing spaces. Removes tabs.

[vlc] / modules / gui / macosx / playlistinfo.m

diff --git a/modules/gui/macosx/playlistinfo.m b/modules/gui/macosx/playlistinfo.m
index 83c11b375b7b62c2faffbb3016ce1788f1922b97..30ab5796f18eb576ae642a37aaa21405333c645f 100644 (file)
--- a/modules/gui/macosx/playlistinfo.m
+++ b/modules/gui/macosx/playlistinfo.m
@@ -58,7 +58,7 @@
     [o_author_lbl setStringValue: _NS("Author")];
     [o_btn_ok setTitle: _NS("OK")];
     [o_btn_cancel setTitle: _NS("Cancel")];
-    
+ 
     [[o_tab_view tabViewItemAtIndex: 0] setLabel: _NS("General")];
     [[o_tab_view tabViewItemAtIndex: 1] setLabel: _NS("Advanced Information")];
     [[o_tab_view tabViewItemAtIndex: 2] setLabel: _NS("Statistics")];
@@ -75,24 +75,24 @@
     [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)];
-    
+ 
     /* statistics */
     [o_input_box setTitle: _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")];
-    
+ 
     [o_video_box setTitle: _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")];
-    
+ 
     [o_sout_box setTitle: _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")];
-    
+ 
     [o_audio_box setTitle: _NS("Audio")];
     [o_audio_decoded_lbl setStringValue: _NS("Decoded blocks")];
     [o_played_abuffers_lbl setStringValue: _NS("Played buffers")];
@@ -120,7 +120,7 @@
     [super finalize];
 }
 #endif
-    
+ 
 - (IBAction)togglePlaylistInfoPanel:(id)sender
 {
     if( [o_info_window isVisible] )
@@ -149,7 +149,7 @@
 
         p_item = p_playlist->status.p_item;
         vlc_object_release( p_playlist );
-        
+ 
         [self initPanel:sender];
     }
 }
@@ -161,7 +161,7 @@
     {
         o_statUpdateTimer = [NSTimer scheduledTimerWithTimeInterval: 1
             target: self selector: @selector(updateStatistics:)
-            userInfo: nil repeats: YES]; 
+            userInfo: nil repeats: YES];
         [o_statUpdateTimer fire];
         [o_statUpdateTimer retain];
     }
@@ -187,32 +187,36 @@
     /* check whether our item is valid, because we would crash if not */
     if(! [self isItemInPlaylist: p_item] ) return;
 
-    vlc_mutex_lock( &p_item->p_input->lock );
-
     /* fill uri info */
-    if( p_item->p_input->psz_uri )
+    char *psz_uri = input_item_GetURI( p_item->p_input );
+    if( psz_uri )
     {
         [o_uri_txt setStringValue:
-            ([NSString stringWithUTF8String:p_item->p_input->psz_uri] == nil ) ?
-            [NSString stringWithCString:p_item->p_input->psz_uri] :
-            [NSString stringWithUTF8String:p_item->p_input->psz_uri]];
+            ([NSString stringWithUTF8String:psz_uri] == nil ) ?
+            [NSString stringWithCString:psz_uri] :
+            [NSString stringWithUTF8String:psz_uri]];
     }
+    free( psz_uri );
+
+#define SET( foo, bar ) \
+    char *psz_##foo = input_item_Get##bar ( p_item->p_input ); \
+    [self setMeta: psz_##foo forlabel: o_##foo##_txt]; \
+    free( psz_##foo );
 
     /* fill the other fields */
-#define p_m p_item->p_input->p_meta
-    [self setMeta: p_m->psz_title forLabel: o_title_txt];
-    [self setMeta: p_m->psz_artist forLabel: o_author_txt];
-    [self setMeta: p_m->psz_album forLabel: o_collection_txt];
-    [self setMeta: p_m->psz_tracknum forLabel: o_seqNum_txt];
-    [self setMeta: p_m->psz_genre forLabel: o_genre_txt];
-    [self setMeta: p_m->psz_copyright forLabel: o_copyright_txt];
-    [self setMeta: p_m->psz_rating forLabel: o_rating_txt];
-    [self setMeta: p_m->psz_publisher forLabel: o_publisher_txt];
-    [self setMeta: p_m->psz_nowplaying forLabel: o_nowPlaying_txt];
-    [self setMeta: p_m->psz_language forLabel: o_language_txt];
-    [self setMeta: p_m->psz_date forLabel: o_date_txt];
-#undef p_m
-    vlc_mutex_unlock( &p_item->p_input->lock );
+    SET( title, Title );
+    SET( author, Artist );
+    SET( collection, Album );
+    SET( seqNum, TrackNum );
+    SET( genre, Genre );
+    SET( copyright, Copyright );
+    SET( rating, Rating );
+    SET( publisher, Publisher );
+    SET( nowPlaying, NowPlaying );
+    SET( language, Language );
+    SET( date, Date );
+
+#undef SET
 
     /* reload the advanced table */
     [[VLCInfoTreeItem rootItem] refresh];
@@ -225,8 +229,8 @@
 - (void)setMeta: (char *)psz_meta forLabel: (id)theItem
 {
     if( psz_meta != NULL && *psz_meta)
-        [theItem setStringValue: 
-            ([NSString stringWithUTF8String:psz_meta] == nil ) ? 
+        [theItem setStringValue:
+            ([NSString stringWithUTF8String:psz_meta] == nil ) ?
             [NSString stringWithCString:psz_meta] :
             [NSString stringWithUTF8String:psz_meta]];
     else
@@ -294,12 +298,12 @@
 
     if( [self isItemInPlaylist: p_item] )
     {
-        vlc_mutex_lock( &p_item->p_input->lock );
-
-        p_item->p_input->psz_uri = strdup( [[o_uri_txt stringValue] UTF8String] );
-        p_item->p_input->psz_name = strdup( [[o_title_txt stringValue] UTF8String] );
-        vlc_meta_SetArtist( p_item->p_input->p_meta, [[o_author_txt stringValue] UTF8String] )
-        vlc_mutex_unlock( &p_item->p_input->lock );
+        input_item_SetName( p_item->p_input, (char*)
+                [[o_title_txt stringValue] UTF8String] );
+        input_item_SetURI( p_item->p_input, (char*)
+                [[o_uri_txt stringValue] UTF8String] );
+        input_item_SetArtist( p_item->p_input, (char*)
+                [[o_author_txt stringValue] UTF8String] );
 
         val.b_bool = VLC_TRUE;
         var_Set( p_playlist, "intf-change", val );