Removes trailing spaces. Removes tabs.

[vlc] / modules / gui / beos / ListViews.cpp

diff --git a/modules/gui/beos/ListViews.cpp b/modules/gui/beos/ListViews.cpp
index b91352f5fee89b63f841c80ae44bf161a01a8035..e339c6fa2f95a555883f051f86802cbfcf6887a1 100644 (file)
--- a/modules/gui/beos/ListViews.cpp
+++ b/modules/gui/beos/ListViews.cpp
@@ -21,7 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <stdio.h>
+#if 0
+
 #include <malloc.h>
 
 #include <Bitmap.h>
@@ -30,7 +31,7 @@
 
 /* VLC headers */
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include <vlc_interface.h>
 
 #include "InterfaceWindow.h"
 #include "ListViews.h"
@@ -248,12 +249,12 @@ DragSortableListView::InitiateDrag( BPoint point, int32 index, bool )
                 v->SetHighColor( 0, 0, 0, 255 );
                 v->StrokeRect( v->Bounds() );
                 v->Sync();
-    
+ 
                 uint8 *bits = (uint8 *)dragBitmap->Bits();
                 int32 height = (int32)dragBitmap->Bounds().Height() + 1;
                 int32 width = (int32)dragBitmap->Bounds().Width() + 1;
                 int32 bpr = dragBitmap->BytesPerRow();
-    
+ 
                 if (fade) {
                     for ( int32 y = 0; y < height - ALPHA / 2; y++, bits += bpr ) {
                         uint8 *line = bits + 3;
@@ -368,7 +369,7 @@ DragSortableListView::MouseMoved(BPoint where, uint32 transit, const BMessage *m
                     // offset where by half of item height
                     BRect r( ItemFrame( 0 ) );
                     where.y += r.Height() / 2.0;
-    
+ 
                     int32 index = IndexOf( where );
                     if ( index < 0 )
                         index = CountItems();
@@ -726,7 +727,7 @@ PlaylistView::KeyDown( const char* bytes, int32 numBytes )
 {
     if ( numBytes < 1 )
         return;
-        
+ 
     if ( ( bytes[0] == B_BACKSPACE ) || ( bytes[0] == B_DELETE ) )
     {
         RemoveSelected();
@@ -843,7 +844,7 @@ PlaylistView::CopyItems( BList& items, int32 toIndex )
             void* cloned = fVlcWrapper->PlaylistCloneItem( item );
             if ( cloned && !clonedItems.AddItem( cloned ) )
                 free( cloned );
-            
+ 
         }
         // add cloned items at index
         int32 index = toIndex;
@@ -986,26 +987,20 @@ PlaylistView::SetPlaying( bool playing )
 void
 PlaylistView::RebuildList()
 {
-    playlist_t * p_playlist;
-    p_playlist = (playlist_t *) vlc_object_find( p_intf,
-        VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
-
-    if( !p_playlist )
-    {
-        return;
-    }
+    playlist_t * p_playlist = pl_Yield( p_intf );
 
     // remove all items
     BListItem * item;
     int32 count = CountItems();
     while( ( item = RemoveItem( --count ) ) )
         delete item;
-    
+
     // rebuild listview from VLC's playlist
-    vlc_mutex_lock( &p_playlist->object_lock );
-    for( int i = 0; i < p_playlist->i_size; i++ )
-        AddItem( new PlaylistItem( p_playlist->pp_items[i]->input.psz_name ) );
-    vlc_mutex_unlock( &p_playlist->object_lock );
+    PL_LOCK;
+    FOREACH_ARRAY( playlist_item_t *p_item, p_playlist->items )
+        AddItem( new PlaylistItem( p_item->p_input->psz_name ) );
+    FOREACH_END();
+    PL_UNLOCK;
 
     vlc_object_release( p_playlist );
 }
@@ -1050,7 +1045,7 @@ PlaylistView::SortReverse()
 void
 PlaylistView::SortByPath()
 {
-    
+ 
 }
 
 /*****************************************************************************
@@ -1107,7 +1102,7 @@ PlaylistView::_SetPlayingIndex( BListItem* playingItem )
             playlist_t * p_playlist;
             p_playlist = (playlist_t *) vlc_object_find( p_intf,
                 VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
-        
+ 
             if( !p_playlist )
             {
                 return;
@@ -1121,3 +1116,5 @@ PlaylistView::_SetPlayingIndex( BListItem* playingItem )
         }
     }
 }
+
+#endif