]> git.sesse.net Git - vlc/blobdiff - plugins/beos/intf_beos.cpp
* updated INSTALL.win32
[vlc] / plugins / beos / intf_beos.cpp
index 3276aca42cb22fb3133a23cf41a589dec93aa137..b1d0ca78a3a380db46e8629b0ad5237b15ddd004 100644 (file)
@@ -2,7 +2,7 @@
  * intf_beos.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: intf_beos.cpp,v 1.22 2001/03/25 17:09:14 richards Exp $
+ * $Id: intf_beos.cpp,v 1.38 2002/02/15 13:32:52 sam Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -13,7 +13,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#define MODULE_NAME beos
-#include "modules_inner.h"
-
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include "defs.h"
-
 #include <stdio.h>
 #include <stdlib.h>                                      /* malloc(), free() */
-
-#include <kernel/OS.h>
-#include <storage/Path.h>
-#include <Alert.h>
-#include <View.h>
-#include <CheckBox.h>
-#include <Button.h>
-#include <Slider.h>
-#include <StatusBar.h>
-#include <Application.h>
-#include <Message.h>
-#include <NodeInfo.h>
-#include <Locker.h>
-#include <DirectWindow.h>
-#include <Box.h>
-#include <Alert.h>
-#include <MenuBar.h>
-#include <MenuItem.h>
-#include <FilePanel.h>
-#include <Screen.h>
-#include <malloc.h>
+#include <InterfaceKit.h>
 #include <string.h>
-#include <Directory.h>
-#include <Entry.h>
-#include <Path.h>
-#include <StorageDefs.h>
-#include <scsi.h>
-#include <scsiprobe_driver.h>
 
 extern "C"
 {
-#include "config.h"
-#include "common.h"
-#include "threads.h"
-#include "mtime.h"
-#include "tests.h"
-#include "modules.h"
+#include <videolan/vlc.h>
 
 #include "stream_control.h"
-#include "input_ext-intf.h"
 
 #include "interface.h"
-#include "intf_playlist.h"
-#include "intf_msg.h"
-#include "audio_output.h"
-#include "MsgVals.h"
-
-#include "main.h"
+#include "input_ext-intf.h"
 }
 
 #include "InterfaceWindow.h"
