* intf_beos.cpp: beos interface
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: intf_beos.cpp,v 1.27 2001/05/01 04:18:17 sam Exp $
+ * $Id: intf_beos.cpp,v 1.28 2001/05/07 04:42:42 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/*****************************************************************************
* 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)
+
+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 )
{
file_panel = NULL;
p_intf = p_interface;
- BRect ButtonRect;
- float xStart = 5.0;
- float yStart = 20.0;
+ BRect ButtonRect;
+ float xStart = 5.0;
+ float yStart = 20.0;
SetName( "interface" );
SetTitle(VOUT_TITLE " (BeOS interface)");
BRect rect(0, 0, 0, 0);
-
- BMenuBar *menu_bar;
+
+ BMenuBar *menu_bar;
menu_bar = new BMenuBar(rect, "main menu");
AddChild( menu_bar );
- BMenu *mFile;
- BMenu *mAudio;
- CDMenu *cd_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("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'));
-
- 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) );
-
+ BMenu *mFile;
+ BMenu *mAudio;
+ CDMenu *cd_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( "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') );
+
+ 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 ) );
+
rect = Bounds();
- rect.top += menu_bar->Bounds().IntegerHeight()+1;
+ rect.top += menu_bar->Bounds().IntegerHeight() + 1;
BBox* p_view;
- p_view = new BBox( rect, NULL, B_FOLLOW_ALL, B_WILL_DRAW, B_PLAIN_BORDER );
- p_view->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-
- /* Buttons */
- /* Slow play */
- ButtonRect.SetLeftTop(BPoint(xStart, yStart));
- ButtonRect.SetRightBottom(ButtonRect.LeftTop() + kSkipButtonSize);
- xStart += kRewindBitmapWidth;
- TransportButton* p_slow = new TransportButton(ButtonRect, B_EMPTY_STRING,
- kSkipBackBitmapBits,
- kPressedSkipBackBitmapBits,
- kDisabledSkipBackBitmapBits,
- new BMessage(SLOWER_PLAY));
- p_view->AddChild( p_slow );
-
- /* Play Pause */
- ButtonRect.SetLeftTop(BPoint(xStart, yStart));
- ButtonRect.SetRightBottom(ButtonRect.LeftTop() + kPlayButtonSize);
- xStart += kPlayPauseBitmapWidth + 1.0;
- PlayPauseButton* p_play = new PlayPauseButton(ButtonRect, B_EMPTY_STRING,
- kPlayButtonBitmapBits,
- kPressedPlayButtonBitmapBits,
- kDisabledPlayButtonBitmapBits,
- kPlayingPlayButtonBitmapBits,
- kPressedPlayingPlayButtonBitmapBits,
- kPausedPlayButtonBitmapBits,
- kPressedPausedPlayButtonBitmapBits,
- new BMessage(START_PLAYBACK));
-
- p_view->AddChild( p_play );
- p_play->SetPlaying();
-
- /* Fast Foward */
- ButtonRect.SetLeftTop(BPoint(xStart, yStart));
- ButtonRect.SetRightBottom(ButtonRect.LeftTop() + kSkipButtonSize);
- xStart += kRewindBitmapWidth;
- TransportButton* p_fast = new TransportButton(ButtonRect, B_EMPTY_STRING,
- kSkipForwardBitmapBits,
- kPressedSkipForwardBitmapBits,
- kDisabledSkipForwardBitmapBits,
- new BMessage(FASTER_PLAY));
- p_view->AddChild( p_fast );
-
- /* Stop */
- ButtonRect.SetLeftTop(BPoint(xStart, yStart));
- ButtonRect.SetRightBottom(ButtonRect.LeftTop() + kStopButtonSize);
- xStart += kStopBitmapWidth;
- TransportButton* p_stop = new TransportButton(ButtonRect, B_EMPTY_STRING,
- kStopButtonBitmapBits,
- kPressedStopButtonBitmapBits,
- kDisabledStopButtonBitmapBits,
- new BMessage(STOP_PLAYBACK));
- p_view->AddChild( p_stop );
-
- ButtonRect.SetLeftTop(BPoint(xStart + 5, yStart + 6));
- ButtonRect.SetRightBottom(ButtonRect.LeftTop() + kSpeakerButtonSize);
- xStart += kSpeakerIconBitmapWidth;
-
- TransportButton* p_mute = new TransportButton(ButtonRect, B_EMPTY_STRING,
- kSpeakerIconBits,
- kPressedSpeakerIconBits,
- kSpeakerIconBits,
- new BMessage(VOLUME_MUTE));
-
- p_view->AddChild( p_mute );
-
- /* Seek Status */
+ p_view = new BBox( rect, NULL, B_FOLLOW_ALL, B_WILL_DRAW, B_PLAIN_BORDER );
+ p_view->SetViewColor( ui_color(B_PANEL_BACKGROUND_COLOR) );
+
+ /* Buttons */
+ /* Slow play */
+ ButtonRect.SetLeftTop(BPoint(xStart, yStart));
+ ButtonRect.SetRightBottom(ButtonRect.LeftTop() + kSkipButtonSize);
+ xStart += kRewindBitmapWidth;
+ TransportButton* p_slow = new TransportButton(ButtonRect, B_EMPTY_STRING,
+ kSkipBackBitmapBits,
+ kPressedSkipBackBitmapBits,
+ kDisabledSkipBackBitmapBits,
+ new BMessage(SLOWER_PLAY));
+ p_view->AddChild( p_slow );
+
+ /* Play Pause */
+ ButtonRect.SetLeftTop(BPoint(xStart, yStart));
+ ButtonRect.SetRightBottom(ButtonRect.LeftTop() + kPlayButtonSize);
+ xStart += kPlayPauseBitmapWidth + 1.0;
+ PlayPauseButton* p_play = new PlayPauseButton(ButtonRect, B_EMPTY_STRING,
+ kPlayButtonBitmapBits,
+ kPressedPlayButtonBitmapBits,
+ kDisabledPlayButtonBitmapBits,
+ kPlayingPlayButtonBitmapBits,
+ kPressedPlayingPlayButtonBitmapBits,
+ kPausedPlayButtonBitmapBits,
+ kPressedPausedPlayButtonBitmapBits,
+ new BMessage(START_PLAYBACK));
+
+ p_view->AddChild( p_play );
+ p_play->SetPlaying();
+
+ /* Fast Foward */
+ ButtonRect.SetLeftTop(BPoint(xStart, yStart));
+ ButtonRect.SetRightBottom(ButtonRect.LeftTop() + kSkipButtonSize);
+ xStart += kRewindBitmapWidth;
+ TransportButton* p_fast = new TransportButton(ButtonRect, B_EMPTY_STRING,
+ kSkipForwardBitmapBits,
+ kPressedSkipForwardBitmapBits,
+ kDisabledSkipForwardBitmapBits,
+ new BMessage(FASTER_PLAY));
+ p_view->AddChild( p_fast );
+
+ /* Stop */
+ ButtonRect.SetLeftTop(BPoint(xStart, yStart));
+ ButtonRect.SetRightBottom(ButtonRect.LeftTop() + kStopButtonSize);
+ xStart += kStopBitmapWidth;
+ TransportButton* p_stop = new TransportButton(ButtonRect, B_EMPTY_STRING,
+ kStopButtonBitmapBits,
+ kPressedStopButtonBitmapBits,
+ kDisabledStopButtonBitmapBits,
+ new BMessage(STOP_PLAYBACK));
+ p_view->AddChild( p_stop );
+
+ ButtonRect.SetLeftTop(BPoint(xStart + 5, yStart + 6));
+ ButtonRect.SetRightBottom(ButtonRect.LeftTop() + kSpeakerButtonSize);
+ xStart += kSpeakerIconBitmapWidth;
+
+ TransportButton* p_mute = new TransportButton(ButtonRect, B_EMPTY_STRING,
+ kSpeakerIconBits,
+ kPressedSpeakerIconBits,
+ kSpeakerIconBits,
+ new BMessage(VOLUME_MUTE));
+
+ p_view->AddChild( p_mute );
+
+ /* Seek Status */
rgb_color fill_color = {0,255,0};
- p_seek = new SeekSlider(BRect(5,2,255,15), this, 0, 100,
- B_TRIANGLE_THUMB);
- p_seek->SetValue(0);
- p_seek->UseFillColor(true, &fill_color);
+ p_seek = new SeekSlider(BRect(5,2,255,15), this, 0, 100,
+ B_TRIANGLE_THUMB);
+ p_seek->SetValue(0);
+ p_seek->UseFillColor(true, &fill_color);
p_view->AddChild( p_seek );
- /* Volume Slider */
- p_vol = new MediaSlider(BRect(xStart,20,255,30), new BMessage(VOLUME_CHG),
- 0, VOLUME_MAX);
- p_vol->SetValue(VOLUME_DEFAULT);
- p_vol->UseFillColor(true, &fill_color);
+ /* Volume Slider */
+ p_vol = new MediaSlider(BRect(xStart,20,255,30), new BMessage(VOLUME_CHG),
+ 0, VOLUME_MAX);
+ p_vol->SetValue(VOLUME_DEFAULT);
+ p_vol->UseFillColor(true, &fill_color);
p_view->AddChild( p_vol );
-
- /* Set size and Show */
+
+ /* Set size and Show */
AddChild( p_view );
- ResizeTo(260,50 + menu_bar->Bounds().IntegerHeight()+1);
+ ResizeTo(260,50 + menu_bar->Bounds().IntegerHeight()+1);
Show();
}
*****************************************************************************/
void InterfaceWindow::MessageReceived( BMessage * p_message )
{
- int vol_val = p_vol->Value(); // remember the current volume
- static int playback_status; // remember playback state
-
- BAlert *alert;
- Activate();
+ int vol_val = p_vol->Value(); // remember the current volume
+ static int playback_status; // remember playback state
+ int i_index;
+ BAlert *alert;
+
+ Activate();
+
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;
-
+// alert = new BAlert(VOUT_TITLE, "BeOS " VOUT_TITLE "\n\n<www.videolan.org>", "Ok");
+// alert->Go();
+// break;
+
case OPEN_FILE:
- if(file_panel)
- {
- file_panel->Show();
- break;
- }
- file_panel = new BFilePanel();
- file_panel->SetTarget(this);
- file_panel->Show();
- break;
+ if( file_panel )
+ {
+ file_panel->Show();
+ break;
+ }
+ file_panel = new BFilePanel();
+ file_panel->SetTarget( this );
+ file_panel->Show();
+ break;
case OPEN_DVD:
- const char **device;
- char device_method_and_name[B_FILE_NAME_LENGTH + 4];
- if(p_message->FindString("device", device) != B_ERROR)
- {
- sprintf(device_method_and_name, "dvd:%s", *device);
- intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, device_method_and_name );
- }
- break;
+ const char **ppsz_device;
+ char psz_method[ B_FILE_NAME_LENGTH + 4 ];
+
+ if( p_message->FindString("device", ppsz_device) != B_ERROR )
+ {
+ snprintf( psz_method, B_FILE_NAME_LENGTH + 4,
+ "dvd:%s", *ppsz_device );
+ psz_method[ B_FILE_NAME_LENGTH + 4 - 1 ] = '\0';
+
+ intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, psz_method );
+ }
+ break;
case STOP_PLAYBACK:
- // this currently stops playback not nicely
- if (p_intf->p_input != NULL )
- {
- // silence the sound, otherwise very horrible
- if (p_main->p_aout != NULL)
- {
- p_main->p_aout->i_vol = 0;
- }
- snooze(400000);
- input_SetStatus(p_intf->p_input, INPUT_STATUS_END);
- }
- break;
- case START_PLAYBACK:
- // starts playing in normal mode
-// if (p_intf->p_input != NULL )
-// {
-// if (p_main->p_aout != NULL)
-// {
-// p_main->p_aout->i_vol = vol_val;
-// }
-// snooze(400000);
-// input_SetStatus(p_intf->p_input, INPUT_STATUS_PLAY);
-// playback_status = PLAYING;
-// }
-// break;
- case PAUSE_PLAYBACK:
- // pause the playback
- if (p_intf->p_input != NULL )
- {
- // mute the volume if currently playing
- if (playback_status == PLAYING)
- {
- if (p_main->p_aout != NULL)
- {
- p_main->p_aout->i_vol = 0;
- }
- playback_status = PAUSED;
- }
- else
- // restore the volume
- {
- if (p_main->p_aout != NULL)
- {
- p_main->p_aout->i_vol = vol_val;
- }
- playback_status = PLAYING;
- }
- snooze(400000);
- input_SetStatus(p_intf->p_input, INPUT_STATUS_PAUSE);
- }
- break;
- case FASTER_PLAY:
- // cycle the fast playback modes
- if (p_intf->p_input != NULL )
- {
- if (p_main->p_aout != NULL)
- {
- p_main->p_aout->i_vol = 0;
- }
- snooze(400000);
- input_SetStatus(p_intf->p_input, INPUT_STATUS_FASTER);
- }
- break;
- case SLOWER_PLAY:
- // cycle the slow playback modes
- if (p_intf->p_input != NULL )
- {
- if (p_main->p_aout != NULL)
- {
- p_main->p_aout->i_vol = 0;
- }
- snooze(400000);
- input_SetStatus(p_intf->p_input, INPUT_STATUS_SLOWER);
- }
- break;
- case SEEK_PLAYBACK:
- // handled by semaphores;
- break;
- case VOLUME_CHG:
- // adjust the volume
- if (p_main->p_aout != NULL)
+ // this currently stops playback not nicely
+ if( p_intf->p_input != NULL )
+ {
+ // silence the sound, otherwise very horrible
+ vlc_mutex_lock( &p_aout_bank->lock );
+ for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
+ {
+ p_aout_bank->pp_aout[i_index]->i_savedvolume = p_aout_bank->pp_aout[i_index]->i_volume;
+ p_aout_bank->pp_aout[i_index]->i_volume = 0;
+ }
+ vlc_mutex_unlock( &p_aout_bank->lock );
+
+ snooze( 400000 );
+ input_SetStatus( p_intf->p_input, INPUT_STATUS_END );
+ }
+ break;
+
+ case START_PLAYBACK:
+ // starts playing in normal mode
+// if (p_intf->p_input != NULL )
+//
+// if (p_main->p_aout != NULL)
+// {
+// p_main->p_aout->i_vol = vol_val;
+// }
+// snooze(400000);
+// input_SetStatus(p_intf->p_input, INPUT_STATUS_PLAY);
+// playback_status = PLAYING;
+// }
+// break;
+
+ case PAUSE_PLAYBACK:
+ // pause the playback
+ if( p_intf->p_input != NULL )
+ {
+ // mute the volume if currently playing
+ if( playback_status == PLAYING )
+ {
+ vlc_mutex_lock( &p_aout_bank->lock );
+ for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
+ {
+ p_aout_bank->pp_aout[i_index]->i_savedvolume =
+ p_aout_bank->pp_aout[i_index]->i_volume;
+ p_aout_bank->pp_aout[i_index]->i_volume = 0;
+ }
+ vlc_mutex_unlock( &p_aout_bank->lock );
+ playback_status = PAUSED;
+ }
+ else
+ // restore the volume
+ {
+ vlc_mutex_lock( &p_aout_bank->lock );
+ for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
+ {
+ p_aout_bank->pp_aout[i_index]->i_volume =
+ p_aout_bank->pp_aout[i_index]->i_savedvolume;
+ p_aout_bank->pp_aout[i_index]->i_savedvolume = 0;
+ }
+ vlc_mutex_unlock( &p_aout_bank->lock );
+ playback_status = PLAYING;
+ }
+
+ snooze( 400000 );
+ input_SetStatus( p_intf->p_input, INPUT_STATUS_PAUSE );
+ }
+ break;
+
+ case FASTER_PLAY:
+ // cycle the fast playback modes
+ if( p_intf->p_input != NULL )
+ {
+ vlc_mutex_lock( &p_aout_bank->lock );
+ for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
+ {
+ p_aout_bank->pp_aout[i_index]->i_savedvolume =
+ p_aout_bank->pp_aout[i_index]->i_volume;
+ p_aout_bank->pp_aout[i_index]->i_volume = 0;
+ }
+ vlc_mutex_unlock( &p_aout_bank->lock );
+
+ snooze( 400000 );
+ input_SetStatus( p_intf->p_input, INPUT_STATUS_FASTER );
+ }
+ break;
+
+ case SLOWER_PLAY:
+ // cycle the slow playback modes
+ if (p_intf->p_input != NULL )
+ {
+ vlc_mutex_lock( &p_aout_bank->lock );
+ for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
+ {
+ p_aout_bank->pp_aout[i_index]->i_savedvolume =
+ p_aout_bank->pp_aout[i_index]->i_volume;
+ p_aout_bank->pp_aout[i_index]->i_volume = 0;
+ }
+ vlc_mutex_unlock( &p_aout_bank->lock );
+
+ snooze( 400000 );
+ input_SetStatus( p_intf->p_input, INPUT_STATUS_SLOWER );
+ }
+ break;
+
+ case SEEK_PLAYBACK:
+ // handled by semaphores;
+ break;
+
+ case VOLUME_CHG:
+ // adjust the volume
+ vlc_mutex_lock( &p_aout_bank->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:
+ // mute
+ vlc_mutex_lock( &p_aout_bank->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_volume =
+ p_aout_bank->pp_aout[i_index]->i_savedvolume;
+ p_aout_bank->pp_aout[i_index]->i_savedvolume = 0;
+ }
+ else
+ {
+ p_aout_bank->pp_aout[i_index]->i_savedvolume =
+ p_aout_bank->pp_aout[i_index]->i_volume;
+ p_aout_bank->pp_aout[i_index]->i_volume = 0;
+ }
+ }
+ vlc_mutex_unlock( &p_aout_bank->lock );
+ break;
+
+ case SELECT_CHANNEL:
+ {
+ int32 i = p_message->FindInt32( "channel" );
+ input_ChangeES( p_intf->p_input,
+ p_intf->p_input->stream.pp_es[i], 1 );
+ }
+ break;
+
+ case SELECT_SUBTITLE:
{
- p_main->p_aout->i_vol = vol_val;
- }
- break;
- case VOLUME_MUTE:
- // mute
- if (p_main->p_aout != NULL)
- {
- if (p_main->p_aout->i_vol == 0)
- {
- p_vol->SetEnabled(true);
- p_main->p_aout->i_vol = vol_val;
- }
- else
- {
- p_vol->SetEnabled(false);
- p_main->p_aout->i_vol = 0;
- }
- }
- break;
- case SELECT_CHANNEL:
- {
- int32 i = p_message->FindInt32("channel");
- input_ChangeES(p_intf->p_input,
- p_intf->p_input->stream.pp_es[i], 1);
- }
- break;
- case SELECT_SUBTITLE:
- {
- int32 i = p_message->FindInt32("subtitle");
- input_ChangeES(p_intf->p_input,
- p_intf->p_input->stream.pp_es[i], 2);
- }
- break;
- case B_REFS_RECEIVED:
+ int32 i = p_message->FindInt32( "subtitle" );
+ input_ChangeES( p_intf->p_input,
+ p_intf->p_input->stream.pp_es[i], 2 );
+ }
+ break;
+
+ case B_REFS_RECEIVED:
case B_SIMPLE_DATA:
{
entry_ref ref;
}
break;
+
default:
BWindow::MessageReceived( p_message );
break;
* 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();
+ while (RemoveItem((long int)0) != NULL); // remove all items
+ GetCD("/dev/disk");
+ BMenu::AttachedToWindow();
}
/*****************************************************************************
* CDMenu::GetCD
*****************************************************************************/
-int CDMenu::GetCD(const char *directory)
-{
- BDirectory dir;
- dir.SetTo(directory);
- if(dir.InitCheck() != B_NO_ERROR) {
- return B_ERROR;
- }
- dir.Rewind();
- BEntry entry;
- while(dir.GetNextEntry(&entry) >= 0) {
- BPath path;
- const char *name;
- entry_ref e;
-
- if(entry.GetPath(&path) != B_NO_ERROR)
- continue;
- name = path.Path();
-
-
- if(entry.GetRef(&e) != B_NO_ERROR)
- continue;
-
- if(entry.IsDirectory()) {
- if(strcmp(e.name, "floppy") == 0)
- continue; // ignore floppy (it is not silent)
- int devfd = GetCD(name);
- if(devfd >= 0)
- {
- return devfd;
- }
- }
- else {
- int devfd;
- device_geometry g;
- status_t m;
-
- if(strcmp(e.name, "raw") != 0)
- continue; // ignore partitions
-
- devfd = open(name, O_RDONLY);
- if(devfd < 0)
- continue;
-
- if(ioctl(devfd, B_GET_GEOMETRY, &g, sizeof(g)) >= 0) {
- if(g.device_type == B_CD) //ensure the drive is a CD-ROM
- {
- if(ioctl(devfd, B_GET_MEDIA_STATUS, &m, sizeof(m)) >= 0 )
- if(m == B_NO_ERROR) //ensure media is present
- {
- BMessage *msg;
- msg = new BMessage(OPEN_DVD);
- msg->AddString("device", name);
- BMenuItem *menu_item;
- menu_item = new BMenuItem(name, msg);
- AddItem(menu_item);
- continue;
- }
- }
- }
- close(devfd);
- }
- }
- return B_ERROR;
+int CDMenu::GetCD( const char *directory )
+{
+ int i_dev;
+ BDirectory dir;
+ dir.SetTo( directory );
+
+ if( dir.InitCheck() != B_NO_ERROR )
+ {
+ return B_ERROR;
+ }
+
+ dir.Rewind();
+ BEntry entry;
+
+ while( dir.GetNextEntry(&entry) >= 0 )
+ {
+ const char *name;
+ entry_ref e;
+ BPath path;
+
+ if( entry.GetPath(&path) != B_NO_ERROR )
+ {
+ continue;
+ }
+
+ name = path.Path();
+
+ if( entry.GetRef(&e) != B_NO_ERROR )
+ {
+ continue;
+ }
+
+ if( entry.IsDirectory() )
+ {
+ if( strcmp(e.name, "floppy") == 0 )
+ {
+ continue; // ignore floppy (it is not silent)
+ }
+
+ i_dev = GetCD( name );
+
+ if( i_dev >= 0 )
+ {
+ return i_dev;
+ }
+ }
+ else
+ {
+ device_geometry g;
+ status_t m;
+
+ if( strcmp(e.name, "raw") != 0 )
+ {
+ continue; // ignore partitions
+ }
+
+ i_dev = open( name, O_RDONLY );
+
+ if( i_dev < 0 )
+ {
+ continue;
+ }
+
+ if( ioctl(i_dev, B_GET_GEOMETRY, &g, sizeof(g)) >= 0 )
+ {
+ if( g.device_type == B_CD ) //ensure the drive is a CD-ROM
+ {
+ if( ioctl(i_dev, B_GET_MEDIA_STATUS, &m, sizeof(m)) >= 0 )
+ {
+ if( m == B_NO_ERROR ) //ensure media is present
+ {
+ BMessage *msg;
+ msg = new BMessage( OPEN_DVD );
+ msg->AddString( "device", name );
+ BMenuItem *menu_item;
+ menu_item = new BMenuItem( name, msg );
+ AddItem( menu_item );
+ continue;
+ }
+ }
+ }
+ }
+ close( i_dev );
+ }
+ }
+ return B_ERROR;
}
/*****************************************************************************
* LanguageMenu::LanguageMenu
*****************************************************************************/
LanguageMenu::LanguageMenu(const char *name, int menu_kind, intf_thread_t *p_interface)
- :BMenu(name)
+ :BMenu(name)
{
- kind = menu_kind;
- p_intf = p_interface;
+ kind = menu_kind;
+ p_intf = p_interface;
}
/*****************************************************************************
*****************************************************************************/
void LanguageMenu::AttachedToWindow(void)
{
- while (RemoveItem((long int)0) != NULL); // remove all items
- SetRadioMode(true);
- GetChannels();
- BMenu::AttachedToWindow();
+ while( RemoveItem((long int)0) != NULL )
+ {
+ ; // remove all items
+ }
+
+ SetRadioMode(true);
+ GetChannels();
+ BMenu::AttachedToWindow();
}
/*****************************************************************************
* LanguageMenu::GetChannels
*****************************************************************************/
int LanguageMenu::GetChannels()
-{
- char* psz_name;
- bool b_active;
- bool b_found;
- int32 i;
- es_descriptor_t *p_es;
-
- if (p_intf->p_input == NULL)
- return 1;
-
- for (i = 0; i < p_intf->p_input->stream.i_selected_es_number; i++)
- {
- if (kind ==
- p_intf->p_input->stream.pp_selected_es[i]->i_cat)
- {
- p_es = p_intf->p_input->stream.pp_selected_es[i];
- }
- }
- for (i = 0; i < p_intf->p_input->stream.i_es_number; i++)
- {
- if (kind == p_intf->p_input->stream.pp_es[i]->i_cat)
- {
- psz_name = p_intf->p_input->stream.pp_es[i]->psz_desc;
- BMessage *msg;
- if (kind == AUDIO_ES) //audio
- {
- msg = new BMessage(SELECT_CHANNEL);
- msg->AddInt32("channel", 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_input->stream.pp_es[i]);
- menu_item->SetMarked(b_active);
- }
- }
-}
+{
+ char *psz_name;
+ bool b_active;
+ bool b_found;
+ int i;
+ es_descriptor_t *p_es;
+ if( p_intf->p_input == NULL )
+ {
+ return 1;
+ }
+
+ for( i = 0; i < p_intf->p_input->stream.i_selected_es_number; i++ )
+ {
+ if( kind == p_intf->p_input->stream.pp_selected_es[i]->i_cat )
+ {
+ p_es = p_intf->p_input->stream.pp_selected_es[i];
+ }
+ }
+
+ for( i = 0; i < p_intf->p_input->stream.i_es_number; i++ )
+ {
+ if( kind == p_intf->p_input->stream.pp_es[i]->i_cat )
+ {
+ psz_name = p_intf->p_input->stream.pp_es[i]->psz_desc;
+ BMessage *msg;
+ if( kind == AUDIO_ES ) //audio
+ {
+ msg = new BMessage(SELECT_CHANNEL);
+ msg->AddInt32("channel", 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_input->stream.pp_es[i]);
+ menu_item->SetMarked(b_active);
+ }
+ }
+}
/*****************************************************************************
* MediaSlider
*****************************************************************************/
-MediaSlider::MediaSlider(BRect frame,
- BMessage *message,
- int32 minValue,
- int32 maxValue)
- :BSlider(frame, NULL, NULL, message, minValue, maxValue)
+MediaSlider::MediaSlider( BRect frame, BMessage *p_message,
+ int32 i_min, int32 i_max )
+ :BSlider(frame, NULL, NULL, p_message, i_min, i_max )
{
}
void MediaSlider::DrawThumb(void)
{
- BRect r;
- BView *v;
-
- rgb_color black = {0,0,0};
- r = ThumbFrame();
- v = OffscreenView();
- if(IsEnabled())
- v->SetHighColor(black);
- else
- v->SetHighColor(tint_color(black, B_LIGHTEN_2_TINT));
- r.InsetBy(r.IntegerWidth()/4, r.IntegerHeight()/(4 * r.IntegerWidth() / r.IntegerHeight()));
- v->StrokeEllipse(r);
- if(IsEnabled())
- v->SetHighColor(ui_color(B_PANEL_BACKGROUND_COLOR));
- else
- v->SetHighColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR), B_LIGHTEN_2_TINT));
- r.InsetBy(1,1);
- v->FillEllipse(r);
+ BRect r;
+ BView *v;
+
+ rgb_color black = {0,0,0};
+ r = ThumbFrame();
+ v = OffscreenView();
+
+ if(IsEnabled())
+ {
+ v->SetHighColor(black);
+ }
+ else
+ {
+ v->SetHighColor(tint_color(black, B_LIGHTEN_2_TINT));
+ }
+
+ r.InsetBy(r.IntegerWidth()/4, r.IntegerHeight()/(4 * r.IntegerWidth() / r.IntegerHeight()));
+ v->StrokeEllipse(r);
+
+ if(IsEnabled())
+ {
+ v->SetHighColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+ }
+ else
+ {
+ v->SetHighColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR), B_LIGHTEN_2_TINT));
+ }
+
+ r.InsetBy(1,1);
+ v->FillEllipse(r);
}
/*****************************************************************************
* SeekSlider
*****************************************************************************/
-SeekSlider::SeekSlider(BRect frame,
- InterfaceWindow *owner,
- int32 minValue,
- int32 maxValue,
- thumb_style thumbType = B_TRIANGLE_THUMB)
- :MediaSlider(frame, NULL, minValue, maxValue)
+SeekSlider::SeekSlider( BRect frame, InterfaceWindow *p_owner, int32 i_min,
+ int32 i_max, thumb_style thumbType = B_TRIANGLE_THUMB )
+ :MediaSlider( frame, NULL, i_min, i_max )
{
- fOwner = owner;
- fMouseDown = false;
+ fOwner = p_owner;
+ fMouseDown = false;
}
SeekSlider::~SeekSlider()
*****************************************************************************/
void SeekSlider::MouseDown(BPoint where)
{
- BSlider::MouseDown(where);
- fOwner->fScrubSem = create_sem(1, "Vlc::fScrubSem");
- fMouseDown = true;
+ BSlider::MouseDown(where);
+ fOwner->fScrubSem = create_sem(1, "Vlc::fScrubSem");
+ fMouseDown = true;
}
/*****************************************************************************
*****************************************************************************/
void SeekSlider::MouseMoved(BPoint where, uint32 code, const BMessage *message)
{
- BSlider::MouseMoved(where, code, message);
- if (!fMouseDown)
- return;
- release_sem(fOwner->fScrubSem);
+ BSlider::MouseMoved(where, code, message);
+ if (!fMouseDown)
+ return;
+ release_sem(fOwner->fScrubSem);
}
/*****************************************************************************
*****************************************************************************/
void SeekSlider::MouseUp(BPoint where)
{
- BSlider::MouseUp(where);
- delete_sem(fOwner->fScrubSem);
- fOwner->fScrubSem = B_ERROR;
- fMouseDown = false;
+ BSlider::MouseUp(where);
+ delete_sem(fOwner->fScrubSem);
+ fOwner->fScrubSem = B_ERROR;
+ fMouseDown = false;
}
-
+
extern "C"
{
rect.left += 50;
rect.right = rect.left + 350;
delete screen;
-
+
/* Allocate instance and initialize some members */
p_intf->p_sys = (intf_sys_t*) malloc( sizeof( intf_sys_t ) );
if( p_intf->p_sys == NULL )
return( 1 );
}
p_intf->p_sys->i_key = -1;
-
+
/* Create the interface window */
p_intf->p_sys->p_window =
new InterfaceWindow( rect,
intf_ErrMsg( "error: cannot allocate memory for InterfaceWindow" );
return( 1 );
}
-
+
return( 0 );
}
{
/* Destroy the interface window */
p_intf->p_sys->p_window->Lock();
- p_intf->p_sys->p_window->Quit();
+ p_intf->p_sys->p_window->Quit();
/* Destroy structure */
free( p_intf->p_sys );
*****************************************************************************/
static void intf_Run( intf_thread_t *p_intf )
{
-
- float progress;
- bool seekNeeded = false;
-
+ float progress;
+ bool seekNeeded = false;
+
while( !p_intf->b_die )
{
-
/* Manage core vlc functions through the callback */
p_intf->pf_manage( p_intf );
- /* Manage the slider */
- if( p_intf->p_input != NULL && p_intf->p_sys->p_window != NULL)
- {
- if (acquire_sem(p_intf->p_sys->p_window->fScrubSem) == B_OK)
- {
- seekNeeded = true;
- }
+ /* Manage the slider */
+ if( p_intf->p_input != NULL && p_intf->p_sys->p_window != NULL)
+ {
+ if( acquire_sem(p_intf->p_sys->p_window->fScrubSem) == B_OK )
+ {
+ seekNeeded = true;
+ }
- if (seekNeeded)
+ if( seekNeeded )
{
- uint32 seekTo = (p_intf->p_sys->p_window->p_seek->Value() *
- p_intf->p_input->stream.p_selected_area->i_size) / 100;
- input_Seek( p_intf->p_input, seekTo );
- seekNeeded = false;
+ uint32 seekTo = (p_intf->p_sys->p_window->p_seek->Value() *
+ p_intf->p_input->stream.p_selected_area->i_size) / 100;
+ input_Seek( p_intf->p_input, seekTo );
+ seekNeeded = false;
}
- else if (p_intf->p_sys->p_window->Lock())
+ else if( p_intf->p_sys->p_window->Lock() )
{
- progress = (100. * p_intf->p_input->stream.p_selected_area->i_tell) /
- p_intf->p_input->stream.p_selected_area->i_size;
- p_intf->p_sys->p_window->p_seek->SetValue(progress);
- p_intf->p_sys->p_window->Unlock();
- }
- }
+ progress = (100. * p_intf->p_input->stream.p_selected_area->i_tell) /
+ p_intf->p_input->stream.p_selected_area->i_size;
+ p_intf->p_sys->p_window->p_seek->SetValue(progress);
+ p_intf->p_sys->p_window->Unlock();
+ }
+ }
/* Wait a bit */
msleep( INTF_IDLE_SLEEP );
}
} /* extern "C" */
+
projects / vlc / commitdiff