Commit 2891094d authored by Eric Petit's avatar Eric Petit

* Fixed title / chapter menus

 * Clean up
parent d5fe9f34
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* InterfaceWindow.h: BeOS interface window class prototype * InterfaceWindow.h: BeOS interface window class prototype
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN * Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: InterfaceWindow.h,v 1.8 2003/01/14 14:48:55 titer Exp $ * $Id: InterfaceWindow.h,v 1.9 2003/01/22 01:13:22 titer Exp $
* *
* Authors: Jean-Marc Dressler <polux@via.ecp.fr> * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Tony Castley <tcastley@mail.powerup.com.au> * Tony Castley <tcastley@mail.powerup.com.au>
...@@ -114,14 +114,6 @@ class InterfaceWindow : public BWindow ...@@ -114,14 +114,6 @@ class InterfaceWindow : public BWindow
bool hasTitles = false ); bool hasTitles = false );
void _UpdateSpeedMenu( int rate ); void _UpdateSpeedMenu( int rate );
void _InputStreamChanged(); void _InputStreamChanged();
status_t _LoadSettings( BMessage* message,
const char* fileName,
const char* subFolder = NULL );
status_t _SaveSettings( BMessage* message,
const char* fileName,
const char* subFolder = NULL );
void _RestoreSettings();
void _StoreSettings();
intf_thread_t* p_intf; intf_thread_t* p_intf;
es_descriptor_t* p_spu_es; es_descriptor_t* p_spu_es;
...@@ -150,8 +142,6 @@ class InterfaceWindow : public BWindow ...@@ -150,8 +142,6 @@ class InterfaceWindow : public BWindow
BMenu* fSpeedMenu; BMenu* fSpeedMenu;
BMenu* fSettingsMenu; BMenu* fSettingsMenu;
bigtime_t fLastUpdateTime; bigtime_t fLastUpdateTime;
BMessage* fSettings; // we keep the message arround
// for forward compatibility
VlcWrapper * p_wrapper; VlcWrapper * p_wrapper;
}; };
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ListViews.h: BeOS interface list view class implementation * ListViews.h: BeOS interface list view class implementation
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN * Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: ListViews.cpp,v 1.1 2002/09/30 18:30:27 titer Exp $ * $Id: ListViews.cpp,v 1.2 2003/01/22 01:13:22 titer Exp $
* *
* Authors: Stephan Aßmus <stippi@yellowbites.com> * Authors: Stephan Aßmus <stippi@yellowbites.com>
* *
...@@ -475,7 +475,8 @@ DragSortableListView::DrawItem( BListItem *item, BRect itemFrame, bool complete ...@@ -475,7 +475,8 @@ DragSortableListView::DrawItem( BListItem *item, BRect itemFrame, bool complete
/***************************************************************************** /*****************************************************************************
* PlaylistView class * PlaylistView class
*****************************************************************************/ *****************************************************************************/
PlaylistView::PlaylistView( BRect frame, InterfaceWindow* mainWindow ) PlaylistView::PlaylistView( BRect frame, InterfaceWindow* mainWindow,
VlcWrapper * p_wrapper )
: DragSortableListView( frame, "playlist listview", : DragSortableListView( frame, "playlist listview",
B_MULTIPLE_SELECTION_LIST, B_FOLLOW_ALL_SIDES, B_MULTIPLE_SELECTION_LIST, B_FOLLOW_ALL_SIDES,
B_WILL_DRAW | B_NAVIGABLE | B_PULSE_NEEDED B_WILL_DRAW | B_NAVIGABLE | B_PULSE_NEEDED
...@@ -484,6 +485,7 @@ PlaylistView::PlaylistView( BRect frame, InterfaceWindow* mainWindow ) ...@@ -484,6 +485,7 @@ PlaylistView::PlaylistView( BRect frame, InterfaceWindow* mainWindow )
fPlaying( false ), fPlaying( false ),
fMainWindow( mainWindow ) fMainWindow( mainWindow )
{ {
this->p_wrapper = p_wrapper;
} }
PlaylistView::~PlaylistView() PlaylistView::~PlaylistView()
...@@ -516,7 +518,7 @@ PlaylistView::MouseDown( BPoint where ) ...@@ -516,7 +518,7 @@ PlaylistView::MouseDown( BPoint where )
{ {
if ( clicks == 2 ) if ( clicks == 2 )
{ {
/* Intf_VLCWrapper::playlistJumpTo( i ); */ p_wrapper->PlaylistJumpTo( i );
handled = true; handled = true;
} }
else if ( i == fCurrentIndex ) else if ( i == fCurrentIndex )
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ListViews.h: BeOS interface list view class prototype * ListViews.h: BeOS interface list view class prototype
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN * Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: ListViews.h,v 1.1 2002/09/30 18:30:27 titer Exp $ * $Id: ListViews.h,v 1.2 2003/01/22 01:13:22 titer Exp $
* *
* Authors: Stephan Aßmus <stippi@yellowbites.com> * Authors: Stephan Aßmus <stippi@yellowbites.com>
* *
...@@ -87,7 +87,8 @@ class PlaylistView : public DragSortableListView ...@@ -87,7 +87,8 @@ class PlaylistView : public DragSortableListView
{ {
public: public:
PlaylistView( BRect frame, PlaylistView( BRect frame,
InterfaceWindow* mainWindow ); InterfaceWindow* mainWindow,
VlcWrapper * p_wrapper );
~PlaylistView(); ~PlaylistView();
// BListView // BListView
...@@ -110,6 +111,8 @@ class PlaylistView : public DragSortableListView ...@@ -110,6 +111,8 @@ class PlaylistView : public DragSortableListView
int32 fCurrentIndex; int32 fCurrentIndex;
bool fPlaying; bool fPlaying;
InterfaceWindow* fMainWindow; InterfaceWindow* fMainWindow;
VlcWrapper * p_wrapper;
}; };
#endif // LIST_VIEWS_H #endif // LIST_VIEWS_H
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* MediaControlView.cpp: beos interface * MediaControlView.cpp: beos interface
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN * Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: MediaControlView.cpp,v 1.10 2003/01/12 02:08:38 titer Exp $ * $Id: MediaControlView.cpp,v 1.11 2003/01/22 01:13:22 titer Exp $
* *
* Authors: Tony Castley <tony@castley.net> * Authors: Tony Castley <tony@castley.net>
* Stephan Aßmus <stippi@yellowbites.com> * Stephan Aßmus <stippi@yellowbites.com>
...@@ -1311,13 +1311,13 @@ PositionInfoView::Pulse() ...@@ -1311,13 +1311,13 @@ PositionInfoView::Pulse()
if ( now - fLastPulseUpdate > 900000 ) if ( now - fLastPulseUpdate > 900000 )
{ {
int32 index, size; int32 index, size;
p_intf->p_sys->p_wrapper->getPlaylistInfo( index, size ); p_intf->p_sys->p_wrapper->GetPlaylistInfo( index, size );
SetFile( index, size ); SetFile( index, size );
p_intf->p_sys->p_wrapper->TitleInfo( index, size ); p_intf->p_sys->p_wrapper->TitleInfo( index, size );
SetTitle( index, size ); SetTitle( index, size );
p_intf->p_sys->p_wrapper->ChapterInfo( index, size ); p_intf->p_sys->p_wrapper->ChapterInfo( index, size );
SetChapter( index, size ); SetChapter( index, size );
SetTime( p_intf->p_sys->p_wrapper->getTimeAsString() ); SetTime( p_intf->p_sys->p_wrapper->GetTimeAsString() );
fLastPulseUpdate = now; fLastPulseUpdate = now;
} }
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* PlayListWindow.cpp: beos interface * PlayListWindow.cpp: beos interface
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN * Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: PlayListWindow.cpp,v 1.5 2002/12/09 07:57:04 titer Exp $ * $Id: PlayListWindow.cpp,v 1.6 2003/01/22 01:13:22 titer 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>
...@@ -130,7 +130,7 @@ editMenu->SetEnabled( false ); ...@@ -130,7 +130,7 @@ editMenu->SetEnabled( false );
frame.top += fMenuBar->Bounds().IntegerHeight() + 1; frame.top += fMenuBar->Bounds().IntegerHeight() + 1;
frame.right -= B_V_SCROLL_BAR_WIDTH; frame.right -= B_V_SCROLL_BAR_WIDTH;
fListView = new PlaylistView( frame, fMainWindow ); fListView = new PlaylistView( frame, fMainWindow, p_wrapper );
fBackgroundView = new BScrollView( "playlist scrollview", fBackgroundView = new BScrollView( "playlist scrollview",
fListView, B_FOLLOW_ALL_SIDES, fListView, B_FOLLOW_ALL_SIDES,
0, false, true, 0, false, true,
......
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* VlcWrapper.h: BeOS plugin for vlc (derived from MacOS X port) * VlcWrapper.h: BeOS plugin for vlc (derived from MacOS X port)
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: VlcWrapper.h,v 1.14 2003/01/17 18:19:43 titer Exp $ * $Id: VlcWrapper.h,v 1.15 2003/01/22 01:13:22 titer Exp $
* *
* Authors: Florian G. Pflug <fgp@phlo.org> * Authors: Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net> * Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -62,66 +62,66 @@ public: ...@@ -62,66 +62,66 @@ public:
bool UpdateInputAndAOut(); bool UpdateInputAndAOut();
/* input */ /* Input */
bool HasInput(); bool HasInput();
int InputStatus(); int InputStatus();
int InputRate(); int InputRate();
void InputSlower(); void InputSlower();
void InputFaster(); void InputFaster();
BList * InputGetChannels( int i_cat ); BList * GetChannels( int i_cat );
void openFiles( BList *o_files, bool replace = true );
void openDisc( BString o_type, BString o_device,
int i_title, int i_chapter );
void LoadSubFile( char * psz_file );
void ToggleLanguage( int i_language ); void ToggleLanguage( int i_language );
void ToggleSubtitle( int i_subtitle ); void ToggleSubtitle( int i_subtitle );
const char* getTimeAsString(); const char * GetTimeAsString();
float getTimeAsFloat(); float GetTimeAsFloat();
void setTimeAsFloat( float i_offset ); void SetTimeAsFloat( float i_offset );
bool IsPlaying(); bool IsPlaying();
/* Playlist */ /* Playlist */
void OpenFiles( BList *o_files, bool replace = true );
void OpenDisc( BString o_type, BString o_device,
int i_title, int i_chapter );
int PlaylistSize(); int PlaylistSize();
char *PlaylistItemName( int ); char * PlaylistItemName( int );
int PlaylistCurrent(); int PlaylistCurrent();
int PlaylistStatus();
bool PlaylistPlay(); bool PlaylistPlay();
void PlaylistPause(); void PlaylistPause();
void PlaylistStop(); void PlaylistStop();
void PlaylistNext(); void PlaylistNext();
void PlaylistPrev(); void PlaylistPrev();
void PlaylistSkip(int i);
void PlaylistGoto(int i);
void PlaylistLoop();
BList* PlaylistAsArray();
bool PlaylistPlaying(); bool PlaylistPlaying();
void getPlaylistInfo( int32& currentIndex, void GetPlaylistInfo( int32& currentIndex,
int32& maxIndex ); int32& maxIndex );
void PlaylistJumpTo( int ); void PlaylistJumpTo( int );
void getNavCapabilities( bool* canSkipPrev, void GetNavCapabilities( bool * canSkipPrev,
bool* canSkipNext ); bool * canSkipNext );
void navigatePrev(); void NavigatePrev();
void navigateNext(); void NavigateNext();
/* audio */ /* Audio */
bool HasAudio();
unsigned short GetVolume(); unsigned short GetVolume();
void SetVolume( int value ); void SetVolume( int value );
void VolumeMute(); void VolumeMute();
void VolumeRestore(); void VolumeRestore();
bool IsMuted(); bool IsMuted();
bool HasAudio();
/* DVD */ /* DVD */
bool HasTitles(); bool HasTitles();
BList * GetTitles();
void PrevTitle(); void PrevTitle();
void NextTitle(); void NextTitle();
void ToggleTitle( int i_title );
void TitleInfo( int32& currentIndex, int32& maxIndex );
bool HasChapters(); bool HasChapters();
BList * GetChapters();
void PrevChapter(); void PrevChapter();
void NextChapter(); void NextChapter();
void TitleInfo( int32& currentIndex, int32& maxIndex ); void ToggleChapter( int i_chapter );
void ChapterInfo( int32& currentIndex, int32& maxIndex ); void ChapterInfo( int32& currentIndex, int32& maxIndex );
void toggleTitle( int i_title );
void toggleChapter( int i_chapter ); /* Miscellanous */
void LoadSubFile( char * psz_file );
private: private:
intf_thread_t * p_intf; intf_thread_t * p_intf;
...@@ -129,4 +129,3 @@ private: ...@@ -129,4 +129,3 @@ private:
playlist_t * p_playlist; playlist_t * p_playlist;
aout_instance_t * p_aout; aout_instance_t * p_aout;
}; };
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