-#include "Bitmaps.h"
-#include "TransportButton.h"
 
 /*****************************************************************************
  * intf_sys_t: description and status of FB interface
@@ -97,594 +53,6 @@ typedef struct intf_sys_s
     char              i_key;
 } intf_sys_t;
 
-/*****************************************************************************
- * InterfaceWindow
- *****************************************************************************/
-InterfaceWindow::InterfaceWindow( BRect frame, const char *name , intf_thread_t  *p_interface )
-    : BWindow(frame, name, B_FLOATING_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
-       B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_WILL_ACCEPT_FIRST_CLICK |B_ASYNCHRONOUS_CONTROLS)
-{
-    file_panel = NULL;
-    p_intf = p_interface;
-       BRect ButtonRect;
-       float xStart = 5.0;
-       float yStart = 20.0;
-
-    SetName( "interface" );
-    SetTitle(VOUT_TITLE " (BeOS interface)");
-    BRect rect(0, 0, 0, 0);
-    
-    BMenuBar *menu_bar; 
-    menu_bar = new BMenuBar(rect, "main menu");
-    AddChild( menu_bar );
-
-       BMenu *m; 
-       BMenu *am;
-       CDMenu *cd_menu;
-
-       menu_bar->AddItem( m = new BMenu("File") );
-       menu_bar->ResizeToPreferred();
-       m->AddItem( new BMenuItem("Open File...", new BMessage(OPEN_FILE), 'O'));
-       cd_menu = new CDMenu("Open Disc");
-       m->AddItem(cd_menu);
-       m->AddSeparatorItem();
-       m->AddItem( new BMenuItem("About...", new BMessage(B_ABOUT_REQUESTED), 'A'));
-       m->AddItem( new BMenuItem("Quit", new BMessage(B_QUIT_REQUESTED), 'Q'));
-
-       menu_bar->AddItem (am = new BMenu("Audio") );
-       menu_bar->ResizeToPreferred();
-       am->AddItem( new LanguageMenu("Language", 0, p_intf) );
-       am->AddItem( new LanguageMenu("Subtitles", 1, p_intf) );
-       
-
-    rect = Bounds();
-    rect.top += menu_bar->Bounds().IntegerHeight()+1;
-
-    BBox* p_view;
-       p_view = new BBox( rect, NULL, B_FOLLOW_ALL, B_WILL_DRAW, B_PLAIN_BORDER );
-       p_view->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-    
-       /* Buttons */
-       /* Slow play */
-       ButtonRect.SetLeftTop(BPoint(xStart, yStart));
-       ButtonRect.SetRightBottom(ButtonRect.LeftTop() + kSkipButtonSize);
-       xStart += kRewindBitmapWidth;
-       TransportButton* p_slow = new TransportButton(ButtonRect, B_EMPTY_STRING,
-                                                                                       kSkipBackBitmapBits,
-                                                                                       kPressedSkipBackBitmapBits,
-                                                                                       kDisabledSkipBackBitmapBits,
-                                                                                       new BMessage(SLOWER_PLAY));
-       p_view->AddChild( p_slow );
-
-       /* Play Pause */
-       ButtonRect.SetLeftTop(BPoint(xStart, yStart));
-       ButtonRect.SetRightBottom(ButtonRect.LeftTop() + kPlayButtonSize);
-       xStart += kPlayPauseBitmapWidth + 1.0;
-       PlayPauseButton* p_play = new PlayPauseButton(ButtonRect, B_EMPTY_STRING,
-                                                                                       kPlayButtonBitmapBits,
-                                                                                       kPressedPlayButtonBitmapBits,
-                                                                                       kDisabledPlayButtonBitmapBits,
-                                                                                       kPlayingPlayButtonBitmapBits,
-                                                                                       kPressedPlayingPlayButtonBitmapBits,
-                                                                                       kPausedPlayButtonBitmapBits,
-                                                                                       kPressedPausedPlayButtonBitmapBits,
-                                                                                       new BMessage(START_PLAYBACK));
-   
-       p_view->AddChild( p_play );
-       p_play->SetPlaying();
-
-       /* Fast Foward */
-       ButtonRect.SetLeftTop(BPoint(xStart, yStart));
-       ButtonRect.SetRightBottom(ButtonRect.LeftTop() + kSkipButtonSize);
-       xStart += kRewindBitmapWidth;
-       TransportButton* p_fast = new TransportButton(ButtonRect, B_EMPTY_STRING,
-                                                                                       kSkipForwardBitmapBits,
-                                                                                       kPressedSkipForwardBitmapBits,
-                                                                                       kDisabledSkipForwardBitmapBits,
-                                                                                       new BMessage(FASTER_PLAY));
-       p_view->AddChild( p_fast );
-
-       /* Stop */
-       ButtonRect.SetLeftTop(BPoint(xStart, yStart));
-       ButtonRect.SetRightBottom(ButtonRect.LeftTop() + kStopButtonSize);
-       xStart += kStopBitmapWidth;
-       TransportButton* p_stop = new TransportButton(ButtonRect, B_EMPTY_STRING,
-                                                                                       kStopButtonBitmapBits,
-                                                                                       kPressedStopButtonBitmapBits,
-                                                                                       kDisabledStopButtonBitmapBits,
-                                                                                       new BMessage(STOP_PLAYBACK));
-       p_view->AddChild( p_stop );
-
-       ButtonRect.SetLeftTop(BPoint(xStart + 5, yStart + 6));
-       ButtonRect.SetRightBottom(ButtonRect.LeftTop() + kSpeakerButtonSize);
-       xStart += kSpeakerIconBitmapWidth;
-       TransportButton* p_mute = new TransportButton(ButtonRect, B_EMPTY_STRING,
-                                                                                       kSpeakerIconBits,
-                                                                                       kPressedSpeakerIconBits,
-                                                                                       kSpeakerIconBits,
-                                                                                       new BMessage(VOLUME_MUTE));
-
-       p_view->AddChild( p_mute );
-       /* Seek Status */       
-    rgb_color fill_color = {0,255,0};
-       p_seek = new SeekSlider(BRect(5,2,255,15), this, 0, 100,
-                                               B_TRIANGLE_THUMB);
-       p_seek->SetValue(0);
-       p_seek->UseFillColor(true, &fill_color);
-    p_view->AddChild( p_seek );
-
-       /* Volume Slider */     
-       p_vol = new MediaSlider(BRect(xStart,20,255,30), new BMessage(VOLUME_CHG),
-                                                       0, VOLUME_MAX);
-       p_vol->SetValue(VOLUME_DEFAULT);
-       p_vol->UseFillColor(true, &fill_color);
-    p_view->AddChild( p_vol );
-    
-       /* Set size and Show */
-    AddChild( p_view );
-       ResizeTo(260,50 + menu_bar->Bounds().IntegerHeight()+1);
-    Show();
-}
-
-InterfaceWindow::~InterfaceWindow()
-{
-}
-
-/*****************************************************************************
- * InterfaceWindow::MessageReceived
- *****************************************************************************/
-void InterfaceWindow::MessageReceived( BMessage * p_message )
-{
-       int vol_val = p_vol->Value();   // remember the current volume
-       static int playback_status;             // remember playback state
-       
-       BAlert *alert;
-       Activate();
-    switch( p_message->what )
-    {
-    case B_ABOUT_REQUESTED:
-               alert = new BAlert(VOUT_TITLE, "BeOS " VOUT_TITLE "\n\n<www.videolan.org>", "Ok");
-           alert->Go();
-           break;      
-    
-    case OPEN_FILE:
-       if(file_panel)
-               {
-               file_panel->Show();
-               break;
-               }
-       file_panel = new BFilePanel();
-       file_panel->SetTarget(this);
-       file_panel->Show();
-       break;
-
-    case OPEN_DVD:
-           const char **device;
-           char device_method_and_name[B_FILE_NAME_LENGTH + 4];
-           if(p_message->FindString("device", device) != B_ERROR)
-               {
-               sprintf(device_method_and_name, "dvd:%s", *device); 
-               intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, device_method_and_name );
-               }
-       break;
-
-    case STOP_PLAYBACK:
-       // this currently stops playback not nicely
-               if (p_intf->p_input != NULL )
-               {
-                       // silence the sound, otherwise very horrible
-                       if (p_main->p_aout != NULL)
-                       {
-                               p_main->p_aout->vol = 0;
-                       }
-                       snooze(400000);
-                       input_SetStatus(p_intf->p_input, INPUT_STATUS_END);
-               }
-       break;
-       case START_PLAYBACK:
-               // starts playing in normal mode
-//             if (p_intf->p_input != NULL )
-//             {                       
-//                     if (p_main->p_aout != NULL)
-//                     {
-//                             p_main->p_aout->vol = vol_val;
-//                     }
-//                     snooze(400000);
-//                     input_SetStatus(p_intf->p_input, INPUT_STATUS_PLAY);
-//                     playback_status = PLAYING;
-//             } 
-//             break;
-       case PAUSE_PLAYBACK:
-               // pause the playback
-               if (p_intf->p_input != NULL )
-               {
-                       // mute the volume if currently playing
-                       if (playback_status == PLAYING)
-                       {
-                               if (p_main->p_aout != NULL)
-                               {
-                                       p_main->p_aout->vol = 0;
-                               }
-                               playback_status = PAUSED;
-                       }
-                       else
-                       // restore the volume
-                       {
-                               if (p_main->p_aout != NULL)
-                               {
-                                       p_main->p_aout->vol = vol_val;
-                               }
-                               playback_status = PLAYING;
-                       }
-                       snooze(400000);
-                       input_SetStatus(p_intf->p_input, INPUT_STATUS_PAUSE);
-               }
-               break;
-       case FASTER_PLAY:
-               // cycle the fast playback modes
-               if (p_intf->p_input != NULL )
-               {
-                       if (p_main->p_aout != NULL)
-                       {
-                               p_main->p_aout->vol = 0;
-                       }
-                       snooze(400000);
-                       input_SetStatus(p_intf->p_input, INPUT_STATUS_FASTER);
-               }
-               break;
-       case SLOWER_PLAY:
-               // cycle the slow playback modes
-               if (p_intf->p_input != NULL )
-               {
-                       if (p_main->p_aout != NULL)
-                       {
-                               p_main->p_aout->vol = 0;
-                       }
-                       snooze(400000);
-                       input_SetStatus(p_intf->p_input, INPUT_STATUS_SLOWER);
-               }
-               break;
-       case SEEK_PLAYBACK:
-               // handled by semaphores;
-               break;
-       case VOLUME_CHG:
-               // adjust the volume
-        if (p_main->p_aout != NULL) 
-        {
-                       p_main->p_aout->vol = vol_val;
-               }
-               break;
-       case VOLUME_MUTE:
-               // mute
-        if (p_main->p_aout != NULL) 
-           {
-                       if (p_main->p_aout->vol == 0)
-                       {
-                               p_vol->SetEnabled(true);
-                               p_main->p_aout->vol = vol_val;
-                       }       
-                       else
-                       {
-                               p_vol->SetEnabled(false);
-                               p_main->p_aout->vol = 0;
-                       }
-               }
-               break;
-       case SELECT_CHANNEL:
-               {
-                       int32 i = p_message->FindInt32("channel");
-                       input_ChangeES(p_intf->p_input, 
-                                       p_intf->p_input->stream.pp_es[i], 1);
-               }
-               break;
-       case SELECT_SUBTITLE:
-               {
-                       int32 i = p_message->FindInt32("subtitle");
-                       input_ChangeES(p_intf->p_input, 
-                                       p_intf->p_input->stream.pp_es[i], 2);
-               }
-               break;
-       case B_REFS_RECEIVED:
-    case B_SIMPLE_DATA:
-        {
-            entry_ref ref;
-            if( p_message->FindRef( "refs", &ref ) == B_OK )
-            {
-                BPath path( &ref );
-                intf_PlaylistAdd( p_main->p_playlist,
-                                  PLAYLIST_END, path.Path() );
-            }
-
-        }
-        break;
-    default:
-        BWindow::MessageReceived( p_message );
-        break;
-    }
-}
-
-/*****************************************************************************
- * InterfaceWindow::QuitRequested
- *****************************************************************************/
-bool InterfaceWindow::QuitRequested()
-{
-    p_intf->b_die = 1;
-
-    return( false );
-}
-
-/*****************************************************************************
- * CDMenu::CDMenu
- *****************************************************************************/
-CDMenu::CDMenu(const char *name)
-       : BMenu(name)
-{
-}
-
-/*****************************************************************************
- * CDMenu::~CDMenu
- *****************************************************************************/
-CDMenu::~CDMenu()
-{
-}
-
-/*****************************************************************************
- * CDMenu::AttachedToWindow
- *****************************************************************************/
-void CDMenu::AttachedToWindow(void)
-{
-       while (RemoveItem((long int)0) != NULL);  // remove all items
-       GetCD("/dev/disk");
-       BMenu::AttachedToWindow();
-}
-
-/*****************************************************************************
- * CDMenu::GetCD
- *****************************************************************************/
-int CDMenu::GetCD(const char *directory)
-{ 
-       BDirectory dir; 
-       dir.SetTo(directory); 
-       if(dir.InitCheck() != B_NO_ERROR) { 
-               return B_ERROR; 
-       } 
-       dir.Rewind(); 
-       BEntry entry; 
-       while(dir.GetNextEntry(&entry) >= 0) { 
-               BPath path; 
-               const char *name; 
-               entry_ref e; 
-               
-               if(entry.GetPath(&path) != B_NO_ERROR) 
-                       continue; 
-               name = path.Path(); 
-               
-               
-               if(entry.GetRef(&e) != B_NO_ERROR) 
-                       continue; 
-
-               if(entry.IsDirectory()) { 
-                       if(strcmp(e.name, "floppy") == 0) 
-                               continue; // ignore floppy (it is not silent) 
-                       int devfd = GetCD(name);
-                       if(devfd >= 0)
-                               {
-                               return devfd;
-                               }
-               } 
-               else { 
-                       int devfd; 
-                       device_geometry g;
-                       status_t m;
-
-                       if(strcmp(e.name, "raw") != 0) 
-                               continue; // ignore partitions 
-
-                       devfd = open(name, O_RDONLY); 
-                       if(devfd < 0) 
-                               continue; 
-
-                       if(ioctl(devfd, B_GET_GEOMETRY, &g, sizeof(g)) >= 0) {
-                               if(g.device_type == B_CD) //ensure the drive is a CD-ROM
-                               { 
-                                       if(ioctl(devfd, B_GET_MEDIA_STATUS, &m, sizeof(m)) >= 0 )
-                                               if(m == B_NO_ERROR) //ensure media is present
-                                                       {
-                                                       BMessage *msg;
-                                                       msg = new BMessage(OPEN_DVD);
-                                                       msg->AddString("device", name);
-                                                       BMenuItem *menu_item;
-                                                       menu_item = new BMenuItem(name, msg);
-                                                       AddItem(menu_item);
-                                                       continue;
-                                                       }
-                               }
-                       }
-                       close(devfd);
-               } 
-       }
-       return B_ERROR;
-}
-
-/*****************************************************************************
- * LanguageMenu::LanguageMenu
- *****************************************************************************/
-LanguageMenu::LanguageMenu(const char *name, int menu_kind, intf_thread_t  *p_interface)
-       :BMenu(name)
-{
-       kind = menu_kind;
-       p_intf = p_interface;
-}
-
-/*****************************************************************************
- * LanguageMenu::~LanguageMenu
- *****************************************************************************/
-LanguageMenu::~LanguageMenu()
-{
-}
-
-/*****************************************************************************
- * LanguageMenu::AttachedToWindow
- *****************************************************************************/
-void LanguageMenu::AttachedToWindow(void)
-{
-       while (RemoveItem((long int)0) != NULL); // remove all items
-       SetRadioMode(true);
-       GetChannels();
-       BMenu::AttachedToWindow();
-}
-
-/*****************************************************************************
- * LanguageMenu::GetChannels
- *****************************************************************************/
-int LanguageMenu::GetChannels()
-{ 
-       char*   psz_name;
-       bool    b_active;
-       bool    b_found;
-       int32   i;
-       es_descriptor_t *p_es;
-       
-       if (p_intf->p_input == NULL)
-               return 1;
-               
-       for (i = 0; i < p_intf->p_input->stream.i_selected_es_number; i++)
-       {
-               if ((kind == 0) && p_intf->p_input->stream.pp_selected_es[i]->b_audio)
-               {
-                       p_es = p_intf->p_input->stream.pp_selected_es[i];
-               }
-               else if ((kind == 1) && p_intf->p_input->stream.pp_selected_es[i]->b_spu)
-               {
-                       p_es = p_intf->p_input->stream.pp_selected_es[i];
-               }
-       }               
-       for (i = 0; i < p_intf->p_input->stream.i_es_number; i++)
-       {
-               if (kind == 0) //audio
-               {
-                       b_found = p_intf->p_input->stream.pp_es[i]->b_audio;
-               }
-               else
-               {
-                       b_found = p_intf->p_input->stream.pp_es[i]->b_spu;
-               }
-               if (b_found)
-               {
-                       psz_name = p_intf->p_input->stream.pp_es[i]->psz_desc;
-                       BMessage *msg;
-                       if (kind == 0) //audio
-                       {
-                               msg = new BMessage(SELECT_CHANNEL);
-                               msg->AddInt32("channel", i);
-                       }
-                       else
-                       {
-                               msg = new BMessage(SELECT_SUBTITLE);
-                               msg->AddInt32("subtitle", i);
-                       }
-                       BMenuItem *menu_item;
-                       menu_item = new BMenuItem(psz_name, msg);
-                       AddItem(menu_item);
-                       b_active = (p_es == p_intf->p_input->stream.pp_es[i]);
-                       menu_item->SetMarked(b_active);
-               }
-       }
-}
-
-
-/*****************************************************************************
- * MediaSlider
- *****************************************************************************/
-MediaSlider::MediaSlider(BRect frame,
-                                               BMessage *message,
-                                               int32 minValue,
-                                               int32 maxValue)
-                                       :BSlider(frame, NULL, NULL, message, minValue, maxValue)
-{
-
-}
-
-MediaSlider::~MediaSlider()
-{
-
-}
-
-void MediaSlider::DrawThumb(void)
-{
-       BRect r;
-       BView *v;
-
-       rgb_color black = {0,0,0};
-       r = ThumbFrame();
-       v = OffscreenView();
-       if(IsEnabled())
-               v->SetHighColor(black);
-       else
-               v->SetHighColor(tint_color(black, B_LIGHTEN_2_TINT));
-       r.InsetBy(r.IntegerWidth()/4, r.IntegerHeight()/(4 * r.IntegerWidth() / r.IntegerHeight()));
-       v->StrokeEllipse(r);
-       if(IsEnabled())
-               v->SetHighColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-       else
-               v->SetHighColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR), B_LIGHTEN_2_TINT));
-       r.InsetBy(1,1);
-       v->FillEllipse(r);
-}
-
-/*****************************************************************************
- * SeekSlider
- *****************************************************************************/
-SeekSlider::SeekSlider(BRect frame,
-                               InterfaceWindow *owner,
-                               int32 minValue,
-                               int32 maxValue,
-                               thumb_style thumbType = B_TRIANGLE_THUMB)
-                       :MediaSlider(frame, NULL, minValue, maxValue)
-{
-       fOwner = owner;
-       fMouseDown = false;
-}
-
-SeekSlider::~SeekSlider()
-{
-}
-
-/*****************************************************************************
- * SeekSlider::MouseDown
- *****************************************************************************/
-void SeekSlider::MouseDown(BPoint where)
-{
-       BSlider::MouseDown(where);
-       fOwner->fScrubSem = create_sem(1, "Vlc::fScrubSem");
-       fMouseDown = true;                                      
-}
-
-/*****************************************************************************
- * SeekSlider::MouseUp
- *****************************************************************************/
-void SeekSlider::MouseMoved(BPoint where, uint32 code, const BMessage *message)
-{
-       BSlider::MouseMoved(where, code, message);
-       if (!fMouseDown)
-               return;
-       release_sem(fOwner->fScrubSem);
-}
-
-/*****************************************************************************
- * SeekSlider::MouseUp
- *****************************************************************************/
-void SeekSlider::MouseUp(BPoint where)
-{
-       BSlider::MouseUp(where);
-       delete_sem(fOwner->fScrubSem);
-       fOwner->fScrubSem = B_ERROR;
-       fMouseDown = false;                                     
-}
-       
 
 extern "C"
 {
@@ -692,7 +60,6 @@ extern "C"
 /*****************************************************************************
  * Local prototypes.
  *****************************************************************************/
-static int  intf_Probe     ( probedata_t *p_data );
 static int  intf_Open      ( intf_thread_t *p_intf );
 static void intf_Close     ( intf_thread_t *p_intf );
 static void intf_Run       ( intf_thread_t *p_intf );
@@ -703,28 +70,11 @@ static void intf_Run       ( intf_thread_t *p_intf );
  *****************************************************************************/
 void _M( intf_getfunctions )( function_list_t * p_function_list )
 {
-    p_function_list->pf_probe = intf_Probe;
     p_function_list->functions.intf.pf_open  = intf_Open;
     p_function_list->functions.intf.pf_close = intf_Close;
     p_function_list->functions.intf.pf_run   = intf_Run;
 }
 
-/*****************************************************************************
- * intf_Probe: probe the interface and return a score
- *****************************************************************************
- * This function tries to initialize Gnome and returns a score to the
- * plugin manager so that it can select the best plugin.
- *****************************************************************************/
-static int intf_Probe( probedata_t *p_data )
-{
-    if( TestMethod( INTF_METHOD_VAR, "beos" ) )
-    {
-        return( 999 );
-    }
-
-    return( 100 );
-}
-
 /*****************************************************************************
  * intf_Open: initialize interface
  *****************************************************************************/
@@ -738,7 +88,7 @@ static int intf_Open( intf_thread_t *p_intf )
     rect.left += 50;
     rect.right = rect.left + 350;
     delete screen;
-    
+
     /* Allocate instance and initialize some members */
     p_intf->p_sys = (intf_sys_t*) malloc( sizeof( intf_sys_t ) );
     if( p_intf->p_sys == NULL )
@@ -747,7 +97,7 @@ static int intf_Open( intf_thread_t *p_intf )
         return( 1 );
     }
     p_intf->p_sys->i_key = -1;
