From 249ce1ea10e47c3d738beaa219b8c6c5ba567192 Mon Sep 17 00:00:00 2001
From: Stephan Assmus <stippi@videolan.org>
Date: Sat, 11 Jan 2003 19:33:09 +0000
Subject: [PATCH] fixed flickering of skip buttons (and consequently crashing
 if you pressed them)

---
 modules/gui/beos/InterfaceWindow.cpp  | 18 ++++++++----------
 modules/gui/beos/MediaControlView.cpp | 24 ++++++++++++++----------
 modules/gui/beos/VlcWrapper.cpp       |  5 +++--
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/modules/gui/beos/InterfaceWindow.cpp b/modules/gui/beos/InterfaceWindow.cpp
index 7ebc638d76..316cb7ad64 100644
--- a/modules/gui/beos/InterfaceWindow.cpp
+++ b/modules/gui/beos/InterfaceWindow.cpp
@@ -2,7 +2,7 @@
  * InterfaceWindow.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: InterfaceWindow.cpp,v 1.13 2003/01/08 02:09:15 titer Exp $
+ * $Id: InterfaceWindow.cpp,v 1.14 2003/01/11 19:33:09 stippi Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -178,7 +178,8 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name,
 	fMenuBar->AddItem( fSettingsMenu );							
 
 	// prepare fow showing
-	_SetMenusEnabled(false);
+	_SetMenusEnabled( false );
+	p_mediaControl->SetEnabled( false );
 
 	_RestoreSettings();
 
@@ -481,6 +482,7 @@ void InterfaceWindow::updateInterface()
 		}
 		else if ( Lock() )
 		{
+//			p_mediaControl->SetEnabled( true );
 			bool hasTitles = p_wrapper->HasTitles();
 			bool hasChapters = p_wrapper->HasChapters();
 			p_mediaControl->SetStatus( p_wrapper->InputStatus(), 
@@ -513,15 +515,11 @@ void InterfaceWindow::updateInterface()
 			fPlaylistWindow->Unlock();
 		}
 	}
-
     else
-    	_SetMenusEnabled(false);
-
-	if ( Lock() )
-	{
-		p_mediaControl->SetEnabled( p_wrapper->PlaylistSize() );
-		Unlock();
-	}
+    {
+    	_SetMenusEnabled( false );
+//		p_mediaControl->SetEnabled( false );
+    }
 
     /* always force the user-specified volume */
     /* FIXME : I'm quite sure there is a cleaner way to do this */
diff --git a/modules/gui/beos/MediaControlView.cpp b/modules/gui/beos/MediaControlView.cpp
index b6708d2bdc..d4c936f9ba 100644
--- a/modules/gui/beos/MediaControlView.cpp
+++ b/modules/gui/beos/MediaControlView.cpp
@@ -2,7 +2,7 @@
  * MediaControlView.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: MediaControlView.cpp,v 1.8 2002/11/27 05:36:41 titer Exp $
+ * $Id: MediaControlView.cpp,v 1.9 2003/01/11 19:33:09 stippi Exp $
  *
  * Authors: Tony Castley <tony@castley.net>
  *          Stephan Aßmus <stippi@yellowbites.com>
@@ -325,15 +325,19 @@ MediaControlView::SetStatus(int status, int rate)
 void
 MediaControlView::SetEnabled(bool enabled)
 {
-	fSkipBack->SetEnabled(enabled);
-	fPlayPause->SetEnabled(enabled);
-	fSkipForward->SetEnabled(enabled);
-	fStop->SetEnabled(enabled);
-	fMute->SetEnabled(enabled);
-	fVolumeSlider->SetEnabled(enabled);
-	fSeekSlider->SetEnabled(enabled);
-	fRewind->SetEnabled(enabled);
-	fForward->SetEnabled(enabled);
+	if ( LockLooper() )
+	{
+		fSkipBack->SetEnabled( enabled );
+		fPlayPause->SetEnabled( enabled );
+		fSkipForward->SetEnabled( enabled );
+		fStop->SetEnabled( enabled );
+		fMute->SetEnabled( enabled );
+		fVolumeSlider->SetEnabled( enabled );
+		fSeekSlider->SetEnabled( enabled );
+		fRewind->SetEnabled( enabled );
+		fForward->SetEnabled( enabled );
+		UnlockLooper();
+	}
 }
 
 // SetAudioEnabled
diff --git a/modules/gui/beos/VlcWrapper.cpp b/modules/gui/beos/VlcWrapper.cpp
index ff49421ce0..f8d2bf3d3f 100644
--- a/modules/gui/beos/VlcWrapper.cpp
+++ b/modules/gui/beos/VlcWrapper.cpp
@@ -2,7 +2,7 @@
  * VlcWrapper.cpp: BeOS plugin for vlc (derived from MacOS X port)
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: VlcWrapper.cpp,v 1.15 2003/01/08 02:09:15 titer Exp $
+ * $Id: VlcWrapper.cpp,v 1.16 2003/01/11 19:33:09 stippi Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -105,7 +105,8 @@ bool VlcWrapper::UpdateInputAndAOut()
 
 bool VlcWrapper::HasInput()
 {
-    return( p_input != NULL );
+    return ( p_input != NULL );
+//    return ( PlaylistSize() > 0 );
 }
 
 /* status (UNDEF_S, PLAYING_S, PAUSE_S, FORWARD_S, BACKWARD_S,
-- 
2.39.2