Fix input deadlocks in macosx gui

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

diff --git a/modules/gui/beos/MediaControlView.h b/modules/gui/beos/MediaControlView.h
index f324a35a4217ed4b5e6a3917da673113bcfed626..92b1d2a8f91221515186648ec09ef3acebc3eb88 100644 (file)
--- a/modules/gui/beos/MediaControlView.h
+++ b/modules/gui/beos/MediaControlView.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * MediaControlView.h: beos interface
  *****************************************************************************
- * Copyright (C) 1999, 2000, 2001 VideoLAN
+ * Copyright (C) 1999, 2000, 2001 the VideoLAN team
  * $Id$
  *
  * Authors: Tony Castley <tony@castley.net>
@@ -19,7 +19,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_MEDIA_CONTROL_VIEW_H
@@ -54,13 +54,10 @@ class MediaControlView : public BBox
                        void                            SetStatus(int status, int rate); 
                        void                            SetEnabled(bool enable);
                        void                            SetAudioEnabled(bool enable);
-                       uint32                          GetSeekTo() const;
                        uint32                          GetVolume() const;
                        void                            SetSkippable(bool backward,
                                                                                         bool forward);
                        void                            SetMuted(bool mute);
-
-                       sem_id                          fScrubSem;
     
  private:
                        void                            _LayoutControls(BRect frame) const;
@@ -94,11 +91,10 @@ class MediaControlView : public BBox
 class SeekSlider : public BControl
 {
  public:
-                                                               SeekSlider(BRect frame,
+                                                               SeekSlider(intf_thread_t * p_intf,
+                                                                          BRect frame,
                                                                                   const char* name,
-                                                                                  MediaControlView* owner,
-                                                                                  int32 minValue,
-                                                                                  int32 maxValue);
+                                                                                  MediaControlView* owner );
 
        virtual                                         ~SeekSlider();
 
@@ -121,14 +117,10 @@ private:
                                                                                         rgb_color top,
                                                                                         rgb_color right,
                                                                                         rgb_color bottom);
-                       void                            _BeginSeek();
-                       void                            _Seek();
-                       void                            _EndSeek();
 
+            intf_thread_t     * p_intf;
                        MediaControlView*       fOwner; 
                        bool                            fTracking;
-                       int32                           fMinValue;
-                       int32                           fMaxValue;
 };
 
 class VolumeSlider : public BControl