* InterfaceWindow.cpp: beos interface
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: InterfaceWindow.cpp,v 1.21 2003/01/25 01:03:44 titer Exp $
+ * $Id: InterfaceWindow.cpp,v 1.22 2003/01/25 20:15:41 titer Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
#include "MediaControlView.h"
#include "PlayListWindow.h"
#include "PreferencesWindow.h"
+#include "MessagesWindow.h"
#include "InterfaceWindow.h"
#define INTERFACE_UPDATE_TIMEOUT 80000 // 2 frames if at 25 fps
*****************************************************************************/
InterfaceWindow::InterfaceWindow( BRect frame, const char *name,
- intf_thread_t *p_interface )
- : BWindow( frame, name, B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
- B_NOT_ZOOMABLE | B_WILL_ACCEPT_FIRST_CLICK | B_ASYNCHRONOUS_CONTROLS ),
- p_intf( p_interface ),
- fFilePanel( NULL ),
- fSubtitlesPanel( NULL ),
- fLastUpdateTime( system_time() )
+ intf_thread_t *p_interface )
+ : BWindow( frame, name, B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
+ B_NOT_ZOOMABLE | B_WILL_ACCEPT_FIRST_CLICK | B_ASYNCHRONOUS_CONTROLS ),
+ p_intf( p_interface ),
+ fFilePanel( NULL ),
+ fSubtitlesPanel( NULL ),
+ fLastUpdateTime( system_time() )
{
p_intf = p_interface;
p_wrapper = p_intf->p_sys->p_wrapper;
fPlaylistIsEmpty = !( p_wrapper->PlaylistSize() > 0 );
- fPlaylistWindow = new PlayListWindow( BRect( 100.0, 100.0, 400.0, 350.0 ),
- "Playlist",
- this,
- p_intf );
BScreen *p_screen = new BScreen();
BRect screen_rect = p_screen->Frame();
delete p_screen;
( screen_rect.bottom - PREFS_WINDOW_HEIGHT ) / 2,
( screen_rect.right + PREFS_WINDOW_WIDTH ) / 2,
( screen_rect.bottom + PREFS_WINDOW_HEIGHT ) / 2 );
- fPreferencesWindow = new PreferencesWindow( window_rect,
- "Preferences",
- p_intf );
+ fPreferencesWindow = new PreferencesWindow( p_intf, window_rect, "Preferences" );
+ window_rect.Set( screen_rect.right - 500,
+ screen_rect.top + 50,
+ screen_rect.right - 150,
+ screen_rect.top + 250 );
+ fPlaylistWindow = new PlayListWindow( window_rect, "Playlist", this, p_intf );
+ window_rect.Set( screen_rect.right - 500,
+ screen_rect.top + 300,
+ screen_rect.right - 150,
+ screen_rect.top + 600 );
+ fMessagesWindow = new MessagesWindow( p_intf, window_rect, "Messages" );
+
+ // set the title bar
+ SetName( "interface" );
+ SetTitle( VOUT_TITLE );
+
+ // the media control view
+ p_mediaControl = new MediaControlView( BRect( 0.0, 0.0, 250.0, 50.0 ),
+ p_intf );
+ p_mediaControl->SetViewColor( ui_color( B_PANEL_BACKGROUND_COLOR ) );
+
+ float width, height;
+ p_mediaControl->GetPreferredSize( &width, &height );
+
+ // set up the main menu
+ fMenuBar = new BMenuBar( BRect(0.0, 0.0, width, 15.0), "main menu",
+ B_FOLLOW_NONE, B_ITEMS_IN_ROW, false );
+
+ // make menu bar resize to correct height
+ float menuWidth, menuHeight;
+ fMenuBar->GetPreferredSize( &menuWidth, &menuHeight );
+ fMenuBar->ResizeTo( width, menuHeight ); // don't change! it's a workarround!
+ // take care of proper size for ourself
+ height += fMenuBar->Bounds().Height();
+ ResizeTo( width, height );
+
+ p_mediaControl->MoveTo( fMenuBar->Bounds().LeftBottom() + BPoint(0.0, 1.0) );
+ AddChild( fMenuBar );
+ AddChild( p_mediaControl );
+
+ // Add the file Menu
+ BMenu* fileMenu = new BMenu( "File" );
+ fMenuBar->AddItem( fileMenu );
+ fileMenu->AddItem( new BMenuItem( "Open File" B_UTF8_ELLIPSIS,
+ new BMessage( OPEN_FILE ), 'O') );
+
+ fileMenu->AddItem( new CDMenu( "Open Disc" ) );
+
+ fileMenu->AddItem( new BMenuItem( "Load a subtitle file" B_UTF8_ELLIPSIS,
+ new BMessage( LOAD_SUBFILE ) ) );
+
+ fileMenu->AddSeparatorItem();
+ BMenuItem* item = new BMenuItem( "About" B_UTF8_ELLIPSIS,
+ new BMessage( B_ABOUT_REQUESTED ), 'A');
+ item->SetTarget( be_app );
+ fileMenu->AddItem( item );
+ fileMenu->AddItem( new BMenuItem( "Quit", new BMessage( B_QUIT_REQUESTED ), 'Q') );
+
+ fLanguageMenu = new LanguageMenu("Language", AUDIO_ES, p_wrapper);
+ fSubtitlesMenu = new LanguageMenu("Subtitles", SPU_ES, p_wrapper);
+
+ /* Add the Audio menu */
+ fAudioMenu = new BMenu( "Audio" );
+ fMenuBar->AddItem ( fAudioMenu );
+ fAudioMenu->AddItem( fLanguageMenu );
+ fAudioMenu->AddItem( fSubtitlesMenu );
+
+ fPrevTitleMI = new BMenuItem( "Prev Title", new BMessage( PREV_TITLE ) );
+ fNextTitleMI = new BMenuItem( "Next Title", new BMessage( NEXT_TITLE ) );
+ fPrevChapterMI = new BMenuItem( "Prev Chapter", new BMessage( PREV_CHAPTER ) );
+ fNextChapterMI = new BMenuItem( "Next Chapter", new BMessage( NEXT_CHAPTER ) );
+
+ /* Add the Navigation menu */
+ fNavigationMenu = new BMenu( "Navigation" );
+ fMenuBar->AddItem( fNavigationMenu );
+ fNavigationMenu->AddItem( fPrevTitleMI );
+ fNavigationMenu->AddItem( fNextTitleMI );
+ fNavigationMenu->AddItem( fTitleMenu = new TitleMenu( "Go to Title", p_intf ) );
+ fNavigationMenu->AddSeparatorItem();
+ fNavigationMenu->AddItem( fPrevChapterMI );
+ fNavigationMenu->AddItem( fNextChapterMI );
+ fNavigationMenu->AddItem( fChapterMenu = new ChapterMenu( "Go to Chapter", p_intf ) );
+
+ /* Add the Speed menu */
+ fSpeedMenu = new BMenu( "Speed" );
+ fSpeedMenu->SetRadioMode( true );
+ fSpeedMenu->AddItem( fSlowerMI = new BMenuItem( "Slower", new BMessage( SLOWER_PLAY ) ) );
+ fNormalMI = new BMenuItem( "Normal", new BMessage( NORMAL_PLAY ) );
+ fNormalMI->SetMarked(true); // default to normal speed
+ fSpeedMenu->AddItem( fNormalMI );
+ fSpeedMenu->AddItem( fFasterMI = new BMenuItem( "Faster", new BMessage( FASTER_PLAY) ) );
+ fSpeedMenu->SetTargetForItems( this );
+ fMenuBar->AddItem( fSpeedMenu );
+
+ /* Add the Show menu */
+ fShowMenu = new BMenu( "Show" );
+ fShowMenu->AddItem( new BMenuItem( "Play List" B_UTF8_ELLIPSIS,
+ new BMessage( OPEN_PLAYLIST ), 'P') );
+ fShowMenu->AddItem( new BMenuItem( "Messages" B_UTF8_ELLIPSIS,
+ new BMessage( OPEN_MESSAGES ), 'M' ) );
+ fShowMenu->AddItem( new BMenuItem( "Settings" B_UTF8_ELLIPSIS,
+ new BMessage( OPEN_PREFERENCES ), 'S' ) );
+ fMenuBar->AddItem( fShowMenu );
+
+ /* Prepare fow showing */
+ _SetMenusEnabled( false );
+ p_mediaControl->SetEnabled( false );
- // set the title bar
- SetName( "interface" );
- SetTitle( VOUT_TITLE );
-
- // the media control view
- p_mediaControl = new MediaControlView( BRect( 0.0, 0.0, 250.0, 50.0 ),
- p_intf );
- p_mediaControl->SetViewColor( ui_color( B_PANEL_BACKGROUND_COLOR ) );
-
- float width, height;
- p_mediaControl->GetPreferredSize( &width, &height );
-
- // set up the main menu
- fMenuBar = new BMenuBar( BRect(0.0, 0.0, width, 15.0), "main menu",
- B_FOLLOW_NONE, B_ITEMS_IN_ROW, false );
-
- // make menu bar resize to correct height
- float menuWidth, menuHeight;
- fMenuBar->GetPreferredSize( &menuWidth, &menuHeight );
- fMenuBar->ResizeTo( width, menuHeight ); // don't change! it's a workarround!
- // take care of proper size for ourself
- height += fMenuBar->Bounds().Height();
- ResizeTo( width, height );
-
- p_mediaControl->MoveTo( fMenuBar->Bounds().LeftBottom() + BPoint(0.0, 1.0) );
- AddChild( fMenuBar );
- AddChild( p_mediaControl );
-
- // Add the file Menu
- BMenu* fileMenu = new BMenu( "File" );
- fMenuBar->AddItem( fileMenu );
- fileMenu->AddItem( new BMenuItem( "Open File" B_UTF8_ELLIPSIS,
- new BMessage( OPEN_FILE ), 'O') );
-
- fileMenu->AddItem( new CDMenu( "Open Disc" ) );
-
- fileMenu->AddItem( new BMenuItem( "Load a subtitle file" B_UTF8_ELLIPSIS,
- new BMessage( LOAD_SUBFILE ) ) );
-
- fileMenu->AddSeparatorItem();
- fileMenu->AddItem( new BMenuItem( "Play List" B_UTF8_ELLIPSIS,
- new BMessage( OPEN_PLAYLIST ), 'P') );
-
- fileMenu->AddSeparatorItem();
- BMenuItem* item = new BMenuItem( "About" B_UTF8_ELLIPSIS,
- new BMessage( B_ABOUT_REQUESTED ), 'A');
- item->SetTarget( be_app );
- fileMenu->AddItem( item );
- fileMenu->AddItem( new BMenuItem( "Quit", new BMessage( B_QUIT_REQUESTED ), 'Q') );
-
- fLanguageMenu = new LanguageMenu("Language", AUDIO_ES, p_wrapper);
- fSubtitlesMenu = new LanguageMenu("Subtitles", SPU_ES, p_wrapper);
-
- /* Add the Audio menu */
- fAudioMenu = new BMenu( "Audio" );
- fMenuBar->AddItem ( fAudioMenu );
- fAudioMenu->AddItem( fLanguageMenu );
- fAudioMenu->AddItem( fSubtitlesMenu );
-
- fPrevTitleMI = new BMenuItem( "Prev Title", new BMessage( PREV_TITLE ) );
- fNextTitleMI = new BMenuItem( "Next Title", new BMessage( NEXT_TITLE ) );
- fPrevChapterMI = new BMenuItem( "Prev Chapter", new BMessage( PREV_CHAPTER ) );
- fNextChapterMI = new BMenuItem( "Next Chapter", new BMessage( NEXT_CHAPTER ) );
-
- /* Add the Navigation menu */
- fNavigationMenu = new BMenu( "Navigation" );
- fMenuBar->AddItem( fNavigationMenu );
- fNavigationMenu->AddItem( fPrevTitleMI );
- fNavigationMenu->AddItem( fNextTitleMI );
- fNavigationMenu->AddItem( fTitleMenu = new TitleMenu( "Go to Title", p_intf ) );
- fNavigationMenu->AddSeparatorItem();
- fNavigationMenu->AddItem( fPrevChapterMI );
- fNavigationMenu->AddItem( fNextChapterMI );
- fNavigationMenu->AddItem( fChapterMenu = new ChapterMenu( "Go to Chapter", p_intf ) );
-
- /* Add the Speed menu */
- fSpeedMenu = new BMenu( "Speed" );
- fSpeedMenu->SetRadioMode( true );
- fSpeedMenu->AddItem( fSlowerMI = new BMenuItem( "Slower", new BMessage( SLOWER_PLAY ) ) );
- fNormalMI = new BMenuItem( "Normal", new BMessage( NORMAL_PLAY ) );
- fNormalMI->SetMarked(true); // default to normal speed
- fSpeedMenu->AddItem( fNormalMI );
- fSpeedMenu->AddItem( fFasterMI = new BMenuItem( "Faster", new BMessage( FASTER_PLAY) ) );
- fSpeedMenu->SetTargetForItems( this );
- fMenuBar->AddItem( fSpeedMenu );
-
- /* Add the Settings menu */
- fSettingsMenu = new BMenu( "Settings" );
- fSettingsMenu->AddItem( fPreferencesMI =
- new BMenuItem( "Preferences", new BMessage( OPEN_PREFERENCES ) ) );
- fMenuBar->AddItem( fSettingsMenu );
-
- /* Prepare fow showing */
- _SetMenusEnabled( false );
- p_mediaControl->SetEnabled( false );
-
/* Restore interface settings */
int i_width = config_GetInt( p_intf, "beos-intf-width" ),
i_height = config_GetInt( p_intf, "beos-intf-height" ),
fPlaylistWindow->Unlock();
}
}
-
- Show();
+ if( config_GetInt( p_intf, "beos-messages-show" ) )
+ {
+ /* messages showing */
+ if( fMessagesWindow->Lock() )
+ {
+ fMessagesWindow->Show();
+ fMessagesWindow->Unlock();
+ }
+ }
+
+ Show();
}
InterfaceWindow::~InterfaceWindow()
{
- if (fPlaylistWindow)
- fPlaylistWindow->ReallyQuit();
+ if (fPlaylistWindow)
+ fPlaylistWindow->ReallyQuit();
}
/*****************************************************************************
void
InterfaceWindow::FrameResized(float width, float height)
{
- BRect r(Bounds());
- fMenuBar->MoveTo(r.LeftTop());
- fMenuBar->ResizeTo(r.Width(), fMenuBar->Bounds().Height());
- r.top += fMenuBar->Bounds().Height() + 1.0;
- p_mediaControl->MoveTo(r.LeftTop());
- p_mediaControl->ResizeTo(r.Width(), r.Height());
+ BRect r(Bounds());
+ fMenuBar->MoveTo(r.LeftTop());
+ fMenuBar->ResizeTo(r.Width(), fMenuBar->Bounds().Height());
+ r.top += fMenuBar->Bounds().Height() + 1.0;
+ p_mediaControl->MoveTo(r.LeftTop());
+ p_mediaControl->ResizeTo(r.Width(), r.Height());
}
/*****************************************************************************
*****************************************************************************/
void InterfaceWindow::MessageReceived( BMessage * p_message )
{
- int playback_status; // remember playback state
- playback_status = p_wrapper->InputStatus();
-
- switch( p_message->what )
- {
- case B_ABOUT_REQUESTED:
- {
- BAlert* alert = new BAlert( VOUT_TITLE,
- "BeOS " VOUT_TITLE "\n\n<www.videolan.org>", "Ok");
- alert->Go();
- break;
- }
- case TOGGLE_ON_TOP:
- break;
-
- case OPEN_FILE:
- if( fFilePanel )
- {
- fFilePanel->Show();
- break;
- }
- fFilePanel = new BFilePanel();
- fFilePanel->SetTarget( this );
- fFilePanel->Show();
- break;
-
- case OPEN_PLAYLIST:
- if (fPlaylistWindow->Lock())
- {
- if (fPlaylistWindow->IsHidden())
- fPlaylistWindow->Show();
- else
- fPlaylistWindow->Activate();
- fPlaylistWindow->Unlock();
- }
- break;
- case OPEN_DVD:
- {
- const char *psz_device;
- BString type( "dvd" );
- if( p_message->FindString( "device", &psz_device ) == B_OK )
- {
- BString device( psz_device );
- p_wrapper->OpenDisc( type, device, 0, 0 );
- }
- _UpdatePlaylist();
- }
- break;
-
- case LOAD_SUBFILE:
- if( fSubtitlesPanel )
- {
- fSubtitlesPanel->Show();
- break;
- }
- fSubtitlesPanel = new BFilePanel();
- fSubtitlesPanel->SetTarget( this );
- fSubtitlesPanel->SetMessage( new BMessage( SUBFILE_RECEIVED ) );
- fSubtitlesPanel->Show();
- break;
-
- case SUBFILE_RECEIVED:
- {
- entry_ref ref;
- if( p_message->FindRef( "refs", 0, &ref ) == B_OK )
- {
- BPath path( &ref );
- if ( path.InitCheck() == B_OK )
- p_wrapper->LoadSubFile( (char*)path.Path() );
- }
- break;
- }
-
- case STOP_PLAYBACK:
- // this currently stops playback not nicely
- if (playback_status > UNDEF_S)
- {
- snooze( 400000 );
- p_wrapper->PlaylistStop();
- p_mediaControl->SetStatus(NOT_STARTED_S, DEFAULT_RATE);
- }
- break;
-
- case START_PLAYBACK:
- /* starts playing in normal mode */
-
- case PAUSE_PLAYBACK:
- /* toggle between pause and play */
- if (playback_status > UNDEF_S)
- {
- /* pause if currently playing */
- if ( playback_status == PLAYING_S )
- {
- p_wrapper->PlaylistPause();
- }
- else
- {
- p_wrapper->PlaylistPlay();
- }
- }
- else
- {
- /* Play a new file */
- p_wrapper->PlaylistPlay();
- }
- break;
-
- case FASTER_PLAY:
- /* cycle the fast playback modes */
- if (playback_status > UNDEF_S)
- {
- p_wrapper->InputFaster();
- }
- break;
-
- case SLOWER_PLAY:
- /* cycle the slow playback modes */
- if (playback_status > UNDEF_S)
- {
- p_wrapper->InputSlower();
- }
- break;
-
- case NORMAL_PLAY:
- /* restore speed to normal if already playing */
- if (playback_status > UNDEF_S)
- {
- p_wrapper->PlaylistPlay();
- }
- break;
-
- case SEEK_PLAYBACK:
- /* handled by semaphores */
- break;
- // volume related messages
- case VOLUME_CHG:
- /* adjust the volume */
- if (playback_status > UNDEF_S)
- {
- p_wrapper->SetVolume( p_mediaControl->GetVolume() );
- p_mediaControl->SetMuted( p_wrapper->IsMuted() );
- }
- break;
-
- case VOLUME_MUTE:
- // toggle muting
- if( p_wrapper->IsMuted() )
- p_wrapper->VolumeRestore();
- else
- p_wrapper->VolumeMute();
- p_mediaControl->SetMuted( p_wrapper->IsMuted() );
- break;
-
- case SELECT_CHANNEL:
- if ( playback_status > UNDEF_S )
- {
- int32 channel;
- if ( p_message->FindInt32( "channel", &channel ) == B_OK )
- {
- p_wrapper->ToggleLanguage( channel );
- }
- }
- break;
-
- case SELECT_SUBTITLE:
- if ( playback_status > UNDEF_S )
- {
- int32 subtitle;
- if ( p_message->FindInt32( "subtitle", &subtitle ) == B_OK )
- p_wrapper->ToggleSubtitle( subtitle );
- }
- break;
-
- // specific navigation messages
- case PREV_TITLE:
- {
- p_wrapper->PrevTitle();
- break;
- }
- case NEXT_TITLE:
- {
+ int playback_status; // remember playback state
+ playback_status = p_wrapper->InputStatus();
+
+ switch( p_message->what )
+ {
+ case B_ABOUT_REQUESTED:
+ {
+ BAlert* alert = new BAlert( VOUT_TITLE,
+ "BeOS " VOUT_TITLE "\n\n<www.videolan.org>", "Ok");
+ alert->Go();
+ break;
+ }
+ case TOGGLE_ON_TOP:
+ break;
+
+ case OPEN_FILE:
+ if( fFilePanel )
+ {
+ fFilePanel->Show();
+ break;
+ }
+ fFilePanel = new BFilePanel();
+ fFilePanel->SetTarget( this );
+ fFilePanel->Show();
+ break;
+
+ case OPEN_PLAYLIST:
+ if (fPlaylistWindow->Lock())
+ {
+ if (fPlaylistWindow->IsHidden())
+ fPlaylistWindow->Show();
+ else
+ fPlaylistWindow->Activate();
+ fPlaylistWindow->Unlock();
+ }
+ break;
+ case OPEN_DVD:
+ {
+ const char *psz_device;
+ BString type( "dvd" );
+ if( p_message->FindString( "device", &psz_device ) == B_OK )
+ {
+ BString device( psz_device );
+ p_wrapper->OpenDisc( type, device, 0, 0 );
+ }
+ _UpdatePlaylist();
+ }
+ break;
+
+ case LOAD_SUBFILE:
+ if( fSubtitlesPanel )
+ {
+ fSubtitlesPanel->Show();
+ break;
+ }
+ fSubtitlesPanel = new BFilePanel();
+ fSubtitlesPanel->SetTarget( this );
+ fSubtitlesPanel->SetMessage( new BMessage( SUBFILE_RECEIVED ) );
+ fSubtitlesPanel->Show();
+ break;
+
+ case SUBFILE_RECEIVED:
+ {
+ entry_ref ref;
+ if( p_message->FindRef( "refs", 0, &ref ) == B_OK )
+ {
+ BPath path( &ref );
+ if ( path.InitCheck() == B_OK )
+ p_wrapper->LoadSubFile( (char*)path.Path() );
+ }
+ break;
+ }
+
+ case STOP_PLAYBACK:
+ // this currently stops playback not nicely
+ if (playback_status > UNDEF_S)
+ {
+ snooze( 400000 );
+ p_wrapper->PlaylistStop();
+ p_mediaControl->SetStatus(NOT_STARTED_S, DEFAULT_RATE);
+ }
+ break;
+
+ case START_PLAYBACK:
+ /* starts playing in normal mode */
+
+ case PAUSE_PLAYBACK:
+ /* toggle between pause and play */
+ if (playback_status > UNDEF_S)
+ {
+ /* pause if currently playing */
+ if ( playback_status == PLAYING_S )
+ {
+ p_wrapper->PlaylistPause();
+ }
+ else
+ {
+ p_wrapper->PlaylistPlay();
+ }
+ }
+ else
+ {
+ /* Play a new file */
+ p_wrapper->PlaylistPlay();
+ }
+ break;
+
+ case FASTER_PLAY:
+ /* cycle the fast playback modes */
+ if (playback_status > UNDEF_S)
+ {
+ p_wrapper->InputFaster();
+ }
+ break;
+
+ case SLOWER_PLAY:
+ /* cycle the slow playback modes */
+ if (playback_status > UNDEF_S)
+ {
+ p_wrapper->InputSlower();
+ }
+ break;
+
+ case NORMAL_PLAY:
+ /* restore speed to normal if already playing */
+ if (playback_status > UNDEF_S)
+ {
+ p_wrapper->PlaylistPlay();
+ }
+ break;
+
+ case SEEK_PLAYBACK:
+ /* handled by semaphores */
+ break;
+ // volume related messages
+ case VOLUME_CHG:
+ /* adjust the volume */
+ if (playback_status > UNDEF_S)
+ {
+ p_wrapper->SetVolume( p_mediaControl->GetVolume() );
+ p_mediaControl->SetMuted( p_wrapper->IsMuted() );
+ }
+ break;
+
+ case VOLUME_MUTE:
+ // toggle muting
+ if( p_wrapper->IsMuted() )
+ p_wrapper->VolumeRestore();
+ else
+ p_wrapper->VolumeMute();
+ p_mediaControl->SetMuted( p_wrapper->IsMuted() );
+ break;
+
+ case SELECT_CHANNEL:
+ if ( playback_status > UNDEF_S )
+ {
+ int32 channel;
+ if ( p_message->FindInt32( "channel", &channel ) == B_OK )
+ {
+ p_wrapper->ToggleLanguage( channel );
+ }
+ }
+ break;
+
+ case SELECT_SUBTITLE:
+ if ( playback_status > UNDEF_S )
+ {
+ int32 subtitle;
+ if ( p_message->FindInt32( "subtitle", &subtitle ) == B_OK )
+ p_wrapper->ToggleSubtitle( subtitle );
+ }
+ break;
+
+ // specific navigation messages
+ case PREV_TITLE:
+ {
+ p_wrapper->PrevTitle();
+ break;
+ }
+ case NEXT_TITLE:
+ {
p_wrapper->NextTitle();
- break;
- }
- case TOGGLE_TITLE:
- if ( playback_status > UNDEF_S )
- {
- int32 index;
- if( p_message->FindInt32( "index", &index ) == B_OK )
- p_wrapper->ToggleTitle( index );
- }
- break;
- case PREV_CHAPTER:
- {
+ break;
+ }
+ case TOGGLE_TITLE:
+ if ( playback_status > UNDEF_S )
+ {
+ int32 index;
+ if( p_message->FindInt32( "index", &index ) == B_OK )
+ p_wrapper->ToggleTitle( index );
+ }
+ break;
+ case PREV_CHAPTER:
+ {
p_wrapper->PrevChapter();
- break;
- }
- case NEXT_CHAPTER:
- {
+ break;
+ }
+ case NEXT_CHAPTER:
+ {
p_wrapper->NextChapter();
- break;
- }
- case TOGGLE_CHAPTER:
- if ( playback_status > UNDEF_S )
- {
- int32 index;
- if( p_message->FindInt32( "index", &index ) == B_OK )
+ break;
+ }
+ case TOGGLE_CHAPTER:
+ if ( playback_status > UNDEF_S )
+ {
+ int32 index;
+ if( p_message->FindInt32( "index", &index ) == B_OK )
p_wrapper->ToggleChapter( index );
- }
- break;
- case PREV_FILE:
- p_wrapper->PlaylistPrev();
- break;
- case NEXT_FILE:
- p_wrapper->PlaylistNext();
- break;
- // general next/prev functionality (skips to whatever makes most sense)
- case NAVIGATE_PREV:
- p_wrapper->NavigatePrev();
- break;
- case NAVIGATE_NEXT:
- p_wrapper->NavigateNext();
- break;
- // drag'n'drop and system messages
- case B_REFS_RECEIVED:
- case B_SIMPLE_DATA:
- {
- /* file(s) opened by the File menu -> append to the playlist;
- * file(s) opened by drag & drop -> replace playlist;
- * file(s) opened by 'shift' + drag & drop -> append */
- bool replace = false;
- if ( p_message->WasDropped() )
- replace = !( modifiers() & B_SHIFT_KEY );
-
- // 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 dvd disk icon?
- BDirectory dir( &ref );
- if ( dir.InitCheck() == B_OK && dir.IsRootDirectory() )
- {
- BVolumeRoster volRoster;
- BVolume vol;
- BDirectory volumeRoot;
- status_t status = volRoster.GetNextVolume( &vol );
- while( status == B_NO_ERROR )
- {
- if( vol.GetRootDirectory( &volumeRoot ) == B_OK
- && dir == volumeRoot )
- {
- BString volumeName;
- BString deviceName;
- bool isCDROM = false;
- bool success = false;
- deviceName = "";
- volumeName = "";
- char name[B_FILE_NAME_LENGTH];
- if ( vol.GetName( name ) >= B_OK ) // disk is currently mounted
- {
- volumeName = name;
- dev_t dev = vol.Device();
- fs_info info;
- if ( fs_stat_dev( dev, &info ) == B_OK )
- {
- success = true;
- deviceName = info.device_name;
- if ( vol.IsReadOnly() )
- {
- int i_dev = open( info.device_name, O_RDONLY );
- if ( i_dev >= 0 )
- {
- device_geometry g;
- if ( ioctl( i_dev, B_GET_GEOMETRY, &g, sizeof( g ) ) >= 0 )
- isCDROM = ( g.device_type == B_CD );
- close( i_dev );
- }
- }
- }
- }
-
- if( success && isCDROM )
- {
- BMessage msg( OPEN_DVD );
- msg.AddString( "device", deviceName.String() );
- PostMessage( &msg );
- add = false;
- }
- break;
- }
- else
- {
- vol.Unset();
- status = volRoster.GetNextVolume( &vol );
- }
- }
- }
- if( add )
- {
- files.AddItem( new BString( (char*)path.Path() ) );
- }
- }
- }
- // give the list to VLC
- p_wrapper->OpenFiles(&files, replace);
- _UpdatePlaylist();
- }
- break;
-
- case OPEN_PREFERENCES:
- if( fPreferencesWindow->Lock() )
- {
- if (fPreferencesWindow->IsHidden())
- fPreferencesWindow->Show();
- else
- fPreferencesWindow->Activate();
- fPreferencesWindow->Unlock();
- }
- break;
-
- default:
- BWindow::MessageReceived( p_message );
- break;
- }
+ }
+ break;
+ case PREV_FILE:
+ p_wrapper->PlaylistPrev();
+ break;
+ case NEXT_FILE:
+ p_wrapper->PlaylistNext();
+ break;
+ // general next/prev functionality (skips to whatever makes most sense)
+ case NAVIGATE_PREV:
+ p_wrapper->NavigatePrev();
+ break;
+ case NAVIGATE_NEXT:
+ p_wrapper->NavigateNext();
+ break;
+ // drag'n'drop and system messages
+ case B_REFS_RECEIVED:
+ case B_SIMPLE_DATA:
+ {
+ /* file(s) opened by the File menu -> append to the playlist;
+ * file(s) opened by drag & drop -> replace playlist;
+ * file(s) opened by 'shift' + drag & drop -> append */
+ bool replace = false;
+ if ( p_message->WasDropped() )
+ replace = !( modifiers() & B_SHIFT_KEY );
+
+ // 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 dvd disk icon?
+ BDirectory dir( &ref );
+ if ( dir.InitCheck() == B_OK && dir.IsRootDirectory() )
+ {
+ BVolumeRoster volRoster;
+ BVolume vol;
+ BDirectory volumeRoot;
+ status_t status = volRoster.GetNextVolume( &vol );
+ while( status == B_NO_ERROR )
+ {
+ if( vol.GetRootDirectory( &volumeRoot ) == B_OK
+ && dir == volumeRoot )
+ {
+ BString volumeName;
+ BString deviceName;
+ bool isCDROM = false;
+ bool success = false;
+ deviceName = "";
+ volumeName = "";
+ char name[B_FILE_NAME_LENGTH];
+ if ( vol.GetName( name ) >= B_OK ) // disk is currently mounted
+ {
+ volumeName = name;
+ dev_t dev = vol.Device();
+ fs_info info;
+ if ( fs_stat_dev( dev, &info ) == B_OK )
+ {
+ success = true;
+ deviceName = info.device_name;
+ if ( vol.IsReadOnly() )
+ {
+ int i_dev = open( info.device_name, O_RDONLY );
+ if ( i_dev >= 0 )
+ {
+ device_geometry g;
+ if ( ioctl( i_dev, B_GET_GEOMETRY, &g, sizeof( g ) ) >= 0 )
+ isCDROM = ( g.device_type == B_CD );
+ close( i_dev );
+ }
+ }
+ }
+ }
+
+ if( success && isCDROM )
+ {
+ BMessage msg( OPEN_DVD );
+ msg.AddString( "device", deviceName.String() );
+ PostMessage( &msg );
+ add = false;
+ }
+ break;
+ }
+ else
+ {
+ vol.Unset();
+ status = volRoster.GetNextVolume( &vol );
+ }
+ }
+ }
+ if( add )
+ {
+ files.AddItem( new BString( (char*)path.Path() ) );
+ }
+ }
+ }
+ // give the list to VLC
+ p_wrapper->OpenFiles(&files, replace);
+ _UpdatePlaylist();
+ }
+ break;
+
+ case OPEN_PREFERENCES:
+ {
+ if( fPreferencesWindow->Lock() )
+ {
+ if (fPreferencesWindow->IsHidden())
+ fPreferencesWindow->Show();
+ else
+ fPreferencesWindow->Activate();
+ fPreferencesWindow->Unlock();
+ }
+ break;
+ }
+
+ case OPEN_MESSAGES:
+ {
+ if( fMessagesWindow->Lock() )
+ {
+ if (fMessagesWindow->IsHidden())
+ fMessagesWindow->Show();
+ else
+ fMessagesWindow->Activate();
+ fMessagesWindow->Unlock();
+ }
+ break;
+ }
+
+ default:
+ BWindow::MessageReceived( p_message );
+ break;
+ }
}
*****************************************************************************/
bool InterfaceWindow::QuitRequested()
{
- p_wrapper->PlaylistStop();
- p_mediaControl->SetStatus(NOT_STARTED_S, DEFAULT_RATE);
+ p_wrapper->PlaylistStop();
+ p_mediaControl->SetStatus(NOT_STARTED_S, DEFAULT_RATE);
/* Save interface settings */
BRect frame = Frame();
config_PutInt( p_intf, "beos-playlist-show", !fPlaylistWindow->IsHidden() );
fPlaylistWindow->Unlock();
}
+ if( fMessagesWindow->Lock() )
+ {
+ config_PutInt( p_intf, "beos-messages-show", !fMessagesWindow->IsHidden() );
+ fMessagesWindow->Unlock();
+ }
config_SaveConfigFile( p_intf, "beos" );
- p_intf->b_die = 1;
+ p_intf->b_die = 1;
- return( true );
+ return( true );
}
/*****************************************************************************
- * InterfaceWindow::updateInterface
+ * InterfaceWindow::UpdateInterface
*****************************************************************************/
-void InterfaceWindow::updateInterface()
+void InterfaceWindow::UpdateInterface()
{
if( p_wrapper->HasInput() )
{
- if ( acquire_sem( p_mediaControl->fScrubSem ) == B_OK )
- {
- p_wrapper->SetTimeAsFloat(p_mediaControl->GetSeekTo());
- }
- else if ( Lock() )
- {
- p_mediaControl->SetEnabled( true );
- bool hasTitles = p_wrapper->HasTitles();
- bool hasChapters = p_wrapper->HasChapters();
- p_mediaControl->SetStatus( p_wrapper->InputStatus(),
- p_wrapper->InputRate() );
- p_mediaControl->SetProgress( p_wrapper->GetTimeAsFloat() );
- _SetMenusEnabled( true, hasChapters, hasTitles );
-
- _UpdateSpeedMenu( p_wrapper->InputRate() );
-
- // enable/disable skip buttons
- bool canSkipPrev;
- bool canSkipNext;
- p_wrapper->GetNavCapabilities( &canSkipPrev, &canSkipNext );
- p_mediaControl->SetSkippable( canSkipPrev, canSkipNext );
-
- if ( p_wrapper->HasAudio() )
- {
- p_mediaControl->SetAudioEnabled( true );
- p_mediaControl->SetMuted( p_wrapper->IsMuted() );
- } else
- p_mediaControl->SetAudioEnabled( false );
-
- Unlock();
- }
- // update playlist as well
- if ( fPlaylistWindow->Lock() )
- {
- fPlaylistWindow->UpdatePlaylist();
- fPlaylistWindow->Unlock();
- }
- }
+ if ( acquire_sem( p_mediaControl->fScrubSem ) == B_OK )
+ {
+ p_wrapper->SetTimeAsFloat(p_mediaControl->GetSeekTo());
+ }
+ else if ( Lock() )
+ {
+ p_mediaControl->SetEnabled( true );
+ bool hasTitles = p_wrapper->HasTitles();
+ bool hasChapters = p_wrapper->HasChapters();
+ p_mediaControl->SetStatus( p_wrapper->InputStatus(),
+ p_wrapper->InputRate() );
+ p_mediaControl->SetProgress( p_wrapper->GetTimeAsFloat() );
+ _SetMenusEnabled( true, hasChapters, hasTitles );
+
+ _UpdateSpeedMenu( p_wrapper->InputRate() );
+
+ // enable/disable skip buttons
+ bool canSkipPrev;
+ bool canSkipNext;
+ p_wrapper->GetNavCapabilities( &canSkipPrev, &canSkipNext );
+ p_mediaControl->SetSkippable( canSkipPrev, canSkipNext );
+
+ if ( p_wrapper->HasAudio() )
+ {
+ p_mediaControl->SetAudioEnabled( true );
+ p_mediaControl->SetMuted( p_wrapper->IsMuted() );
+ } else
+ p_mediaControl->SetAudioEnabled( false );
+
+ Unlock();
+ }
+ // update playlist as well
+ if ( fPlaylistWindow->Lock() )
+ {
+ fPlaylistWindow->UpdatePlaylist();
+ fPlaylistWindow->Unlock();
+ }
+ }
else
{
- _SetMenusEnabled( false );
- if( !( p_wrapper->PlaylistSize() > 0 ) )
- p_mediaControl->SetEnabled( false );
- else
- p_mediaControl->SetProgress( 0 );
+ _SetMenusEnabled( false );
+ if( !( p_wrapper->PlaylistSize() > 0 ) )
+ p_mediaControl->SetEnabled( false );
+ else
+ p_mediaControl->SetProgress( 0 );
}
/* always force the user-specified volume */
{
p_wrapper->SetVolume( i_volume );
}
+
+ fMessagesWindow->UpdateMessages();
- fLastUpdateTime = system_time();
+ fLastUpdateTime = system_time();
}
/*****************************************************************************
bool
InterfaceWindow::IsStopped() const
{
- return (system_time() - fLastUpdateTime > INTERFACE_UPDATE_TIMEOUT);
+ return (system_time() - fLastUpdateTime > INTERFACE_UPDATE_TIMEOUT);
}
/*****************************************************************************
void
InterfaceWindow::_UpdatePlaylist()
{
- if ( fPlaylistWindow->Lock() )
- {
- fPlaylistWindow->UpdatePlaylist( true );
- fPlaylistWindow->Unlock();
- p_mediaControl->SetEnabled( p_wrapper->PlaylistSize() );
- }
+ if ( fPlaylistWindow->Lock() )
+ {
+ fPlaylistWindow->UpdatePlaylist( true );
+ fPlaylistWindow->Unlock();
+ p_mediaControl->SetEnabled( p_wrapper->PlaylistSize() );
+ }
}
/*****************************************************************************
void
InterfaceWindow::_SetMenusEnabled(bool hasFile, bool hasChapters, bool hasTitles)
{
- if (!hasFile)
- {
- hasChapters = false;
- hasTitles = false;
- }
- if (Lock())
- {
- if (fNextChapterMI->IsEnabled() != hasChapters)
- fNextChapterMI->SetEnabled(hasChapters);
- if (fPrevChapterMI->IsEnabled() != hasChapters)
- fPrevChapterMI->SetEnabled(hasChapters);
- if (fChapterMenu->IsEnabled() != hasChapters)
- fChapterMenu->SetEnabled(hasChapters);
- if (fNextTitleMI->IsEnabled() != hasTitles)
- fNextTitleMI->SetEnabled(hasTitles);
- if (fPrevTitleMI->IsEnabled() != hasTitles)
- fPrevTitleMI->SetEnabled(hasTitles);
- if (fTitleMenu->IsEnabled() != hasTitles)
- fTitleMenu->SetEnabled(hasTitles);
- if (fAudioMenu->IsEnabled() != hasFile)
- fAudioMenu->SetEnabled(hasFile);
- if (fNavigationMenu->IsEnabled() != hasFile)
- fNavigationMenu->SetEnabled(hasFile);
- if (fLanguageMenu->IsEnabled() != hasFile)
- fLanguageMenu->SetEnabled(hasFile);
- if (fSubtitlesMenu->IsEnabled() != hasFile)
- fSubtitlesMenu->SetEnabled(hasFile);
- if (fSpeedMenu->IsEnabled() != hasFile)
- fSpeedMenu->SetEnabled(hasFile);
- Unlock();
- }
+ if (!hasFile)
+ {
+ hasChapters = false;
+ hasTitles = false;
+ }
+ if (Lock())
+ {
+ if (fNextChapterMI->IsEnabled() != hasChapters)
+ fNextChapterMI->SetEnabled(hasChapters);
+ if (fPrevChapterMI->IsEnabled() != hasChapters)
+ fPrevChapterMI->SetEnabled(hasChapters);
+ if (fChapterMenu->IsEnabled() != hasChapters)
+ fChapterMenu->SetEnabled(hasChapters);
+ if (fNextTitleMI->IsEnabled() != hasTitles)
+ fNextTitleMI->SetEnabled(hasTitles);
+ if (fPrevTitleMI->IsEnabled() != hasTitles)
+ fPrevTitleMI->SetEnabled(hasTitles);
+ if (fTitleMenu->IsEnabled() != hasTitles)
+ fTitleMenu->SetEnabled(hasTitles);
+ if (fAudioMenu->IsEnabled() != hasFile)
+ fAudioMenu->SetEnabled(hasFile);
+ if (fNavigationMenu->IsEnabled() != hasFile)
+ fNavigationMenu->SetEnabled(hasFile);
+ if (fLanguageMenu->IsEnabled() != hasFile)
+ fLanguageMenu->SetEnabled(hasFile);
+ if (fSubtitlesMenu->IsEnabled() != hasFile)
+ fSubtitlesMenu->SetEnabled(hasFile);
+ if (fSpeedMenu->IsEnabled() != hasFile)
+ fSpeedMenu->SetEnabled(hasFile);
+ Unlock();
+ }
}
/*****************************************************************************
void
InterfaceWindow::_UpdateSpeedMenu( int rate )
{
- if ( rate == DEFAULT_RATE )
- {
- if ( !fNormalMI->IsMarked() )
- fNormalMI->SetMarked( true );
- }
- else if ( rate < DEFAULT_RATE )
- {
- if ( !fFasterMI->IsMarked() )
- fFasterMI->SetMarked( true );
- }
- else
- {
- if ( !fSlowerMI->IsMarked() )
- fSlowerMI->SetMarked( true );
- }
+ if ( rate == DEFAULT_RATE )
+ {
+ if ( !fNormalMI->IsMarked() )
+ fNormalMI->SetMarked( true );
+ }
+ else if ( rate < DEFAULT_RATE )
+ {
+ if ( !fFasterMI->IsMarked() )
+ fFasterMI->SetMarked( true );
+ }
+ else
+ {
+ if ( !fSlowerMI->IsMarked() )
+ fSlowerMI->SetMarked( true );
+ }
}
/*****************************************************************************
void
InterfaceWindow::_InputStreamChanged()
{
- // TODO: move more stuff from updateInterface() here!
- snooze( 400000 );
- p_wrapper->SetVolume( p_mediaControl->GetVolume() );
+ // TODO: move more stuff from updateInterface() here!
+ snooze( 400000 );
+ p_wrapper->SetVolume( p_mediaControl->GetVolume() );
}
void
make_sure_frame_is_within_limits( BRect& frame, float minWidth, float minHeight,
- float maxWidth, float maxHeight )
+ float maxWidth, float maxHeight )
{
- if ( frame.Width() < minWidth )
- frame.right = frame.left + minWidth;
- if ( frame.Height() < minHeight )
- frame.bottom = frame.top + minHeight;
- if ( frame.Width() > maxWidth )
- frame.right = frame.left + maxWidth;
- if ( frame.Height() > maxHeight )
- frame.bottom = frame.top + maxHeight;
+ if ( frame.Width() < minWidth )
+ frame.right = frame.left + minWidth;
+ if ( frame.Height() < minHeight )
+ frame.bottom = frame.top + minHeight;
+ if ( frame.Width() > maxWidth )
+ frame.right = frame.left + maxWidth;
+ if ( frame.Height() > maxHeight )
+ frame.bottom = frame.top + maxHeight;
}
/*****************************************************************************
* CDMenu::CDMenu
*****************************************************************************/
CDMenu::CDMenu(const char *name)
- : BMenu(name)
+ : BMenu(name)
{
}
*****************************************************************************/
void CDMenu::AttachedToWindow(void)
{
- // remove all items
- while (BMenuItem* item = RemoveItem(0L))
- delete item;
- GetCD("/dev/disk");
- BMenu::AttachedToWindow();
+ // remove all items
+ while (BMenuItem* item = RemoveItem(0L))
+ delete item;
+ GetCD("/dev/disk");
+ BMenu::AttachedToWindow();
}
/*****************************************************************************
*****************************************************************************/
int CDMenu::GetCD( const char *directory )
{
- BVolumeRoster *volRoster;
- BVolume *vol;
- BDirectory *dir;
- int status;
- int mounted;
- char name[B_FILE_NAME_LENGTH];
- fs_info info;
- dev_t dev;
-
- volRoster = new BVolumeRoster();
- vol = new BVolume();
- dir = new BDirectory();
- status = volRoster->GetNextVolume(vol);
- status = vol->GetRootDirectory(dir);
- while (status == B_NO_ERROR)
- {
- mounted = vol->GetName(name);
- if ((mounted == B_OK) && /* Disk is currently Mounted */
- (vol->IsReadOnly()) ) /* Disk is read-only */
- {
- dev = vol->Device();
- fs_stat_dev(dev, &info);
-
- device_geometry g;
- int i_dev;
- i_dev = open( info.device_name, O_RDONLY );
-
- if( i_dev >= 0 )
- {
- if( ioctl(i_dev, B_GET_GEOMETRY, &g, sizeof(g)) >= 0 )
- {
- if( g.device_type == B_CD ) //ensure the drive is a CD-ROM
- {
- BMessage *msg;
- msg = new BMessage( OPEN_DVD );
- msg->AddString( "device", info.device_name );
- BMenuItem *menu_item;
- menu_item = new BMenuItem( name, msg );
- AddItem( menu_item );
- }
- close(i_dev);
- }
- }
- }
- vol->Unset();
- status = volRoster->GetNextVolume(vol);
- }
- return 0;
+ BVolumeRoster *volRoster;
+ BVolume *vol;
+ BDirectory *dir;
+ int status;
+ int mounted;
+ char name[B_FILE_NAME_LENGTH];
+ fs_info info;
+ dev_t dev;
+
+ volRoster = new BVolumeRoster();
+ vol = new BVolume();
+ dir = new BDirectory();
+ status = volRoster->GetNextVolume(vol);
+ status = vol->GetRootDirectory(dir);
+ while (status == B_NO_ERROR)
+ {
+ mounted = vol->GetName(name);
+ if ((mounted == B_OK) && /* Disk is currently Mounted */
+ (vol->IsReadOnly()) ) /* Disk is read-only */
+ {
+ dev = vol->Device();
+ fs_stat_dev(dev, &info);
+
+ device_geometry g;
+ int i_dev;
+ i_dev = open( info.device_name, O_RDONLY );
+
+ if( i_dev >= 0 )
+ {
+ if( ioctl(i_dev, B_GET_GEOMETRY, &g, sizeof(g)) >= 0 )
+ {
+ if( g.device_type == B_CD ) //ensure the drive is a CD-ROM
+ {
+ BMessage *msg;
+ msg = new BMessage( OPEN_DVD );
+ msg->AddString( "device", info.device_name );
+ BMenuItem *menu_item;
+ menu_item = new BMenuItem( name, msg );
+ AddItem( menu_item );
+ }
+ close(i_dev);
+ }
+ }
+ }
+ vol->Unset();
+ status = volRoster->GetNextVolume(vol);
+ }
+ return 0;
}
/*****************************************************************************
* LanguageMenu::LanguageMenu
*****************************************************************************/
LanguageMenu::LanguageMenu( const char *name, int menu_kind,
- VlcWrapper *p_wrapper )
- :BMenu(name)
+ VlcWrapper *p_wrapper )
+ :BMenu(name)
{
- kind = menu_kind;
- this->p_wrapper = p_wrapper;
+ kind = menu_kind;
+ this->p_wrapper = p_wrapper;
}
/*****************************************************************************
*****************************************************************************/
void LanguageMenu::AttachedToWindow()
{
- // remove all items
- while ( BMenuItem* item = RemoveItem( 0L ) )
- delete item;
+ // remove all items
+ while ( BMenuItem* item = RemoveItem( 0L ) )
+ delete item;
- SetRadioMode( true );
- _GetChannels();
- BMenu::AttachedToWindow();
+ SetRadioMode( true );
+ _GetChannels();
+ BMenu::AttachedToWindow();
}
/*****************************************************************************
* TitleMenu::TitleMenu
*****************************************************************************/
TitleMenu::TitleMenu( const char *name, intf_thread_t *p_interface )
- : BMenu(name),
- p_intf( p_interface )
+ : BMenu(name),
+ p_intf( p_interface )
{
}
BMenuItem *item;
BList *list;
- while( ( item = RemoveItem( 0L ) ) )
- delete item;
+ while( ( item = RemoveItem( 0L ) ) )
+ delete item;
if( ( list = p_intf->p_sys->p_wrapper->GetTitles() ) == NULL )
return;
AddItem( item );
}
- BMenu::AttachedToWindow();
+ BMenu::AttachedToWindow();
}
* ChapterMenu::ChapterMenu
*****************************************************************************/
ChapterMenu::ChapterMenu( const char *name, intf_thread_t *p_interface )
- : BMenu(name),
- p_intf( p_interface )
+ : BMenu(name),
+ p_intf( p_interface )
{
}
BMenuItem *item;
BList *list;
- while( ( item = RemoveItem( 0L ) ) )
- delete item;
+ while( ( item = RemoveItem( 0L ) ) )
+ delete item;
if( ( list = p_intf->p_sys->p_wrapper->GetChapters() ) == NULL )
return;
AddItem( item );
}
- BMenu::AttachedToWindow();
+ BMenu::AttachedToWindow();
}
projects / vlc / commitdiff