Removes trailing spaces. Removes tabs.

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

diff --git a/modules/gui/beos/InterfaceWindow.h b/modules/gui/beos/InterfaceWindow.h
index 1d3793a9b05f22d014a8a21138eafca0f29c4908..ce4219e995ff30797284a960b3887b0d8193fdae 100644 (file)
--- a/modules/gui/beos/InterfaceWindow.h
+++ b/modules/gui/beos/InterfaceWindow.h
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * InterfaceWindow.h: BeOS interface window class prototype
  *****************************************************************************
- * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: InterfaceWindow.h,v 1.12 2003/02/09 17:10:52 stippi Exp $
+ * Copyright (C) 1999, 2000, 2001 the VideoLAN team
+ * $Id$
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Tony Castley <tcastley@mail.powerup.com.au>
@@ -13,7 +13,7 @@
  * 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
@@ -21,7 +21,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef BEOS_INTERFACE_WINDOW_H
@@ -32,11 +32,12 @@
 
 class BMenuBar;
 class MediaControlView;
+#if 0
 class PlayListWindow;
+#endif
 class BFilePanel;
 class PreferencesWindow;
 class MessagesWindow;
-class VlcWrapper;
 
 class CDMenu : public BMenu
 {
@@ -53,16 +54,16 @@ class CDMenu : public BMenu
 class LanguageMenu : public BMenu
 {
  public:
-                            LanguageMenu( const char* name,
-                                          int menu_kind,
-                                          VlcWrapper *p_wrapper );
+                            LanguageMenu( intf_thread_t * p_intf,
+                                          const char * psz_name,
+                                          char * psz_variable );
     virtual                 ~LanguageMenu();
 
     virtual void            AttachedToWindow();
 
  private:
-    VlcWrapper *            p_wrapper;
-    int                     kind;
+    intf_thread_t         * p_intf;
+    char                  * psz_variable;
 };
 
 class TitleMenu : public BMenu
@@ -72,7 +73,7 @@ class TitleMenu : public BMenu
     virtual                 ~TitleMenu();
 
     virtual void            AttachedToWindow();
-    
+
     intf_thread_t  *p_intf;
 };
 
@@ -91,9 +92,9 @@ class ChapterMenu : public BMenu
 class InterfaceWindow : public BWindow
 {
  public:
-                            InterfaceWindow( BRect frame,
-                                             const char* name,
-                                             intf_thread_t* p_interface );
+                            InterfaceWindow( intf_thread_t * p_intf,
+                                             BRect frame,
+                                             const char * name );
     virtual                 ~InterfaceWindow();
 
                             // BWindow
@@ -103,40 +104,48 @@ class InterfaceWindow : public BWindow
 
                             // InterfaceWindow
             void            UpdateInterface();
+            void            UpdatePlaylist();
+
             bool            IsStopped() const;
-        
+ 
     MediaControlView*        p_mediaControl;
+    MessagesWindow*         fMessagesWindow;
 
- private:    
-            void            _UpdatePlaylist();
+ private:
             void            _SetMenusEnabled( bool hasFile,
                                               bool hasChapters = false,
                                               bool hasTitles = false );
             void            _UpdateSpeedMenu( int rate );
-            void            _InputStreamChanged();
-            void                       _ShowFilePanel( uint32 command,
-                                                                       const char* windowTitle );
-                       void                    _RestoreSettings();
-                       void                    _StoreSettings();
+            void            _ShowFilePanel( uint32 command,
+                                            const char* windowTitle );
+            void            _RestoreSettings();
+            void            _StoreSettings();
 
-    intf_thread_t*          p_intf;
-    es_descriptor_t*        p_spu_es;
+    intf_thread_t         * p_intf;
+    input_thread_t        * p_input;
+    playlist_t            * p_playlist;
+    es_descriptor_t       * p_spu_es;
+    bool                    b_playlist_update;
 
-    bool                    fPlaylistIsEmpty;
     BFilePanel*             fFilePanel;
+#if 0
     PlayListWindow*         fPlaylistWindow;
+#endif
     PreferencesWindow*      fPreferencesWindow;
-    MessagesWindow*         fMessagesWindow;
     BMenuBar*               fMenuBar;
-    BMenuItem*                         fGotoMenuMI;
+    BMenuItem*              fGotoMenuMI;
     BMenuItem*              fNextTitleMI;
     BMenuItem*              fPrevTitleMI;
     BMenuItem*              fNextChapterMI;
     BMenuItem*              fPrevChapterMI;
     BMenuItem*              fOnTopMI;
-    BMenuItem*              fSlowerMI;
+    BMenuItem*              fHeighthMI;
+    BMenuItem*              fQuarterMI;
+    BMenuItem*              fHalfMI;
     BMenuItem*              fNormalMI;
-    BMenuItem*              fFasterMI;
+    BMenuItem*              fTwiceMI;
+    BMenuItem*              fFourMI;
+    BMenuItem*              fHeightMI;
     BMenu*                  fAudioMenu;
     BMenu*                  fNavigationMenu;
     BMenu*                  fTitleMenu;
@@ -146,20 +155,19 @@ class InterfaceWindow : public BWindow
     BMenu*                  fSpeedMenu;
     BMenu*                  fShowMenu;
     bigtime_t               fLastUpdateTime;
-       BMessage*                               fSettings;      // we keep the message arround
-                                                                               // for forward compatibility
-    VlcWrapper*                                p_wrapper;
+    BMessage*               fSettings;  // we keep the message arround
+                                        // for forward compatibility
 };
 
 
 // some global support functions
 status_t load_settings( BMessage* message,
-                                               const char* fileName,
-                                               const char* folder = NULL );
+                        const char* fileName,
+                        const char* folder = NULL );
 
 status_t save_settings( BMessage* message,
-                                               const char* fileName,
-                                               const char* folder = NULL );
+                        const char* fileName,
+                        const char* folder = NULL );
 
 
 #endif    // BEOS_INTERFACE_WINDOW_H