-    
+
     /* Create the interface window */
     p_intf->p_sys->p_window =
         new InterfaceWindow( rect,
@@ -758,7 +108,7 @@ static int intf_Open( intf_thread_t *p_intf )
         intf_ErrMsg( "error: cannot allocate memory for InterfaceWindow" );
         return( 1 );
     }
-    
+
     return( 0 );
 }
 
@@ -769,7 +119,7 @@ static void intf_Close( intf_thread_t *p_intf )
 {
     /* Destroy the interface window */
     p_intf->p_sys->p_window->Lock();
-    p_intf->p_sys->p_window->Quit();    
+    p_intf->p_sys->p_window->Quit();
 
     /* Destroy structure */
     free( p_intf->p_sys );
@@ -781,39 +131,18 @@ static void intf_Close( intf_thread_t *p_intf )
  *****************************************************************************/
 static void intf_Run( intf_thread_t *p_intf )
 {
-       
-       float progress;
-       bool seekNeeded = false;
-       
+
     while( !p_intf->b_die )
     {
-
         /* Manage core vlc functions through the callback */
         p_intf->pf_manage( p_intf );
 
-           /* Manage the slider */
-           if( p_intf->p_input != NULL && p_intf->p_sys->p_window != NULL)
-       {
-            if (acquire_sem(p_intf->p_sys->p_window->fScrubSem) == B_OK)
-                       {
-                               seekNeeded = true;
-                       }               
-
-                       if (seekNeeded)
-            {
-               uint32 seekTo = (p_intf->p_sys->p_window->p_seek->Value() * 
-                               p_intf->p_input->stream.p_selected_area->i_size) / 100;
-                               input_Seek( p_intf->p_input, seekTo );
-                               seekNeeded = false;             
-            }
-                       else if (p_intf->p_sys->p_window->Lock())
-            {
-                   progress = (100. * p_intf->p_input->stream.p_selected_area->i_tell) /
-                                       p_intf->p_input->stream.p_selected_area->i_size;
-                   p_intf->p_sys->p_window->p_seek->SetValue(progress);
-                   p_intf->p_sys->p_window->Unlock();
-               }
-         }
+        /* Manage the slider */
+        if( p_input_bank->pp_input[0] != NULL
+             && p_intf->p_sys->p_window != NULL)
+        {
+            p_intf->p_sys->p_window->updateInterface();
+        }
 
         /* Wait a bit */
         msleep( INTF_IDLE_SLEEP );
@@ -821,3 +150,4 @@ static void intf_Run( intf_thread_t *p_intf )
 }
 
 } /* extern "C" */
+