* AudioOutput.cpp: fixed a segfault

[vlc] / modules / gui / beos / VlcWrapper.h

diff --git a/modules/gui/beos/VlcWrapper.h b/modules/gui/beos/VlcWrapper.h
index cbd5933e587e21a539765c62d4cbd865f9b62366..16d0f26f8aa1c401f556ee308587448011d13151 100644 (file)
--- a/modules/gui/beos/VlcWrapper.h
+++ b/modules/gui/beos/VlcWrapper.h
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * intf_vlc_wrapper.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
- * $Id: VlcWrapper.h,v 1.7 2002/11/26 01:06:08 titer Exp $
+ * $Id: VlcWrapper.h,v 1.8 2002/11/27 05:36:41 titer Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -28,7 +28,7 @@
 #define SEEKSLIDER_RANGE 2048
 
 class InterfaceWindow;
-class Intf_VLCWrapper;
+class VlcWrapper;
 
 /*****************************************************************************
  * intf_sys_t: internal variables of the BeOS interface
@@ -37,7 +37,6 @@ struct intf_sys_t
 {
     InterfaceWindow * p_window;
     
-    /* DVD mode */
     vlc_bool_t        b_disabled_menus;
     vlc_bool_t        b_loop;
     vlc_bool_t        b_mute;
@@ -45,76 +44,65 @@ struct intf_sys_t
     int               i_saved_volume;
     int               i_channel;
     
-    Intf_VLCWrapper * p_wrapper;
+    VlcWrapper * p_wrapper;
 };
 
 /*****************************************************************************
- * Intf_VLCWrapper
+ * VlcWrapper
  *****************************************************************************
  * This class makes the link between the BeOS interface and the vlc core.
- * There is only one Intf_VLCWrapper instance at any time, which is stored
+ * There is only one VlcWrapper instance at any time, which is stored
  * in p_intf->p_sys->p_wrapper
  *****************************************************************************/
-class Intf_VLCWrapper
+class VlcWrapper
 {
 public:
-    Intf_VLCWrapper( intf_thread_t *p_intf );
-    ~Intf_VLCWrapper();
+    VlcWrapper( intf_thread_t *p_intf );
+    ~VlcWrapper();
     
     bool UpdateInputAndAOut();
     
-    int inputGetStatus();
+    /* input */
     int InputStatus();
     int InputRate();
     int InputTell();
     int InputSize();
-    void inputSeek();
-    
-    /* playlist control */
+    void InputSlower();
+    void InputFaster();
+    void openFiles( BList *o_files, bool replace = true );
+    void openDisc( BString o_type, BString o_device,
+                   int i_title, int i_chapter );
+    void toggleLanguage( int i_language );
+    void toggleSubtitle( int i_subtitle );
+    const char* getTimeAsString();
+    float getTimeAsFloat();
+    void setTimeAsFloat( float i_offset );
+
+        
+    /* Playlist */
     int PlaylistSize();
     char *PlaylistItemName( int );
     int PlaylistCurrent();
-    
-    bool playlistPlay();
-    void playlistPause();
-    void playlistStop();
-    void playlistNext();
-    void playlistPrev();
-    void playlistJumpTo( int );
-    int  playlistSize();
-    int  playlistCurrentPos();
-    void playlistLock();
-    void playlistUnlock();
-    void playlistSkip(int i);
-    void playlistGoto(int i);
-    void loop(); 
-
-    bool playlistPlaying();
-    BList* playlistAsArray();
-    void   getPlaylistInfo( int32& currentIndex,
+    int PlaylistStatus();
+    bool PlaylistPlay();
+    void PlaylistPause();
+    void PlaylistStop();
+    void PlaylistNext();
+    void PlaylistPrev();
+    void PlaylistSkip(int i);
+    void PlaylistGoto(int i);
+    void PlaylistLoop(); 
+    BList* PlaylistAsArray();
+    bool PlaylistPlaying();
+    void getPlaylistInfo( int32& currentIndex,
                             int32& maxIndex );
-    void   getTitleInfo( int32& currentIndex,
-                         int32& maxIndex );
-    void   getChapterInfo( int32& currentIndex,
-                           int32& maxIndex );
+    void PlaylistJumpTo( int );
     void getNavCapabilities( bool* canSkipPrev,
                              bool* canSkipNext );
        void navigatePrev();
        void navigateNext();
 
-    /* DVD */
-    bool HasTitles();
-    void PrevTitle();
-    void NextTitle();
-    bool HasChapters();
-    void PrevChapter();
-    void NextChapter();
-
-    /*  Stream Control */
-    void playSlower();
-    void playFaster();
-    
-    /* playback control */
+    /* audio */
     void volume_mute();
     void volume_restore();
     void set_volume(int value);
@@ -123,29 +111,19 @@ public:
     bool is_playing();
     void maxvolume();
     bool has_audio();
-    
-    /* playback info */
-    const char* getTimeAsString();
-    float  getTimeAsFloat();
-    void   setTimeAsFloat( float i_offset );
 
-    /* open file/disc/network */
-    void openFiles( BList *o_files, bool replace = true );
-    void openDisc( BString o_type, BString o_device,
-                   int i_title, int i_chapter );
-    void openNet( BString o_addr, int i_port );
-    void openNetChannel( BString o_addr, int i_port );
-    void openNetHTTP( BString o_addr );
-
-    /* menus management */
-    void toggleProgram( int i_program );
+    /* DVD */
+    bool HasTitles();
+    void PrevTitle();
+    void NextTitle();
+    bool HasChapters();
+    void PrevChapter();
+    void NextChapter();
+    void TitleInfo( int32& currentIndex, int32& maxIndex );
+    void ChapterInfo( int32& currentIndex, int32& maxIndex );
     void toggleTitle( int i_title );
     void toggleChapter( int i_chapter );
-    void toggleLanguage( int i_language );
-    void toggleSubtitle( int i_subtitle );
-    void channelNext();
-    void channelPrev();
-
+    
 private:
     intf_thread_t * p_intf;
     input_thread_t * p_input;