Skip to content

V
vlc-1.1
Commit 19d2ac07 authored by Tony Castley's avatar Tony Castley
Browse files
Options

Interface changes to include menu for Title and chapter navigation. 

Also improved more "BeOS" CD detection.
Todo new graphics for the navigation controls.
parent 6601f361
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 87 deletions
plugins/beos/InterfaceWindow.cpp
View file @ 19d2ac07
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* InterfaceWindow.cpp: beos interface * InterfaceWindow.cpp: beos interface
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN * Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: InterfaceWindow.cpp,v 1.4 2001/10/21 06:05:30 tcastley Exp $ * $Id: InterfaceWindow.cpp,v 1.5 2001/10/29 11:07:09 tcastley Exp $
* *
* Authors: Jean-Marc Dressler <polux@via.ecp.fr> * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <malloc.h> #include <malloc.h>
#include <scsi.h> #include <scsi.h>
#include <scsiprobe_driver.h> #include <scsiprobe_driver.h>
#include <fs_info.h>
/* VLC headers */ /* VLC headers */
extern "C" extern "C"
...@@ -84,6 +85,7 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name, ...@@ -84,6 +85,7 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name,
BMenu *mFile; BMenu *mFile;
BMenu *mAudio; BMenu *mAudio;
CDMenu *cd_menu; CDMenu *cd_menu;
BMenu *mNavigation;
/* Add the file Menu */ /* Add the file Menu */
BMenuItem *mItem; BMenuItem *mItem;
...@@ -112,6 +114,19 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name, ...@@ -112,6 +114,19 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name,
mAudio->AddItem( new LanguageMenu( "Language", AUDIO_ES, p_intf ) ); mAudio->AddItem( new LanguageMenu( "Language", AUDIO_ES, p_intf ) );
mAudio->AddItem( new LanguageMenu( "Subtitles", SPU_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); ResizeTo(260,50 + menu_bar->Bounds().IntegerHeight()+1);
controlRect = Bounds(); controlRect = Bounds();
controlRect.top += menu_bar->Bounds().IntegerHeight() + 1; controlRect.top += menu_bar->Bounds().IntegerHeight() + 1;
...@@ -403,7 +418,65 @@ void InterfaceWindow::MessageReceived( BMessage * p_message ) ...@@ -403,7 +418,65 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
} }
} }
break; break;
case PREV_TITLE:
{
input_area_t * p_area;
int i_id;
i_id = p_intf->p_input->stream.p_selected_area->i_id - 1;
/* Disallow area 0 since it is used for video_ts.vob */
if( i_id < 0 )
{
p_area = p_intf->p_input->stream.pp_areas[i_id];
input_ChangeArea( p_intf->p_input, (input_area_t*)p_area );
input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
}
break;
}
case NEXT_TITLE:
{
input_area_t * p_area;
int i_id;
i_id = p_intf->p_input->stream.p_selected_area->i_id + 1;
if( i_id < p_intf->p_input->stream.i_area_nb )
{
p_area = p_intf->p_input->stream.pp_areas[i_id];
input_ChangeArea( p_intf->p_input, (input_area_t*)p_area );
input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
}
}
break;
case PREV_CHAPTER:
{
input_area_t * p_area;
p_area = p_intf->p_input->stream.p_selected_area;
if( p_area->i_part > 0 )
{
p_area->i_part--;
input_ChangeArea( p_intf->p_input, (input_area_t*)p_area );
input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
}
}
break;
case NEXT_CHAPTER:
{
input_area_t * p_area;
p_area = p_intf->p_input->stream.p_selected_area;
if( p_area->i_part > 0 )
{
p_area->i_part++;
input_ChangeArea( p_intf->p_input, (input_area_t*)p_area );
input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
}
}
break;
case B_REFS_RECEIVED: case B_REFS_RECEIVED:
case B_SIMPLE_DATA: case B_SIMPLE_DATA:
{ {
...@@ -504,90 +577,50 @@ void CDMenu::AttachedToWindow(void) ...@@ -504,90 +577,50 @@ void CDMenu::AttachedToWindow(void)
*****************************************************************************/ *****************************************************************************/
int CDMenu::GetCD( const char *directory ) int CDMenu::GetCD( const char *directory )
{ {
int i_dev; BVolumeRoster *volRoster;
BDirectory dir; BVolume *vol;
dir.SetTo( directory ); BDirectory *dir;
int status;
if( dir.InitCheck() != B_NO_ERROR ) int mounted;
{ char name[B_FILE_NAME_LENGTH];
return B_ERROR; fs_info info;
} dev_t dev;
dir.Rewind(); volRoster = new BVolumeRoster();
BEntry entry; vol = new BVolume();
dir = new BDirectory();
while( dir.GetNextEntry(&entry) >= 0 ) status = volRoster->GetNextVolume(vol);
{ status = vol->GetRootDirectory(dir);
const char *name; while (status == B_NO_ERROR)
entry_ref e; {
BPath path; mounted = vol->GetName(name);
if ((mounted == B_OK) && /* Disk is currently Mounted */
if( entry.GetPath(&path) != B_NO_ERROR ) (vol->IsReadOnly()) && /* Disk is a readonly medium */
{ (vol->IsPersistent()) ) /* not a volitile device */
continue; {
} dev = vol->Device();
fs_stat_dev(dev, &info);
name = path.Path(); BMessage *msg;
msg = new BMessage( OPEN_DVD );
if( entry.GetRef(&e) != B_NO_ERROR ) intf_Msg(name);
{ intf_Msg(info.device_name);
continue; msg->AddString( "device", info.device_name );
} BMenuItem *menu_item;
menu_item = new BMenuItem( name, msg );
if( entry.IsDirectory() ) AddItem( menu_item );
{ }
if( strcmp(e.name, "floppy") == 0 ) vol->Unset();
{ status = volRoster->GetNextVolume(vol);
continue; // ignore floppy (it is not silent) }
}
i_dev = GetCD( name ); /* The Old way.
int i_dev;
if( i_dev >= 0 ) device_geometry g;
{ status_t m;
return i_dev; if( ioctl(i_dev, B_GET_GEOMETRY, &g, sizeof(g)) >= 0 )
} if( g.device_type == B_CD ) //ensure the drive is a CD-ROM
} */
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;
} }
/***************************************************************************** /*****************************************************************************
......
plugins/beos/MsgVals.h
View file @ 19d2ac07
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* MsgVals.h * MsgVals.h
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: MsgVals.h,v 1.6 2001/06/15 09:07:10 tcastley Exp $ * $Id: MsgVals.h,v 1.7 2001/10/29 11:07:09 tcastley Exp $
* *
* Authors: Tony Castley <tcastley@mail.powerup.com.au> * Authors: Tony Castley <tcastley@mail.powerup.com.au>
* *
...@@ -38,4 +38,7 @@ const uint32 VOLUME_CHG = 'VOCH'; ...@@ -38,4 +38,7 @@ const uint32 VOLUME_CHG = 'VOCH';
const uint32 VOLUME_MUTE = 'MUTE'; const uint32 VOLUME_MUTE = 'MUTE';
const uint32 SELECT_CHANNEL = 'CHAN'; const uint32 SELECT_CHANNEL = 'CHAN';
const uint32 SELECT_SUBTITLE = 'SUBT'; const uint32 SELECT_SUBTITLE = 'SUBT';
const uint32 PREV_TITLE = 'PRTI';
const uint32 NEXT_TITLE = 'NXTI';
const uint32 PREV_CHAPTER = 'PRCH';
const uint32 NEXT_CHAPTER = 'NXCH';
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment