* InterfaceWindow.cpp: beos interface
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: InterfaceWindow.cpp,v 1.1 2002/08/04 17:23:43 sam Exp $
+ * $Id: InterfaceWindow.cpp,v 1.2 2002/09/30 18:30:27 titer Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* Tony Castley <tony@castley.net>
* Richard Shepherd <richard@rshepherd.demon.co.uk>
+ * Stephan Aßmus <stippi@yellowbites.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <fs_info.h>
#include <string.h>
-
/* VLC headers */
#include <vlc/vlc.h>
#include <vlc/aout.h>
#include "VlcWrapper.h"
#include "InterfaceWindow.h"
+#define INTERFACE_UPDATE_TIMEOUT 80000 // 2 frames if at 25 fps
+
/*****************************************************************************
* InterfaceWindow
*****************************************************************************/
InterfaceWindow::InterfaceWindow( BRect frame, const char *name,
- intf_thread_t *p_interface )
- : BWindow( frame, name, B_FLOATING_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
- B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_WILL_ACCEPT_FIRST_CLICK
- | B_ASYNCHRONOUS_CONTROLS )
+ 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 ),
+ fInputThread( NULL ),
+ fFilePanel( NULL ),
+ fLastUpdateTime( system_time() ),
+ fSettings( new BMessage( 'sett' ) )
{
- file_panel = NULL;
- playlist_window = NULL;
p_intf = p_interface;
- p_vlc_wrapper = Intf_VLCWrapper::getVLCWrapper(p_intf);
- BRect controlRect(0,0,0,0);
-
+ p_vlc_wrapper = p_vlc_wrapper->getVLCWrapper(p_intf);
playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
- b_empty_playlist = (p_playlist->i_size < 0);
- b_mute = false;
-
- /* set the title bar */
- SetName( "interface" );
- SetTitle(VOUT_TITLE);
-
- /* set up the main menu */
- BMenuBar *menu_bar;
- menu_bar = new BMenuBar(controlRect, "main menu");
- AddChild( menu_bar );
-
- BMenu *mFile;
- BMenu *mAudio;
- CDMenu *cd_menu;
- BMenu *mNavigation;
-
- /* Add the file Menu */
- BMenuItem *mItem;
- menu_bar->AddItem( mFile = new BMenu( "File" ) );
- menu_bar->ResizeToPreferred();
- mFile->AddItem( mItem = new BMenuItem( "Open File" B_UTF8_ELLIPSIS,
- new BMessage(OPEN_FILE), 'O') );
-
- cd_menu = new CDMenu( "Open Disc" );
- mFile->AddItem( cd_menu );
-
- mFile->AddSeparatorItem();
- mFile->AddItem( mItem = new BMenuItem( "Play List" B_UTF8_ELLIPSIS,
- new BMessage(OPEN_PLAYLIST), 'P') );
-
- mFile->AddSeparatorItem();
- mFile->AddItem( mItem = new BMenuItem( "About" B_UTF8_ELLIPSIS,
- new BMessage(B_ABOUT_REQUESTED), 'A') );
- mItem->SetTarget( be_app );
- mFile->AddItem(mItem = new BMenuItem( "Quit",
- new BMessage(B_QUIT_REQUESTED), 'Q') );
-
- /* Add the Audio menu */
- menu_bar->AddItem ( mAudio = new BMenu( "Audio" ) );
- menu_bar->ResizeToPreferred();
- mAudio->AddItem( new LanguageMenu( "Language", AUDIO_ES, p_intf ) );
- mAudio->AddItem( new LanguageMenu( "Subtitles", SPU_ES, p_intf ) );
-
- /* Add the Navigation menu */
- menu_bar->AddItem( mNavigation = new BMenu( "Navigation" ) );
- menu_bar->ResizeToPreferred();
- mNavigation->AddItem( new BMenuItem( "Prev Title",
- new BMessage(PREV_TITLE)) );
- mNavigation->AddItem( new BMenuItem( "Next Title",
- new BMessage(NEXT_TITLE)) );
- mNavigation->AddItem( new BMenuItem( "Prev Chapter",
- new BMessage(PREV_CHAPTER)) );
- mNavigation->AddItem( new BMenuItem( "Next Chapter",
- new BMessage(NEXT_CHAPTER)) );
-
- ResizeTo(260,50 + menu_bar->Bounds().IntegerHeight()+1);
- controlRect = Bounds();
- controlRect.top += menu_bar->Bounds().IntegerHeight() + 1;
-
- p_mediaControl = new MediaControlView( controlRect );
- p_mediaControl->SetViewColor( ui_color(B_PANEL_BACKGROUND_COLOR) );
- b_empty_playlist = true;
- p_mediaControl->SetEnabled( !b_empty_playlist );
-
- /* Show */
- AddChild( p_mediaControl );
- Show();
+ fPlaylistIsEmpty = (p_playlist->i_size < 0);
+ // 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_mediaControl->SetViewColor( ui_color( B_PANEL_BACKGROUND_COLOR ) );
+ p_mediaControl->SetEnabled( !fPlaylistIsEmpty );
+
+ 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->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_intf);
+ fSubtitlesMenu = new LanguageMenu("Subtitles", SPU_ES, p_intf);
+
+ /* 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 Config menu */
+// BMenu* configMenu = new BMenu( "Config" );
+// menu_bar->AddItem( configMenu );
+// fOnTopMI = new BMenuItem( "Always on Top",
+// new BMessage( TOGGLE_ON_TOP ) )
+// configMenu->AddItem( );
+// fOnTopMI->SetMarked(false);
+
+ // prepare fow showing
+ _SetMenusEnabled(false);
+
+ _RestoreSettings();
+
+ Show();
}
InterfaceWindow::~InterfaceWindow()
{
- if (playlist_window) playlist_window->ReallyQuit();
+ if (fPlaylistWindow)
+ fPlaylistWindow->ReallyQuit();
+ delete fSettings;
+}
+
+/*****************************************************************************
+ * InterfaceWindow::FrameResized
+ *****************************************************************************/
+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());
}
/*****************************************************************************
*****************************************************************************/
void InterfaceWindow::MessageReceived( BMessage * p_message )
{
- int vol_val = p_mediaControl->GetVolume(); // remember the current volume
- int playback_status; // remember playback state
- int i_index;
- BAlert *alert;
-
- Activate();
- playback_status = p_vlc_wrapper->inputGetStatus();
-
- switch( p_message->what )
- {
- case B_ABOUT_REQUESTED:
- 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( file_panel )
- {
- file_panel->Show();
- break;
- }
- file_panel = new BFilePanel();
- file_panel->SetTarget( this );
- file_panel->Show();
- b_empty_playlist = false;
- p_mediaControl->SetEnabled( !b_empty_playlist );
- break;
-
- case OPEN_PLAYLIST:
- {
- BRect rect(20,20,320,420);
- playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ int playback_status; // remember playback state
+ playback_status = p_vlc_wrapper->inputGetStatus();
- playlist_window = PlayListWindow::getPlayList(rect,
- "Playlist", p_playlist);
- playlist_window->Show();
- }
- break;
- case OPEN_DVD:
- {
- const char *psz_device;
- BString type("dvd");
- if( p_message->FindString("device", &psz_device) != B_ERROR )
- {
- BString device(psz_device);
- p_vlc_wrapper->openDisc(type, device, 0,0);
- }
- }
- break;
-
- case STOP_PLAYBACK:
- // this currently stops playback not nicely
- //p_vlc_wrapper->volume_mute();
- //snooze( 400000 );
- p_vlc_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( p_intf->p_sys->p_input != NULL )
- {
- /* pause if currently playing */
- if ( playback_status == PLAYING_S )
- {
- //p_vlc_wrapper->volume_mute();
- //snooze( 400000 );
- p_vlc_wrapper->playlistPause();
- }
- else
- {
- //p_vlc_wrapper->volume_restore();
- p_vlc_wrapper->playlistPlay();
- }
- }
- else
- {
- /* Play a new file */
- p_vlc_wrapper->playlistPlay();
- }
- break;
-
- case FASTER_PLAY:
- /* cycle the fast playback modes */
- //p_vlc_wrapper->volume_mute();
- //snooze( 400000 );
- p_vlc_wrapper->playFaster();
- break;
-
- case SLOWER_PLAY:
- /* cycle the slow playback modes */
- //p_vlc_wrapper->volume_mute();
- //snooze( 400000 );
- p_vlc_wrapper->playSlower();
- break;
-
- case SEEK_PLAYBACK:
- /* handled by semaphores */
- break;
-
- case VOLUME_CHG:
- /* adjust the volume */
-// vlc_mutex_lock( &p_intf->p_sys->p_input->lock );
-// for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
-// {
-// if( p_aout_bank->pp_aout[i_index]->i_savedvolume )
-// {
-// p_aout_bank->pp_aout[i_index]->i_savedvolume = vol_val;
-// }
-// else
-// {
-// p_aout_bank->pp_aout[i_index]->i_volume = vol_val;
-// }
-// }
-// vlc_mutex_unlock( &p_aout_bank->lock );
- break;
-
- case VOLUME_MUTE:
- /* toggle muting */
- p_vlc_wrapper->toggleMute( );
- break;
-
- case SELECT_AUDIO:
- {
- int32 i = p_message->FindInt32( "audio" );
- p_vlc_wrapper->toggleLanguage( i );
- }
- break;
-
- case SELECT_SUBTITLE:
- {
- int32 i = p_message->FindInt32( "subtitle" );
- p_vlc_wrapper->toggleSubtitle( i );
- }
- break;
- case PREV_TITLE:
- {
- int i_id;
+ 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_vlc_wrapper->openDisc( type, device, 0, 0 );
+ }
+ _UpdatePlaylist();
+ }
+ break;
+
+ case STOP_PLAYBACK:
+ // this currently stops playback not nicely
+ if (playback_status > UNDEF_S)
+ {
+ p_vlc_wrapper->volume_mute();
+ snooze( 400000 );
+ p_vlc_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_vlc_wrapper->volume_mute();
+ snooze( 400000 );
+ p_vlc_wrapper->playlistPause();
+ }
+ else
+ {
+ p_vlc_wrapper->volume_restore();
+ p_vlc_wrapper->playlistPlay();
+ }
+ }
+ else
+ {
+ /* Play a new file */
+ p_vlc_wrapper->playlistPlay();
+ }
+ break;
+
+ case FASTER_PLAY:
+ /* cycle the fast playback modes */
+ if (playback_status > UNDEF_S)
+ {
+ p_vlc_wrapper->volume_mute();
+ snooze( 400000 );
+ p_vlc_wrapper->playFaster();
+ }
+ break;
+
+ case SLOWER_PLAY:
+ /* cycle the slow playback modes */
+ if (playback_status > UNDEF_S)
+ {
+ p_vlc_wrapper->volume_mute();
+ snooze( 400000 );
+ p_vlc_wrapper->playSlower();
+ }
+ break;
+
+ case NORMAL_PLAY:
+ /* restore speed to normal if already playing */
+ if (playback_status > UNDEF_S)
+ {
+ p_vlc_wrapper->volume_restore();
+ p_vlc_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_vlc_wrapper->set_volume( p_mediaControl->GetVolume() );
+ p_mediaControl->SetMuted( p_vlc_wrapper->is_muted() );
+ }
+ break;
+
+ case VOLUME_MUTE:
+ // toggle muting
+ p_vlc_wrapper->toggle_mute();
+ p_mediaControl->SetMuted( p_vlc_wrapper->is_muted() );
+ break;
+
+ case SELECT_CHANNEL:
+ if ( playback_status > UNDEF_S )
+ {
+ int32 channel;
+ if ( p_message->FindInt32( "channel", &channel ) == B_OK )
+ {
+ p_vlc_wrapper->toggleLanguage( channel );
+ // vlc seems to remember the volume for every channel,
+ // but I would assume that to be somewhat annoying to the user
+ // the next call will also unmute the volume, which is probably
+ // desired as well, because if the user selects another language,
+ // he probably wants to hear the change as well
+ snooze( 400000 ); // we have to wait a bit, or the change will be reverted
+ p_vlc_wrapper->set_volume( p_mediaControl->GetVolume() );
+ }
+ }
+ break;
+
+ case SELECT_SUBTITLE:
+ if ( playback_status > UNDEF_S )
+ {
+ int32 subtitle;
+ if ( p_message->FindInt32( "subtitle", &subtitle ) == B_OK )
+ p_vlc_wrapper->toggleSubtitle( subtitle );
+ }
+ break;
+
+ // specific navigation messages
+ case PREV_TITLE:
+ {
+ int i_id;
i_id = p_intf->p_sys->p_input->stream.p_selected_area->i_id - 1;
/* Disallow area 0 since it is used for video_ts.vob */
{
p_vlc_wrapper->toggleTitle(i_id);
}
- break;
- }
- case NEXT_TITLE:
- {
- int i_id;
+ break;
+ }
+ case NEXT_TITLE:
+ {
+ int i_id;
i_id = p_intf->p_sys->p_input->stream.p_selected_area->i_id + 1;
{
p_vlc_wrapper->toggleTitle(i_id);
}
- }
- break;
- case PREV_CHAPTER:
- {
- int i_id;
+ break;
+ }
+ case TOGGLE_TITLE:
+ if ( playback_status > UNDEF_S )
+ {
+ int32 index;
+ if ( p_message->FindInt32( "index", &index ) == B_OK )
+ p_vlc_wrapper->toggleTitle( index );
+ }
+ break;
+ case PREV_CHAPTER:
+ {
+ int i_id;
i_id = p_intf->p_sys->p_input->stream.p_selected_area->i_part - 1;
{
p_vlc_wrapper->toggleChapter(i_id);
}
- }
- break;
- case NEXT_CHAPTER:
- {
- int i_id;
+ break;
+ }
+ case NEXT_CHAPTER:
+ {
+ int i_id;
i_id = p_intf->p_sys->p_input->stream.p_selected_area->i_part + 1;
{
p_vlc_wrapper->toggleChapter(i_id);
}
- }
- break;
- case B_REFS_RECEIVED:
- case B_SIMPLE_DATA:
- {
- entry_ref ref;
- BList* files = new BList();
-
- int i = 0;
- while( p_message->FindRef( "refs", i, &ref ) == B_OK )
- {
- BPath path( &ref );
+ break;
+ }
+ case TOGGLE_CHAPTER:
+ if ( playback_status > UNDEF_S )
+ {
+ int32 index;
+ if ( p_message->FindInt32( "index", &index ) == B_OK )
+ p_vlc_wrapper->toggleChapter( index );
+ }
+ break;
+ case PREV_FILE:
+ p_vlc_wrapper->playlistPrev();
+ break;
+ case NEXT_FILE:
+ p_vlc_wrapper->playlistNext();
+ break;
+ // general next/prev functionality (skips to whatever makes most sense)
+ case NAVIGATE_PREV:
+ p_vlc_wrapper->navigatePrev();
+ break;
+ case NAVIGATE_NEXT:
+ p_vlc_wrapper->navigateNext();
+ break;
+ // drag'n'drop and system messages
+ case B_REFS_RECEIVED:
+ case B_SIMPLE_DATA:
+ {
+ // figure out if user wants files replaced or added
+ 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 )
+ // the BString objects will be deleted
+ // by the wrapper function further down
+ files.AddItem( new BString( (char*)path.Path() ) );
+ }
+ // give the list to VLC
+ p_vlc_wrapper->openFiles(&files, replace);
+ _UpdatePlaylist();
+ }
+ break;
+
+ default:
+ BWindow::MessageReceived( p_message );
+ break;
+ }
- files->AddItem(new BString((char*)path.Path()) );
- i++;
- }
- p_vlc_wrapper->openFiles(files);
- delete files;
- }
- break;
+}
+
+/*****************************************************************************
+ * InterfaceWindow::QuitRequested
+ *****************************************************************************/
+bool InterfaceWindow::QuitRequested()
+{
+ if (p_intf->p_sys->p_input)
+ {
+ p_vlc_wrapper->volume_mute();
+ snooze( 400000 );
+ p_vlc_wrapper->playlistStop();
+ p_mediaControl->SetStatus(NOT_STARTED_S, DEFAULT_RATE);
+ }
+
+ p_intf->b_die = 1;
- default:
- BWindow::MessageReceived( p_message );
- break;
- }
+ _StoreSettings();
+ return( true );
}
/*****************************************************************************
*****************************************************************************/
void InterfaceWindow::updateInterface()
{
+ input_thread_t* input = p_intf->p_sys->p_input;
+ if ( input )
+ {
+ if ( acquire_sem( p_mediaControl->fScrubSem ) == B_OK )
+ {
+ p_vlc_wrapper->setTimeAsFloat(p_mediaControl->GetSeekTo());
+ }
+ else if ( Lock() )
+ {
+ bool hasTitles = input->stream.i_area_nb > 1;
+ bool hasChapters = input->stream.p_selected_area->i_part_nb > 1;
+ p_mediaControl->SetStatus( input->stream.control.i_status,
+ input->stream.control.i_rate );
+ p_mediaControl->SetProgress( input->stream.p_selected_area->i_tell,
+ input->stream.p_selected_area->i_size );
+ _SetMenusEnabled( true, hasChapters, hasTitles );
+
+ _UpdateSpeedMenu( input->stream.control.i_rate );
+
+ // enable/disable skip buttons
+ bool canSkipPrev;
+ bool canSkipNext;
+ p_vlc_wrapper->getNavCapabilities( &canSkipPrev, &canSkipNext );
+ p_mediaControl->SetSkippable( canSkipPrev, canSkipNext );
+
+ if ( p_vlc_wrapper->has_audio() )
+ {
+ p_mediaControl->SetAudioEnabled( true );
+ p_mediaControl->SetMuted( p_vlc_wrapper->is_muted() );
+ } else
+ p_mediaControl->SetAudioEnabled( false );
+
+ if ( input != fInputThread )
+ {
+ fInputThread = input;
+ _InputStreamChanged();
+ }
+
+ Unlock();
+ }
+ // update playlist as well
+ if ( fPlaylistWindow->Lock() )
+ {
+ fPlaylistWindow->UpdatePlaylist();
+ fPlaylistWindow->Unlock();
+ }
+ }
+ else
+ _SetMenusEnabled(false);
- if ( p_intf->p_sys->p_input != NULL )
+ playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if ( fPlaylistIsEmpty != ( p_playlist->i_size < 0) )
{
- if ( acquire_sem(p_mediaControl->fScrubSem) == B_OK )
- {
- p_vlc_wrapper->setTimeAsFloat(p_mediaControl->GetSeekTo());
- }
- else if( Lock() )
- {
- p_mediaControl->SetStatus(p_intf->p_sys->p_input->stream.control.i_status,
- p_intf->p_sys->p_input->stream.control.i_rate);
- p_mediaControl->SetProgress(p_intf->p_sys->p_input->stream.p_selected_area->i_tell,
- p_intf->p_sys->p_input->stream.p_selected_area->i_size);
- Unlock();
- }
- }
-
- playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ if ( Lock() )
+ {
+ fPlaylistIsEmpty = !fPlaylistIsEmpty;
+ p_mediaControl->SetEnabled( !fPlaylistIsEmpty );
+ Unlock();
+ }
+ }
+ if ( input != fInputThread )
+ fInputThread = input;
+
+ fLastUpdateTime = system_time();
+}
+
+/*****************************************************************************
+ * InterfaceWindow::IsStopped
+ *****************************************************************************/
+bool
+InterfaceWindow::IsStopped() const
+{
+ return (system_time() - fLastUpdateTime > INTERFACE_UPDATE_TIMEOUT);
+}
+
+/*****************************************************************************
+ * InterfaceWindow::_UpdatePlaylist
+ *****************************************************************************/
+void
+InterfaceWindow::_UpdatePlaylist()
+{
+ if ( fPlaylistWindow->Lock() )
+ {
+ fPlaylistWindow->UpdatePlaylist( true );
+ fPlaylistWindow->Unlock();
+ playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
+ fPlaylistIsEmpty = p_playlist->i_size < 1;
+ p_mediaControl->SetEnabled( !fPlaylistIsEmpty );
+ }
+}
- if ( b_empty_playlist != (p_playlist->i_size < 1) )
- {
- if (Lock())
- {
- b_empty_playlist = !b_empty_playlist;
- p_mediaControl->SetEnabled( !b_empty_playlist );
- Unlock();
- }
- }
+/*****************************************************************************
+ * InterfaceWindow::_SetMenusEnabled
+ *****************************************************************************/
+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();
+ }
}
/*****************************************************************************
- * InterfaceWindow::QuitRequested
+ * InterfaceWindow::_UpdateSpeedMenu
*****************************************************************************/
-bool InterfaceWindow::QuitRequested()
+void
+InterfaceWindow::_UpdateSpeedMenu( int rate )
{
- p_intf->p_vlc->b_die = VLC_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 );
+ }
+}
- return( true );
+/*****************************************************************************
+ * InterfaceWindow::_InputStreamChanged
+ *****************************************************************************/
+void
+InterfaceWindow::_InputStreamChanged()
+{
+//printf("InterfaceWindow::_InputStreamChanged()\n");
+ // TODO: move more stuff from updateInterface() here!
+ snooze( 400000 );
+ p_vlc_wrapper->set_volume( p_mediaControl->GetVolume() );
+}
+
+/*****************************************************************************
+ * InterfaceWindow::_LoadSettings
+ *****************************************************************************/
+status_t
+InterfaceWindow::_LoadSettings( BMessage* message, const char* fileName, const char* folder )
+{
+ status_t ret = B_BAD_VALUE;
+ if ( message )
+ {
+ BPath path;
+ if ( ( ret = find_directory( B_USER_SETTINGS_DIRECTORY, &path ) ) == B_OK )
+ {
+ // passing folder is optional
+ if ( folder )
+ ret = path.Append( folder );
+ if ( ret == B_OK && ( ret = path.Append( fileName ) ) == B_OK )
+ {
+ BFile file( path.Path(), B_READ_ONLY );
+ if ( ( ret = file.InitCheck() ) == B_OK )
+ {
+ ret = message->Unflatten( &file );
+ file.Unset();
+ }
+ }
+ }
+ }
+ return ret;
+}
+
+/*****************************************************************************
+ * InterfaceWindow::_SaveSettings
+ *****************************************************************************/
+status_t
+InterfaceWindow::_SaveSettings( BMessage* message, const char* fileName, const char* folder )
+{
+ status_t ret = B_BAD_VALUE;
+ if ( message )
+ {
+ BPath path;
+ if ( ( ret = find_directory( B_USER_SETTINGS_DIRECTORY, &path ) ) == B_OK )
+ {
+ // passing folder is optional
+ if ( folder && ( ret = path.Append( folder ) ) == B_OK )
+ ret = create_directory( path.Path(), 0777 );
+ if ( ret == B_OK && ( ret = path.Append( fileName ) ) == B_OK )
+ {
+ BFile file( path.Path(), B_WRITE_ONLY | B_CREATE_FILE | B_ERASE_FILE );
+ if ( ( ret = file.InitCheck() ) == B_OK )
+ {
+ ret = message->Flatten( &file );
+ file.Unset();
+ }
+ }
+ }
+ }
+ return ret;
+}
+
+/*****************************************************************************
+ * InterfaceWindow::_RestoreSettings
+ *****************************************************************************/
+bool
+make_sure_frame_is_on_screen( BRect& frame )
+{
+ BScreen screen( B_MAIN_SCREEN_ID );
+ if (frame.IsValid() && screen.IsValid()) {
+ if (!screen.Frame().Contains(frame)) {
+ // make sure frame fits in the screen
+ if (frame.Width() > screen.Frame().Width())
+ frame.right -= frame.Width() - screen.Frame().Width() + 10.0;
+ if (frame.Height() > screen.Frame().Height())
+ frame.bottom -= frame.Height() - screen.Frame().Height() + 30.0;
+ // frame is now at the most the size of the screen
+ if (frame.right > screen.Frame().right)
+ frame.OffsetBy(-(frame.right - screen.Frame().right), 0.0);
+ if (frame.bottom > screen.Frame().bottom)
+ frame.OffsetBy(0.0, -(frame.bottom - screen.Frame().bottom));
+ if (frame.left < screen.Frame().left)
+ frame.OffsetBy((screen.Frame().left - frame.left), 0.0);
+ if (frame.top < screen.Frame().top)
+ frame.OffsetBy(0.0, (screen.Frame().top - frame.top));
+ }
+ return true;
+ }
+ return false;
+}
+
+void
+make_sure_frame_is_within_limits( BRect& frame, float minWidth, float minHeight,
+ 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;
+}
+
+/*****************************************************************************
+ * InterfaceWindow::_RestoreSettings
+ *****************************************************************************/
+void
+InterfaceWindow::_RestoreSettings()
+{
+ if ( _LoadSettings( fSettings, "interface_settings", "VideoLAN Client" ) == B_OK )
+ {
+ BRect mainFrame;
+ if ( fSettings->FindRect( "main frame", &mainFrame ) == B_OK )
+ {
+ // sanity checks: make sure window is not too big/small
+ // and that it's not off-screen
+ float minWidth, maxWidth, minHeight, maxHeight;
+ GetSizeLimits( &minWidth, &maxWidth, &minHeight, &maxHeight );
+
+ make_sure_frame_is_within_limits( mainFrame,
+ minWidth, minHeight, maxWidth, maxHeight );
+ make_sure_frame_is_on_screen( mainFrame );
+
+
+ MoveTo( mainFrame.LeftTop() );
+ ResizeTo( mainFrame.Width(), mainFrame.Height() );
+ }
+ if ( fPlaylistWindow->Lock() )
+ {
+ BRect playlistFrame;
+ if (fSettings->FindRect( "playlist frame", &playlistFrame ) == B_OK )
+ {
+ // sanity checks: make sure window is not too big/small
+ // and that it's not off-screen
+ float minWidth, maxWidth, minHeight, maxHeight;
+ fPlaylistWindow->GetSizeLimits( &minWidth, &maxWidth, &minHeight, &maxHeight );
+
+ make_sure_frame_is_within_limits( playlistFrame,
+ minWidth, minHeight, maxWidth, maxHeight );
+ make_sure_frame_is_on_screen( playlistFrame );
+
+ fPlaylistWindow->MoveTo( playlistFrame.LeftTop() );
+ fPlaylistWindow->ResizeTo( playlistFrame.Width(), playlistFrame.Height() );
+ }
+
+ bool showing;
+ if ( fSettings->FindBool( "playlist showing", &showing ) == B_OK )
+ {
+ if ( showing )
+ {
+ if ( fPlaylistWindow->IsHidden() )
+ fPlaylistWindow->Show();
+ }
+ else
+ {
+ if ( !fPlaylistWindow->IsHidden() )
+ fPlaylistWindow->Hide();
+ }
+ }
+
+ fPlaylistWindow->Unlock();
+ }
+ }
+}
+
+/*****************************************************************************
+ * InterfaceWindow::_StoreSettings
+ *****************************************************************************/
+void
+InterfaceWindow::_StoreSettings()
+{
+ if ( fSettings->ReplaceRect( "main frame", Frame() ) != B_OK )
+ fSettings->AddRect( "main frame", Frame() );
+ if ( fPlaylistWindow->Lock() )
+ {
+ if (fSettings->ReplaceRect( "playlist frame", fPlaylistWindow->Frame() ) != B_OK)
+ fSettings->AddRect( "playlist frame", fPlaylistWindow->Frame() );
+ if (fSettings->ReplaceBool( "playlist showing", !fPlaylistWindow->IsHidden() ) != B_OK)
+ fSettings->AddBool( "playlist showing", !fPlaylistWindow->IsHidden() );
+ fPlaylistWindow->Unlock();
+ }
+ _SaveSettings( fSettings, "interface_settings", "VideoLAN Client" );
}
/*****************************************************************************
* CDMenu::CDMenu
*****************************************************************************/
CDMenu::CDMenu(const char *name)
- : BMenu(name)
+ : BMenu(name)
{
}
*****************************************************************************/
void CDMenu::AttachedToWindow(void)
{
- while (RemoveItem((long int)0) != NULL); // remove all items
- 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;
+ 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();
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);
+ 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,
- intf_thread_t *p_interface)
- :BMenu(name)
+ intf_thread_t *p_interface)
+ :BMenu(name)
{
- kind = menu_kind;
- p_intf = p_interface;
+ kind = menu_kind;
+ p_intf = p_interface;
}
/*****************************************************************************
/*****************************************************************************
* LanguageMenu::AttachedToWindow
*****************************************************************************/
-void LanguageMenu::AttachedToWindow(void)
+void LanguageMenu::AttachedToWindow()
{
- while( RemoveItem((long int)0) != NULL )
- {
- ; // remove all items
- }
-
- SetRadioMode(true);
- GetChannels();
- BMenu::AttachedToWindow();
+ // remove all items
+ while ( BMenuItem* item = RemoveItem( 0L ) )
+ delete item;
+
+ SetRadioMode( true );
+ _GetChannels();
+ BMenu::AttachedToWindow();
}
/*****************************************************************************
- * LanguageMenu::GetChannels
+ * LanguageMenu::_GetChannels
*****************************************************************************/
-int LanguageMenu::GetChannels()
+void LanguageMenu::_GetChannels()
{
- char *psz_name;
- bool b_active;
- BMessage *msg;
- int i;
- es_descriptor_t *p_es = NULL;
-
- /* Insert the null */
- if( kind == SPU_ES ) //audio
- {
- msg = new BMessage(SELECT_SUBTITLE);
- msg->AddInt32("subtitle", -1);
- BMenuItem *menu_item;
- menu_item = new BMenuItem("None", msg);
- AddItem(menu_item);
- menu_item->SetMarked(TRUE);
-
- }
-
- if( p_intf->p_sys->p_input == NULL )
- {
- return 1;
- }
-
-
- vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
- for( i = 0; i < p_intf->p_sys->p_input->stream.i_selected_es_number; i++ )
- {
- if( kind == p_intf->p_sys->p_input->stream.pp_selected_es[i]->i_cat )
- {
- p_es = p_intf->p_sys->p_input->stream.pp_selected_es[i];
- }
- }
-
- for( i = 0; i < p_intf->p_sys->p_input->stream.i_es_number; i++ )
- {
- if( kind == p_intf->p_sys->p_input->stream.pp_es[i]->i_cat )
- {
- psz_name = p_intf->p_sys->p_input->stream.pp_es[i]->psz_desc;
- if( kind == AUDIO_ES ) //audio
- {
- msg = new BMessage(SELECT_AUDIO);
- msg->AddInt32("audio", i);
- }
- else
- {
- msg = new BMessage(SELECT_SUBTITLE);
- msg->AddInt32("subtitle", i);
- }
- BMenuItem *menu_item;
- menu_item = new BMenuItem(psz_name, msg);
- AddItem(menu_item);
- b_active = (p_es == p_intf->p_sys->p_input->stream.pp_es[i]);
- menu_item->SetMarked(b_active);
- }
- }
- vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
+ char *psz_name;
+ bool b_active;
+ BMessage *msg;
+ BMenuItem *menu_item;
+ int i;
+ es_descriptor_t *p_es = NULL;
+
+ // Insert the "None" item if in subtitle mode
+ if( kind != AUDIO_ES ) //subtitle
+ {
+ msg = new BMessage( SELECT_SUBTITLE );
+ msg->AddInt32( "subtitle", -1 );
+ menu_item = new BMenuItem( "None", msg );
+ AddItem( menu_item );
+ menu_item->SetMarked( true );
+ }
+ input_thread_t* input = p_intf->p_sys->p_input;
+ if ( input )
+ {
+ vlc_mutex_lock( &input->stream.stream_lock );
+ for( i = 0; i < input->stream.i_selected_es_number; i++ )
+ {
+ if( kind == input->stream.pp_selected_es[i]->i_cat )
+ p_es = input->stream.pp_selected_es[i];
+ }
+
+ int32 addedItems = 0;
+ bool emptyItemAdded = false;
+ uint32 what = kind == AUDIO_ES ? SELECT_CHANNEL : SELECT_SUBTITLE;
+ const char* fieldName = kind == AUDIO_ES ? "channel" : "subtitle";
+
+ for ( i = 0; i < input->stream.i_es_number; i++ )
+ {
+ if ( kind == input->stream.pp_es[i]->i_cat )
+ {
+ bool addItem = true;
+ psz_name = input->stream.pp_es[i]->psz_desc;
+ // workarround for irritating empty strings
+ if ( strcmp(psz_name, "") == 0 )
+ {
+// if ( kind != AUDIO_ES ) // don't add empty subtitle items, they don't work anyways
+// addItem = false;
+// else
+// {
+ if (!emptyItemAdded)
+ {
+ psz_name = "<default>";
+ emptyItemAdded = true;
+ }
+ else
+ psz_name = "<unkown>";
+// }
+ }
+ if ( addItem )
+ {
+ addedItems++;
+ msg = new BMessage( what );
+ msg->AddInt32( fieldName, i );
+ menu_item = new BMenuItem( psz_name, msg );
+ AddItem( menu_item );
+ b_active = ( p_es == input->stream.pp_es[i] );
+ menu_item->SetMarked( b_active );
+ }
+ }
+ }
+ vlc_mutex_unlock( &input->stream.stream_lock );
+
+ // enhance readability and separate first item from rest
+ if ( ( emptyItemAdded || kind != AUDIO_ES ) && addedItems > 1 )
+ AddItem( new BSeparatorItem(), 1 );
+ }
}
+/*****************************************************************************
+ * TitleMenu::TitleMenu
+ *****************************************************************************/
+TitleMenu::TitleMenu( const char *name, intf_thread_t *p_interface )
+ : BMenu(name),
+ p_intf( p_interface )
+{
+}
+
+/*****************************************************************************
+ * TitleMenu::~TitleMenu
+ *****************************************************************************/
+TitleMenu::~TitleMenu()
+{
+}
+
+/*****************************************************************************
+ * TitleMenu::AttachedToWindow
+ *****************************************************************************/
+void TitleMenu::AttachedToWindow()
+{
+ // make title menu empty
+ while ( BMenuItem* item = RemoveItem( 0L ) )
+ delete item;
+
+ input_thread_t* input = p_intf->p_sys->p_input;
+ if ( input )
+ {
+ // lock stream access
+ vlc_mutex_lock( &input->stream.stream_lock );
+ // populate menu according to current stream
+ int32 numTitles = input->stream.i_area_nb;
+ if ( numTitles > 1 )
+ {
+ // disallow title 0!
+ for ( int32 i = 1; i < numTitles; i++ )
+ {
+ BMessage* message = new BMessage( TOGGLE_TITLE );
+ message->AddInt32( "index", i );
+ BString helper( "" );
+ helper << i;
+ BMenuItem* item = new BMenuItem( helper.String(), message );
+ item->SetMarked( input->stream.p_selected_area->i_id == i );
+ AddItem( item );
+ }
+ }
+ // done messing with stream
+ vlc_mutex_unlock( &input->stream.stream_lock );
+ }
+ BMenu::AttachedToWindow();
+}
+
+
+/*****************************************************************************
+ * ChapterMenu::ChapterMenu
+ *****************************************************************************/
+ChapterMenu::ChapterMenu( const char *name, intf_thread_t *p_interface )
+ : BMenu(name),
+ p_intf( p_interface )
+{
+}
+
+/*****************************************************************************
+ * ChapterMenu::~ChapterMenu
+ *****************************************************************************/
+ChapterMenu::~ChapterMenu()
+{
+}
+
+/*****************************************************************************
+ * ChapterMenu::AttachedToWindow
+ *****************************************************************************/
+void ChapterMenu::AttachedToWindow()
+{
+ // make title menu empty
+ while ( BMenuItem* item = RemoveItem( 0L ) )
+ delete item;
+
+ input_thread_t* input = p_intf->p_sys->p_input;
+ if ( input )
+ {
+ // lock stream access
+ vlc_mutex_lock( &input->stream.stream_lock );
+ // populate menu according to current stream
+ int32 numChapters = input->stream.p_selected_area->i_part_nb;
+ if ( numChapters > 1 )
+ {
+ for ( int32 i = 0; i < numChapters; i++ )
+ {
+ BMessage* message = new BMessage( TOGGLE_CHAPTER );
+ message->AddInt32( "index", i );
+ BString helper( "" );
+ helper << i + 1;
+ BMenuItem* item = new BMenuItem( helper.String(), message );
+ item->SetMarked( input->stream.p_selected_area->i_part == i );
+ AddItem( item );
+ }
+ }
+ // done messing with stream
+ vlc_mutex_unlock( &input->stream.stream_lock );
+ }
+ BMenu::AttachedToWindow();
+}
+
projects / vlc / blobdiff