Commit 551de919 authored by Eric Petit's avatar Eric Petit

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

 * beos_specific.cpp : fixed the app signature
 * VlcWrapper.* : removed unused code
parent b8c2e88e
......@@ -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() );
......
......@@ -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
......
......@@ -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);
......
......@@ -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 )
......
......@@ -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 );
......
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment