Commit e7292744 authored by Stephan Assmus's avatar Stephan Assmus
Browse files

modules/gui/beos/InterfaceWindow.h/.cpp

	- improved file loading:
		- contents of sub folders can optionally be loaded too
		- files are loaded in expected order from filepanel
			_and_ drag'n'drop
		- file panel accepts folders to load
	- saving of playlist's display mode
	- added updating of interface when playlist is modified
		while nothing is playing
	- added compatibility for SoundPlay's drag'n'drop message format


modules/gui/beos/ListViews.h/.cpp

	- implemented reversal of playlist
	- list can display full path or file name only
	- drag'n'drop interaction with SoundPlay


modules/gui/beos/MediaControlView.cpp

	- cosmetic fix


modules/gui/beos/PlayListWindow.h/.cpp

	- added reverse sort command to edit menu
	- added view menu, to allow the user to display paths
		or only names in the list
parent 9578d257
......@@ -2,7 +2,7 @@
* InterfaceWindow.cpp: beos interface
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: InterfaceWindow.cpp,v 1.26 2003/02/01 12:01:10 stippi Exp $
* $Id: InterfaceWindow.cpp,v 1.27 2003/02/03 17:18:48 stippi Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -130,6 +130,50 @@ get_volume_info( BVolume& volume, BString& volumeName, bool& isCDROM, BString& d
return success;
}
// collect_folder_contents
void
collect_folder_contents( BDirectory& dir, BList& list, bool& deep, bool& asked, BEntry& entry )
{
while ( dir.GetNextEntry( &entry, true ) == B_OK )
{
if ( !entry.IsDirectory() )
{
BPath path;
// since the directory will give us the entries in reverse order,
// we put them each at the same index, effectively reversing the
// items while adding them
if ( entry.GetPath( &path ) == B_OK )
{
BString* string = new BString( path.Path() );
if ( !list.AddItem( string, 0 ) )
delete string; // at least don't leak
}
}
else
{
if ( !asked )
{
// ask user if we should parse sub-folders as well
BAlert* alert = new BAlert( "sub-folders?",
"Open files from all sub-folders as well?",
"No", "Yes", NULL, B_WIDTH_AS_USUAL,
B_IDEA_ALERT );
int32 buttonIndex = alert->Go();
deep = buttonIndex == 1;
asked = true;
// never delete BAlerts!!
}
if ( deep )
{
BDirectory subDir( &entry );
if ( subDir.InitCheck() == B_OK )
collect_folder_contents( subDir, list,
deep, asked, entry );
}
}
}
}
/*****************************************************************************
* InterfaceWindow
......@@ -607,6 +651,19 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
p_wrapper->NavigateNext();
break;
// drag'n'drop and system messages
case MSG_SOUNDPLAY:
// convert soundplay drag'n'drop message (containing paths)
// to normal message (containing refs)
{
const char* path;
for ( int32 i = 0; p_message->FindString( "path", i, &path ) == B_OK; i++ )
{
entry_ref ref;
if ( get_ref_for_path( path, &ref ) == B_OK )
p_message->AddRef( "refs", &ref );
}
}
// fall through
case B_REFS_RECEIVED:
case B_SIMPLE_DATA:
{
......@@ -614,86 +671,96 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
* file(s) opened by drag & drop -> replace playlist;
* file(s) opened by 'shift' + drag & drop -> append */
bool replace = false;
bool reverse = false;
if ( p_message->WasDropped() )
{
replace = !( modifiers() & B_SHIFT_KEY );
reverse = true;
}
// build list of files to be played from message contents
entry_ref ref;
BList files;
for ( int i = 0; p_message->FindRef( "refs", i, &ref ) == B_OK; i++ )
{
BPath path( &ref );
if ( path.InitCheck() == B_OK )
{
bool add = true;
// has the user dropped a folder?
BDirectory dir( &ref );
if ( dir.InitCheck() == B_OK)
{
// has the user dropped a dvd disk icon?
// TODO: this code does not work for the following situation:
// if the user dropped the icon for his partition containing
// all his mp3 files, this routine will not do anything, because
// the folder that was dropped is a root folder, but no DVD drive
if ( dir.IsRootDirectory() )
{
BVolumeRoster volRoster;
BVolume vol;
BDirectory volumeRoot;
status_t status = volRoster.GetNextVolume( &vol );
while ( status == B_NO_ERROR )
// if we should parse sub-folders as well
bool askedAlready = false;
bool parseSubFolders = askedAlready;
// traverse refs in reverse order
int32 count;
type_code dummy;
if ( p_message->GetInfo( "refs", &dummy, &count ) == B_OK && count > 0 )
{
int32 i = reverse ? count - 1 : 0;
int32 increment = reverse ? -1 : 1;
for ( ; p_message->FindRef( "refs", i, &ref ) == B_OK; i += increment )
{
BPath path( &ref );
if ( path.InitCheck() == B_OK )
{
bool add = true;
// has the user dropped a folder?
BDirectory dir( &ref );
if ( dir.InitCheck() == B_OK)
{
// has the user dropped a dvd disk icon?
if ( dir.IsRootDirectory() )
{
if ( vol.GetRootDirectory( &volumeRoot ) == B_OK
&& dir == volumeRoot )
BVolumeRoster volRoster;
BVolume vol;
BDirectory volumeRoot;
status_t status = volRoster.GetNextVolume( &vol );
while ( status == B_NO_ERROR )
{
BString volumeName;
BString deviceName;
bool isCDROM;
if ( get_volume_info( vol, volumeName, isCDROM, deviceName )
&& isCDROM )
if ( vol.GetRootDirectory( &volumeRoot ) == B_OK
&& dir == volumeRoot )
{
BMessage msg( OPEN_DVD );
msg.AddString( "device", deviceName.String() );
PostMessage( &msg );
add = false;
BString volumeName;
BString deviceName;
bool isCDROM;
if ( get_volume_info( vol, volumeName, isCDROM, deviceName )
&& isCDROM )
{
BMessage msg( OPEN_DVD );
msg.AddString( "device", deviceName.String() );
PostMessage( &msg );
add = false;
}
break;
}
else
{
vol.Unset();
status = volRoster.GetNextVolume( &vol );
}
break;
}
else
{
vol.Unset();
status = volRoster.GetNextVolume( &vol );
}
}
}
else
{
// add all files from the dropped folder
// TODO: do this recursively
dir.Rewind();
add = false;
BEntry entry;
while ( dir.GetNextEntry( &entry ) == B_OK )
{
// ", 0" is because we receive the files in reverse order
if ( !entry.IsDirectory() && entry.GetPath( &path ) == B_OK )
files.AddItem( new BString( path.Path() ), 0 );
}
}
}
if( add )
{
files.AddItem( new BString( path.Path() ) );
}
}
}
// give the list to VLC
// BString objects allocated here will be deleted there
int32 index;
if ( p_message->FindInt32("drop index", &index) != B_OK )
index = -1;
p_wrapper->OpenFiles( &files, replace, index );
_UpdatePlaylist();
if ( add )
{
add = false;
dir.Rewind(); // defensive programming
BEntry entry;
collect_folder_contents( dir, files,
parseSubFolders,
askedAlready,
entry );
}
}
if ( add )
{
BString* string = new BString( path.Path() );
if ( !files.AddItem( string, 0 ) )
delete string; // at least don't leak
}
}
}
// give the list to VLC
// BString objects allocated here will be deleted there
int32 index;
if ( p_message->FindInt32("drop index", &index) != B_OK )
index = -1;
p_wrapper->OpenFiles( &files, replace, index );
_UpdatePlaylist();
}
}
break;
......@@ -722,7 +789,9 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
}
break;
}
case MSG_UPDATE:
UpdateInterface();
break;
default:
BWindow::MessageReceived( p_message );
break;
......@@ -819,11 +888,22 @@ void InterfaceWindow::UpdateInterface()
}
else
{
_SetMenusEnabled( false );
if( !( p_wrapper->PlaylistSize() > 0 ) )
p_mediaControl->SetEnabled( false );
else
p_mediaControl->SetProgress( 0 );
if ( LockWithTimeout(INTERFACE_LOCKING_TIMEOUT) == B_OK )
{
_SetMenusEnabled( false );
if( !( p_wrapper->PlaylistSize() > 0 ) )
p_mediaControl->SetEnabled( false );
else
{
p_mediaControl->SetProgress( 0 );
// enable/disable skip buttons
bool canSkipPrev;
bool canSkipNext;
p_wrapper->GetNavCapabilities( &canSkipPrev, &canSkipNext );
p_mediaControl->SetSkippable( canSkipPrev, canSkipNext );
}
Unlock();
}
}
/* always force the user-specified volume */
......@@ -946,7 +1026,8 @@ InterfaceWindow::_ShowFilePanel( uint32 command, const char* windowTitle )
{
if( !fFilePanel )
{
fFilePanel = new BFilePanel();
fFilePanel = new BFilePanel( B_OPEN_PANEL, NULL, NULL,
B_FILE_NODE | B_DIRECTORY_NODE );
fFilePanel->SetTarget( this );
}
fFilePanel->Window()->SetTitle( windowTitle );
......@@ -1022,6 +1103,10 @@ InterfaceWindow::_RestoreSettings()
launch_window( fMessagesWindow, showing );
if ( fSettings->FindBool( "settings showing", &showing ) == B_OK )
launch_window( fPreferencesWindow, showing );
uint32 displayMode;
if ( fSettings->FindInt32( "playlist display mode", (int32*)&displayMode ) == B_OK )
fPlaylistWindow->SetDisplayMode( displayMode );
}
}
......@@ -1057,6 +1142,11 @@ InterfaceWindow::_StoreSettings()
fSettings->AddBool( "settings showing", !fPreferencesWindow->IsHidden() );
fPreferencesWindow->Unlock();
}
uint32 displayMode = fPlaylistWindow->DisplayMode();
if (fSettings->ReplaceInt32( "playlist display mode", displayMode ) != B_OK )
fSettings->AddInt32( "playlist display mode", displayMode );
save_settings( fSettings, "interface_settings", "VideoLAN Client" );
}
......
......@@ -2,7 +2,7 @@
* ListViews.h: BeOS interface list view class implementation
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: ListViews.cpp,v 1.4 2003/02/02 11:29:12 stippi Exp $
* $Id: ListViews.cpp,v 1.5 2003/02/03 17:18:48 stippi Exp $
*
* Authors: Stephan Aßmus <stippi@yellowbites.com>
*
......@@ -25,6 +25,7 @@
#include <malloc.h>
#include <Bitmap.h>
#include <Entry.h>
#include <String.h>
/* VLC headers */
......@@ -44,8 +45,12 @@
* PlaylistItem class
*****************************************************************************/
PlaylistItem::PlaylistItem( const char *name )
: BStringItem( name )
: BStringItem( name ),
fName( "" )
{
entry_ref ref;
if ( get_ref_for_path( name, &ref) == B_OK )
fName.SetTo( ref.name );
}
PlaylistItem::~PlaylistItem()
......@@ -57,7 +62,7 @@ PlaylistItem::~PlaylistItem()
*****************************************************************************/
void
PlaylistItem::Draw( BView *owner, BRect frame, bool tintedLine,
bool active, bool playing )
uint32 mode, bool active, bool playing )
{
rgb_color color = (rgb_color){ 255, 255, 255, 255 };
if ( tintedLine )
......@@ -71,7 +76,18 @@ PlaylistItem::Draw( BView *owner, BRect frame, bool tintedLine,
owner->SetHighColor( 0, 0, 0, 255 );
font_height fh;
owner->GetFontHeight( &fh );
BString truncatedString( Text() );
const char* text = Text();
switch ( mode )
{
case DISPLAY_NAME:
if ( fName.CountChars() > 0 )
text = fName.String();
break;
case DISPLAY_PATH:
default:
break;
}
BString truncatedString( text );
owner->TruncateString( &truncatedString, B_TRUNCATE_MIDDLE,
frame.Width() - TEXT_OFFSET - 4.0 );
owner->DrawString( truncatedString.String(),
......@@ -330,12 +346,15 @@ DragSortableListView::MessageReceived(BMessage* message)
void
DragSortableListView::MouseMoved(BPoint where, uint32 transit, const BMessage *msg)
{
if ( msg && msg->what == B_SIMPLE_DATA )
if ( msg && ( msg->what == B_SIMPLE_DATA || msg->what == MSG_SOUNDPLAY ) )
{
bool replaceAll = !msg->HasPointer("list") && !(modifiers() & B_SHIFT_KEY);
switch ( transit )
{
case B_ENTERED_VIEW:
// remember drag message
// this is needed to react on modifier changes
fDragMessageCopy = *msg;
case B_INSIDE_VIEW:
{
if ( replaceAll )
......@@ -359,19 +378,18 @@ DragSortableListView::MouseMoved(BPoint where, uint32 transit, const BMessage *m
break;
}
case B_EXITED_VIEW:
// forget drag message
fDragMessageCopy.what = 0;
case B_OUTSIDE_VIEW:
_RemoveDropAnticipationRect();
break;
}
// remember drag message
// this is needed to react on modifier changes
fDragMessageCopy = *msg;
}
else
{
_RemoveDropAnticipationRect();
fDragMessageCopy.what = 0;
BListView::MouseMoved(where, transit, msg);
fDragMessageCopy.what = 0;
}
}
......@@ -383,6 +401,7 @@ DragSortableListView::MouseUp( BPoint where )
{
// remove drop mark
_SetDropAnticipationRect( BRect( 0.0, 0.0, -1.0, -1.0 ) );
// be sure to forget drag message
fDragMessageCopy.what = 0;
BListView::MouseUp( where );
}
......@@ -506,6 +525,18 @@ DragSortableListView::RemoveSelected()
RemoveItemList( items );
}
/*****************************************************************************
* DragSortableListView::CountSelectedItems
*****************************************************************************/
int32
DragSortableListView::CountSelectedItems() const
{
int32 count = 0;
while ( CurrentSelection( count ) >= 0 )
count++;
return count;
}
/*****************************************************************************
* DragSortableListView::_SetDropAnticipationRect
*****************************************************************************/
......@@ -585,8 +616,10 @@ PlaylistView::PlaylistView( BRect frame, InterfaceWindow* mainWindow,
| B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE ),
fCurrentIndex( -1 ),
fPlaying( false ),
fDisplayMode( DISPLAY_PATH ),
fMainWindow( mainWindow ),
fSelectionChangeMessage( selectionChangeMessage ),
fLastClickedItem( NULL ),
fVlcWrapper( wrapper )
{
}
......@@ -614,6 +647,7 @@ PlaylistView::MessageReceived( BMessage* message)
{
switch ( message->what )
{
case MSG_SOUNDPLAY:
case B_SIMPLE_DATA:
if ( message->HasPointer( "list" ) )
{
......@@ -649,17 +683,26 @@ PlaylistView::MouseDown( BPoint where )
{
if ( clicks == 2 )
{
fVlcWrapper->PlaylistJumpTo( i );
handled = true;
// only do something if user clicked the same item twice
if ( fLastClickedItem == item )
{
fVlcWrapper->PlaylistJumpTo( i );
handled = true;
}
}
else if ( i == fCurrentIndex )
else
{
r.right = r.left + TEXT_OFFSET;
if ( r.Contains ( where ) )
// remember last clicked item
fLastClickedItem = item;
if ( i == fCurrentIndex )
{
fMainWindow->PostMessage( PAUSE_PLAYBACK );
InvalidateItem( i );
handled = true;
r.right = r.left + TEXT_OFFSET;
if ( r.Contains ( where ) )
{
fMainWindow->PostMessage( PAUSE_PLAYBACK );
InvalidateItem( i );
handled = true;
}
}
}
break;
......@@ -727,9 +770,7 @@ PlaylistView::MoveItems( BList& items, int32 index )
int32 count = items.CountItems();
int32 indexOriginal = index;
// remember currently playing item
int32 currentIndex, size;
fVlcWrapper->GetPlaylistInfo( currentIndex, size );
BListItem* playingItem = ItemAt( currentIndex );
BListItem* playingItem = _PlayingItem();
// collect item pointers for removal by index
for ( int32 i = 0; i < count; i++ )
{
......@@ -761,15 +802,10 @@ PlaylistView::MoveItems( BList& items, int32 index )
// update GUI
DragSortableListView::MoveItems( items, indexOriginal );
// restore currently playing item
for ( int32 i = 0; BListItem* item = ItemAt( i ); i++ )
{
if ( item == playingItem )
{
fVlcWrapper->PlaylistSetPlaying( i );
SetCurrent( i );
break;
}
}
_SetPlayingIndex( playingItem );
// update interface (in case it isn't playing,
// there is a chance that it needs to update)
fMainWindow->PostMessage( MSG_UPDATE );
fVlcWrapper->PlaylistUnlock();
}
}
......@@ -789,9 +825,7 @@ PlaylistView::CopyItems( BList& items, int32 toIndex )
BList clonedItems;
int32 count = items.CountItems();
// remember currently playing item
int32 currentIndex, size;
fVlcWrapper->GetPlaylistInfo( currentIndex, size );
BListItem* playingItem = ItemAt( currentIndex );
BListItem* playingItem = _PlayingItem();
// collect cloned item pointers
for ( int32 i = 0; i < count; i++ )
{
......@@ -815,15 +849,10 @@ PlaylistView::CopyItems( BList& items, int32 toIndex )
// update GUI
DragSortableListView::CopyItems( items, toIndex );
// restore currently playing item
for ( int32 i = 0; BListItem* item = ItemAt( i ); i++ )
{
if ( item == playingItem )
{
fVlcWrapper->PlaylistSetPlaying( i );
SetCurrent( i );
break;
}
}
_SetPlayingIndex( playingItem );
// update interface (in case it isn't playing,
// there is a chance that it needs to update)
fMainWindow->PostMessage( MSG_UPDATE );
fVlcWrapper->PlaylistUnlock();
}
}
......@@ -836,6 +865,8 @@ PlaylistView::RemoveItemList( BList& items )
{
if ( fVlcWrapper->PlaylistLock() )
{
// remember currently playing item
BListItem* playingItem = _PlayingItem();
// collect item pointers for removal
BList removeItems;
int32 count = items.CountItems();
......@@ -854,6 +885,11 @@ PlaylistView::RemoveItemList( BList& items )
}
// update GUI
DragSortableListView::RemoveItemList( items );
// restore currently playing item
_SetPlayingIndex( playingItem );
// update interface (in case it isn't playing,
// there is a chance that it needs to update)
fMainWindow->PostMessage( MSG_UPDATE );
fVlcWrapper->PlaylistUnlock();
}
}
......@@ -877,7 +913,8 @@ void
PlaylistView::DrawListItem( BView* owner, int32 index, BRect frame ) const
{
if ( PlaylistItem* item = dynamic_cast<PlaylistItem*>( ItemAt( index ) ) )
item->Draw( owner, frame, index % 2, index == fCurrentIndex, fPlaying );
item->Draw( owner, frame, index % 2,
fDisplayMode, index == fCurrentIndex, fPlaying );
}
/*****************************************************************************
......@@ -891,8 +928,16 @@ PlaylistView::MakeDragMessage( BMessage* message ) const
message->AddPointer( "list", (void*)this );
int32 index;
for ( int32 i = 0; ( index = CurrentSelection( i ) ) >= 0; i++ )
{
message->AddInt32( "index", index );
// TODO: add refs to message (inter application communication)
// add refs to message (inter application communication)
if ( BStringItem* item = dynamic_cast<BStringItem*>( ItemAt( index ) ) )
{
entry_ref ref;
if ( get_ref_for_path( item->Text(), &ref ) == B_OK )
message->AddRef( "refs", &ref );
}
}
}
}
......@@ -938,3 +983,93 @@ PlaylistView::RebuildList()
for ( int i = 0; i < fVlcWrapper->PlaylistSize(); i++ )
AddItem( new PlaylistItem( fVlcWrapper->PlaylistItemName( i ) ) );
}
/*****************************************************************************
* PlaylistView::SortReverse
*****************************************************************************/
void
PlaylistView::SortReverse()
{
if ( int32 count = CountSelectedItems() )
{
int32 last = count - 1;
// remember currently playing item
BListItem* playingItem = _PlayingItem();
for ( int32 first = 0; first < count / 2; first++, last-- )
{
int32 index1 = CurrentSelection( first);
int32 index2 = CurrentSelection( last);
if ( SwapItems( index1, index2 ) )
{
// index2 > index1, so the list won't get messed up
// if we remove the items in that order