From: Eric Petit <titer@videolan.org>
Date: Tue, 29 Oct 2002 17:33:11 +0000 (+0000)
Subject:  No more warnings.
X-Git-Tag: 0.5.0~795
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=79a4f01f1a3d2cec2cb830b3713269ff5cd393e8;p=vlc

 No more warnings.
---

diff --git a/modules/gui/beos/InterfaceWindow.cpp b/modules/gui/beos/InterfaceWindow.cpp
index d6df642a29..e3a8022ca9 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.5 2002/10/28 19:42:24 titer Exp $
+ * $Id: InterfaceWindow.cpp,v 1.6 2002/10/29 17:33:11 titer Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -479,10 +479,14 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
 			break;
 
 		case OPEN_PREFERENCES:
-			if (fPreferencesWindow->IsHidden())
-				fPreferencesWindow->Show();
-			else
-				fPreferencesWindow->Activate();
+		    if( fPreferencesWindow->Lock() )
+		    {
+			    if (fPreferencesWindow->IsHidden())
+				    fPreferencesWindow->Show();
+			    else
+				    fPreferencesWindow->Activate();
+				fPreferencesWindow->Unlock();
+			}
 			break;
 				
 		default:
diff --git a/modules/gui/beos/MediaControlView.cpp b/modules/gui/beos/MediaControlView.cpp
index db7f053cc6..452b5df0dd 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.5 2002/10/28 19:42:24 titer Exp $
+ * $Id: MediaControlView.cpp,v 1.6 2002/10/29 17:33:11 titer Exp $
  *
  * Authors: Tony Castley <tony@castley.net>
  *          Stephan Aßmus <stippi@yellowbites.com>
@@ -684,7 +684,7 @@ SeekSlider::Draw(BRect updateRect)
 		// stripes
 		float width = floorf(StringWidth(kDisabledSeekMessage));
 		float textPos = r.left + r.Width() / 2.0 - width / 2.0;
-		pattern stripes = { 0xc7, 0x8f, 0x1f, 0x3e, 0x7c, 0xf8, 0xf1, 0xe3 };
+		pattern stripes = {{ 0xc7, 0x8f, 0x1f, 0x3e, 0x7c, 0xf8, 0xf1, 0xe3 }};
 		BRect stripesRect(r);
 		stripesRect.right = textPos - 5.0;
 		FillRect(stripesRect, stripes);
diff --git a/modules/gui/beos/TransportButton.cpp b/modules/gui/beos/TransportButton.cpp
index 276f4bf344..3c70a8c7e5 100644
--- a/modules/gui/beos/TransportButton.cpp
+++ b/modules/gui/beos/TransportButton.cpp
@@ -2,7 +2,7 @@
  * TransportButton.cpp
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: TransportButton.cpp,v 1.2 2002/09/30 18:30:27 titer Exp $
+ * $Id: TransportButton.cpp,v 1.3 2002/10/29 17:33:11 titer Exp $
  *
  * Authors: Tony Castley <tcastley@mail.powerup.com.au>
  *          Stephan Aßmus <stippi@yellowbites.com>
@@ -308,7 +308,7 @@ TransportButton::MakeBitmap(uint32 mask)
 	uint8* src = (uint8*)BitsForMask(mask);
 
 	if (src && result && result->IsValid()) {
-		int32 width = r.IntegerWidth() + 1;
+		// int32 width = r.IntegerWidth() + 1;
 		int32 height = r.IntegerHeight() + 1;
 		int32 bpr = result->BytesPerRow();
 		uint8* dst = (uint8*)result->Bits();
diff --git a/modules/gui/beos/VideoOutput.cpp b/modules/gui/beos/VideoOutput.cpp
index e7b45dd92f..a95e152bc0 100644
--- a/modules/gui/beos/VideoOutput.cpp
+++ b/modules/gui/beos/VideoOutput.cpp
@@ -2,7 +2,7 @@
  * vout_beos.cpp: beos video output display method
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: VideoOutput.cpp,v 1.3 2002/10/28 16:55:05 titer Exp $
+ * $Id: VideoOutput.cpp,v 1.4 2002/10/29 17:33:11 titer Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -260,7 +260,7 @@ VideoWindow::MessageReceived( BMessage *p_message )
 				BBitmap* temp = new BBitmap( current->Bounds(), current->ColorSpace() );
 				if ( temp && temp->IsValid() )
 				{
-					int32 height = current->Bounds().Height();
+					int32 height = (int32)current->Bounds().Height();
 					uint8* dst = (uint8*)temp->Bits();
 					uint8* src = (uint8*)current->Bits();
 					int32 dstBpr = temp->BytesPerRow();
@@ -1109,7 +1109,7 @@ VLCView::Draw(BRect updateRect)
  *****************************************************************************/
 static int  Init       ( vout_thread_t * );
 static void End        ( vout_thread_t * );
-static int  Manage     ( vout_thread_t * );
+// static int  Manage     ( vout_thread_t * );
 static void Display    ( vout_thread_t *, picture_t * );
 
 static int  BeosOpenDisplay ( vout_thread_t *p_vout );
diff --git a/modules/gui/beos/VlcWrapper.cpp b/modules/gui/beos/VlcWrapper.cpp
index 6b29f7f448..e2abcbcb5b 100644
--- a/modules/gui/beos/VlcWrapper.cpp
+++ b/modules/gui/beos/VlcWrapper.cpp
@@ -2,7 +2,7 @@
  * intf_vlc_wrapper.h: BeOS plugin for vlc (derived from MacOS X port )
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: VlcWrapper.cpp,v 1.7 2002/10/28 19:42:24 titer Exp $
+ * $Id: VlcWrapper.cpp,v 1.8 2002/10/29 17:33:11 titer Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -887,4 +887,7 @@ void Intf_VLCWrapper::toggleSubtitle(int i_subtitle)
 
 
 void Intf_VLCWrapper::setupMenus(){}
-int  Intf_VLCWrapper::inputGetStatus() {}
+int  Intf_VLCWrapper::inputGetStatus()
+{
+    return 0;
+}