* beos/* : fixed a bug in the progress bar with big files

 * beos_specific.cpp : fixed the app signature
 * VlcWrapper.* : removed unused code

diff --git a/modules/gui/beos/InterfaceWindow.cpp b/modules/gui/beos/InterfaceWindow.cpp
index 316cb7ad641287d334c9199a8375983963abbbd6..3d066b89f74988b6f1b1fa75f1765e50b264ac90 100644 (file)
--- 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.14 2003/01/11 19:33:09 stippi Exp $
+ * $Id: InterfaceWindow.cpp,v 1.15 2003/01/12 02:08:38 titer Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -487,8 +487,7 @@ void InterfaceWindow::updateInterface()
                        bool hasChapters = p_wrapper->HasChapters();
                        p_mediaControl->SetStatus( p_wrapper->InputStatus(), 
                                                                           p_wrapper->InputRate() );
-                       p_mediaControl->SetProgress( p_wrapper->InputTell(),
-                                                                                p_wrapper->InputSize() );
+                       p_mediaControl->SetProgress( p_wrapper->getTimeAsFloat() );
                        _SetMenusEnabled( true, hasChapters, hasTitles );
 
                        _UpdateSpeedMenu( p_wrapper->InputRate() );

diff --git a/modules/gui/beos/MediaControlView.cpp b/modules/gui/beos/MediaControlView.cpp
index d4c936f9baa64dac65ef9d17d29f3aeb6ee9ba72..eb11b331ecb6f75e4f136e774c7a9de738219e9c 100644 (file)
--- 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.9 2003/01/11 19:33:09 stippi Exp $
+ * $Id: MediaControlView.cpp,v 1.10 2003/01/12 02:08:38 titer Exp $
  *
  * Authors: Tony Castley <tony@castley.net>
  *          Stephan Aßmus <stippi@yellowbites.com>
@@ -282,9 +282,9 @@ MediaControlView::Pulse()
 
 // SetProgress
 void
-MediaControlView::SetProgress(uint64 seek, uint64 size)
+MediaControlView::SetProgress( float position )
 {
-       fSeekSlider->SetPosition((float)seek / (float)size);
+       fSeekSlider->SetPosition( position );
 }
 
 // SetStatus

diff --git a/modules/gui/beos/MediaControlView.h b/modules/gui/beos/MediaControlView.h
index 7bee538e238b23a6ca7005e9234d84e05c8a16a7..b30f55f93a34ba61c2ca8f45fdfef0ff8ac51a4d 100644 (file)
--- a/modules/gui/beos/MediaControlView.h
+++ b/modules/gui/beos/MediaControlView.h
@@ -2,7 +2,7 @@
  * MediaControlView.h: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: MediaControlView.h,v 1.3 2002/10/28 19:42:24 titer Exp $
+ * $Id: MediaControlView.h,v 1.4 2003/01/12 02:08:39 titer Exp $
  *
  * Authors: Tony Castley <tony@castley.net>
  *          Stephan Aßmus <stippi@yellowbites.com>
@@ -49,7 +49,7 @@ class MediaControlView : public BBox
        virtual void                            Pulse(); // detect stopped stream
 
                                                                // MediaControlView
-                       void                            SetProgress(uint64 seek, uint64 size);
+                       void                            SetProgress( float position );
 
                        void                            SetStatus(int status, int rate); 
                        void                            SetEnabled(bool enable);

diff --git a/modules/gui/beos/VlcWrapper.cpp b/modules/gui/beos/VlcWrapper.cpp
index f8d2bf3d3f2cb3b22e31fef691eb0114f75aed0e..71dd44dc1cdd453535293d76f142e6fd10f58a1f 100644 (file)
--- 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.16 2003/01/11 19:33:09 stippi Exp $
+ * $Id: VlcWrapper.cpp,v 1.17 2003/01/12 02:08:39 titer Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -129,26 +129,6 @@ int VlcWrapper::InputRate()
     return p_input->stream.control.i_rate;
 }
 
-/* tell: location in the current stream (in arbitrary units) */
-int VlcWrapper::InputTell()
-{
-    if( !p_input )
-    {
-        return -1;
-    }
-    return p_input->stream.p_selected_area->i_tell;
-}
-
-/* size: total size of the current stream (in arbitrary units) */
-int VlcWrapper::InputSize()
-{
-    if( !p_input )
-    {
-        return -1;
-    }
-    return p_input->stream.p_selected_area->i_size;
-}
-
 void VlcWrapper::InputSlower()
 {
     if( p_input != NULL )

diff --git a/modules/gui/beos/VlcWrapper.h b/modules/gui/beos/VlcWrapper.h
index 64c81b07b47a087449024dbc0af2e670c6d068a0..b58bfa8637d09e9a2a18dbe72371c4d049266895 100644 (file)
--- a/modules/gui/beos/VlcWrapper.h
+++ b/modules/gui/beos/VlcWrapper.h
@@ -2,7 +2,7 @@
  * VlcWrapper.h: BeOS plugin for vlc (derived from MacOS X port)
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: VlcWrapper.h,v 1.11 2003/01/08 02:09:15 titer Exp $
+ * $Id: VlcWrapper.h,v 1.12 2003/01/12 02:08:39 titer Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -65,8 +65,6 @@ public:
     bool HasInput();
     int InputStatus();
     int InputRate();
-    int InputTell();
-    int InputSize();
     void InputSlower();
     void InputFaster();
     BList * InputGetChannels( int i_cat );

diff --git a/src/misc/beos_specific.cpp b/src/misc/beos_specific.cpp
index dab984350afa3587017e9c9b499c517308f1794a..6e5b29d75df9ab583408d70e90d9dc1a5726d460 100644 (file)
--- a/src/misc/beos_specific.cpp
+++ b/src/misc/beos_specific.cpp
@@ -2,7 +2,7 @@
  * beos_init.cpp: Initialization for BeOS specific features 
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: beos_specific.cpp,v 1.27 2002/10/09 01:14:18 titer Exp $
+ * $Id: beos_specific.cpp,v 1.28 2003/01/12 02:08:39 titer Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *
@@ -123,7 +123,7 @@ char * system_GetProgramPath( void )
  *****************************************************************************/
 static void AppThread( vlc_object_t * p_this )
 {
-    VlcApplication *BeApp = new VlcApplication("application/x-vnd.Ink-vlc");
+    VlcApplication *BeApp = new VlcApplication("application/x-vnd.videolan-vlc");
     vlc_object_attach( p_this, p_this->p_vlc );
     BeApp->p_this = p_this;
     BeApp->Run();