]> git.sesse.net Git - vlc/commitdiff
Change to the set out of the BeOS code to
authorTony Castley <tcastley@videolan.org>
Sat, 2 Jun 2001 09:42:26 +0000 (09:42 +0000)
committerTony Castley <tcastley@videolan.org>
Sat, 2 Jun 2001 09:42:26 +0000 (09:42 +0000)
allow more logical updates.

plugins/beos/InterfaceWindow.cpp [new file with mode: 0644]
plugins/beos/intf_beos.cpp

diff --git a/plugins/beos/InterfaceWindow.cpp b/plugins/beos/InterfaceWindow.cpp
new file mode 100644 (file)
index 0000000..fcd439d
--- /dev/null
@@ -0,0 +1,839 @@
+/*****************************************************************************
+ * InterfaceWindow.cpp: beos interface
+ *****************************************************************************
+ * Copyright (C) 1999, 2000, 2001 VideoLAN
+ * $Id: InterfaceWindow.cpp,v 1.1 2001/06/02 09:42:26 tcastley Exp $
+ *
+ * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
+ *          Samuel Hocevar <sam@zoy.org>
+ *          Tony Castley <tony@castley.net>
+ *          Richard Shepherd <richard@rshepherd.demon.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * 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
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+#include "defs.h"
+
+/* System headers */
+#include <kernel/OS.h>
+#include <InterfaceKit.h>
+#include <AppKit.h>
+#include <StorageKit.h>
+#include <malloc.h>
+#include <scsi.h>
+#include <scsiprobe_driver.h>
+
+/* VLC headers */
+extern "C"
+{
+#include "config.h"
+#include "common.h"
+#include "threads.h"
+#include "mtime.h"
+#include "main.h"
+#include "tests.h"
+#include "stream_control.h"
+#include "input_ext-intf.h"
+#include "interface.h"
+#include "intf_msg.h"
+#include "intf_playlist.h"
+#include "audio_output.h"
+}
+
+/* BeOS interface headers */
+#include "MsgVals.h"
+#include "InterfaceWindow.h"
+#include "Bitmaps.h"
+#include "TransportButton.h"
+
+/*****************************************************************************
+ * 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 *mFile;
+    BMenu *mAudio;
+    CDMenu *cd_menu;
+
+    BMenuItem *mItem;
+
+    menu_bar->AddItem( mFile = new BMenu( "File" ) );
+    menu_bar->ResizeToPreferred();
+    mFile->AddItem( mItem = new BMenuItem( "Open File" B_UTF8_ELLIPSIS,
+                                           new BMessage(OPEN_FILE), 'O') );
+    cd_menu = new CDMenu( "Open Disc" );
+    mFile->AddItem( cd_menu );
+    mFile->AddSeparatorItem();
+    mFile->AddItem( mItem = new BMenuItem( "About" B_UTF8_ELLIPSIS,
+                                       new BMessage(B_ABOUT_REQUESTED), 'A') );
+    mItem->SetTarget( be_app );
+    mFile->AddItem(mItem = new BMenuItem( "Quit",
+                                        new BMessage(B_QUIT_REQUESTED), 'Q') );
+
+    menu_bar->AddItem ( mAudio = new BMenu( "Audio" ) );
+    menu_bar->ResizeToPreferred();
+    mAudio->AddItem( new LanguageMenu( "Language", AUDIO_ES, p_intf ) );
+    mAudio->AddItem( new LanguageMenu( "Subtitles", SPU_ES, 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
+    int     i_index;
+    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 *psz_device;
+        char psz_source[ B_FILE_NAME_LENGTH + 4 ];
+        if( p_message->FindString("device", &psz_device) != B_ERROR )
+        {
+            snprintf( psz_source, B_FILE_NAME_LENGTH + 4,
+                      "dvd:%s", psz_device );
+            psz_source[ strlen(psz_source) ] = '\0';
+            intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, (char*)psz_source );
+        }
+        break;
+
+    case STOP_PLAYBACK:
+        // this currently stops playback not nicely
+        if( p_intf->p_input != NULL )
+        {
+            // silence the sound, otherwise very horrible
+            vlc_mutex_lock( &p_aout_bank->lock );
+            for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
+            {
+                p_aout_bank->pp_aout[i_index]->i_savedvolume = p_aout_bank->pp_aout[i_index]->i_volume;
+                p_aout_bank->pp_aout[i_index]->i_volume = 0;
+            }
+            vlc_mutex_unlock( &p_aout_bank->lock );
+            snooze( 400000 );
+
+            /* end playing item */
+            p_intf->p_input->b_eof = 1;
+            
+            /* update playlist */
+            vlc_mutex_lock( &p_main->p_playlist->change_lock );
+            p_main->p_playlist->i_index--;
+            p_main->p_playlist->b_stopped = 1;
+            vlc_mutex_unlock( &p_main->p_playlist->change_lock );
+        }
+        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->i_vol = vol_val;
+            }
+            snooze(400000);
+            input_SetStatus(p_intf->p_input, INPUT_STATUS_PLAY);
+            playback_status = PLAYING;
+        }
+        break;
+*/
+
+    case PAUSE_PLAYBACK:
+        /* toggle between pause and play */
+        if( p_intf->p_input != NULL )
+        {
+            /* pause if currently playing */
+            if( playback_status == PLAYING )
+            {
+                /* mute the sound */
+                vlc_mutex_lock( &p_aout_bank->lock );
+                for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
+                {
+                    p_aout_bank->pp_aout[i_index]->i_savedvolume =
+                                       p_aout_bank->pp_aout[i_index]->i_volume;
+                    p_aout_bank->pp_aout[i_index]->i_volume = 0;
+                }
+                vlc_mutex_unlock( &p_aout_bank->lock );
+                
+                /* pause the movie */
+                input_SetStatus( p_intf->p_input, INPUT_STATUS_PAUSE );
+                vlc_mutex_lock( &p_main->p_playlist->change_lock );
+                p_main->p_playlist->b_stopped = 0;
+                vlc_mutex_unlock( &p_main->p_playlist->change_lock );
+                playback_status = PAUSED;
+            }
+            else
+            {
+                /* Play after pausing */
+                /* Restore the volume */
+                vlc_mutex_lock( &p_aout_bank->lock );
+                for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
+                {
+                    p_aout_bank->pp_aout[i_index]->i_volume =
+                                  p_aout_bank->pp_aout[i_index]->i_savedvolume;
+                    p_aout_bank->pp_aout[i_index]->i_savedvolume = 0;
+                }
+                vlc_mutex_unlock( &p_aout_bank->lock );
+                snooze( 400000 );
+                
+                /* Start playing */
+                input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
+                p_main->p_playlist->b_stopped = 0;
+                playback_status = PLAYING;
+            }
+        }
+        else
+        {
+            /* Play a new file */
+            vlc_mutex_lock( &p_main->p_playlist->change_lock );
+            if( p_main->p_playlist->b_stopped )
+            {
+                if( p_main->p_playlist->i_size )
+                {
+                    vlc_mutex_unlock( &p_main->p_playlist->change_lock );
+                    intf_PlaylistJumpto( p_main->p_playlist, 
+                                         p_main->p_playlist->i_index );
+                    playback_status = PLAYING;
+                }
+                else
+                {
+                    vlc_mutex_unlock( &p_main->p_playlist->change_lock );
+                }
+            }
+        }    
+        break;
+
+    case FASTER_PLAY:
+        /* cycle the fast playback modes */
+        if( p_intf->p_input != NULL )
+        {
+            /* mute the sound */
+            vlc_mutex_lock( &p_aout_bank->lock );
+            for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
+            {
+                p_aout_bank->pp_aout[i_index]->i_savedvolume =
+                                       p_aout_bank->pp_aout[i_index]->i_volume;
+                p_aout_bank->pp_aout[i_index]->i_volume = 0;
+            }
+            vlc_mutex_unlock( &p_aout_bank->lock );
+            snooze( 400000 );
+
+            /* change the fast play mode */
+            input_SetStatus( p_intf->p_input, INPUT_STATUS_FASTER );
+            vlc_mutex_lock( &p_main->p_playlist->change_lock );
+            p_main->p_playlist->b_stopped = 0;
+            vlc_mutex_unlock( &p_main->p_playlist->change_lock );
+        }
+        break;
+
+    case SLOWER_PLAY:
+        /*  cycle the slow playback modes */
+        if (p_intf->p_input != NULL )
+        {
+            /* mute the sound */
+            vlc_mutex_lock( &p_aout_bank->lock );
+            for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
+            {
+                p_aout_bank->pp_aout[i_index]->i_savedvolume =
+                                       p_aout_bank->pp_aout[i_index]->i_volume;
+                p_aout_bank->pp_aout[i_index]->i_volume = 0;
+            }
+            vlc_mutex_unlock( &p_aout_bank->lock );
+            snooze( 400000 );
+
+            /* change the slower play */
+            input_SetStatus( p_intf->p_input, INPUT_STATUS_SLOWER );
+            vlc_mutex_lock( &p_main->p_playlist->change_lock );
+            p_main->p_playlist->b_stopped = 0;
+            vlc_mutex_unlock( &p_main->p_playlist->change_lock );
+        }
+        break;
+
+    case SEEK_PLAYBACK:
+        /* handled by semaphores */
+        break;
+
+    case VOLUME_CHG:
+        /* adjust the volume */
+        vlc_mutex_lock( &p_aout_bank->lock );
+        for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
+        {
+            if( p_aout_bank->pp_aout[i_index]->i_savedvolume )
+            {
+                p_aout_bank->pp_aout[i_index]->i_savedvolume = vol_val;
+            }
+            else
+            {
+                p_aout_bank->pp_aout[i_index]->i_volume = vol_val;
+            }
+        }
+        vlc_mutex_unlock( &p_aout_bank->lock );
+        break;
+
+    case VOLUME_MUTE:
+        /* toggle muting */
+        vlc_mutex_lock( &p_aout_bank->lock );
+        for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
+        {
+            if( p_aout_bank->pp_aout[i_index]->i_savedvolume )
+            {
+                p_aout_bank->pp_aout[i_index]->i_volume =
+                                  p_aout_bank->pp_aout[i_index]->i_savedvolume;
+                p_aout_bank->pp_aout[i_index]->i_savedvolume = 0;
+            }
+            else
+            {
+                p_aout_bank->pp_aout[i_index]->i_savedvolume =
+                                       p_aout_bank->pp_aout[i_index]->i_volume;
+                p_aout_bank->pp_aout[i_index]->i_volume = 0;
+            }
+        }
+        vlc_mutex_unlock( &p_aout_bank->lock );
+        break;
+
+    case SELECT_CHANNEL:
+        {
+            int32 i = p_message->FindInt32( "channel" );
+            if ( i == -1 )
+            {
+                input_ChangeES( p_intf->p_input, NULL, AUDIO_ES );
+            }
+            else
+            {
+                input_ChangeES( p_intf->p_input,
+                        p_intf->p_input->stream.pp_es[i], AUDIO_ES );
+            }
+        }
+        break;
+
+    case SELECT_SUBTITLE:
+        {
+            int32 i = p_message->FindInt32( "subtitle" );
+            if ( i == -1 )
+            {
+                input_ChangeES( p_intf->p_input, NULL, SPU_ES);
+            }
+            else
+            {
+                input_ChangeES( p_intf->p_input,
+                        p_intf->p_input->stream.pp_es[i], SPU_ES );
+            }
+        }
+        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, (char*)path.Path() );
+             }
+        }
+        break;
+
+    default:
+        BWindow::MessageReceived( p_message );
+        break;
+    }
+}
+
+/*****************************************************************************
+ * InterfaceWindow::updateInterface
+ *****************************************************************************/
+void InterfaceWindow::updateInterface()
+{
+    float progress;
+    bool seekNeeded = false;
+
+    if( acquire_sem(fScrubSem) == B_OK )
+    {
+        seekNeeded = true;
+    }
+    if( seekNeeded )
+    {
+        uint32 seekTo = (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( Lock() )
+    {
+        progress = (100. * p_intf->p_input->stream.p_selected_area->i_tell) /
+                    p_intf->p_input->stream.p_selected_area->i_size;
+        p_seek->SetValue(progress);
+        Unlock();
+    }
+}
+
+/*****************************************************************************
+ * 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 )
+{
+    int i_dev;
+    BDirectory dir;
+    dir.SetTo( directory );
+
+    if( dir.InitCheck() != B_NO_ERROR )
+    {
+        return B_ERROR;
+    }
+
+    dir.Rewind();
+    BEntry entry;
+
+    while( dir.GetNextEntry(&entry) >= 0 )
+    {
+        const char *name;
+        entry_ref e;
+        BPath path;
+
+        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)
+            }
+
+            i_dev = GetCD( name );
+
+            if( i_dev >= 0 )
+            {
+                return i_dev;
+            }
+        }
+        else
+        {
+            device_geometry g;
+            status_t m;
+
+            if( strcmp(e.name, "raw") != 0 )
+            {
+                continue; // ignore partitions
+            }
+
+            i_dev = open( name, O_RDONLY );
+
+            if( i_dev < 0 )
+            {
+                continue;
+            }
+
+            if( ioctl(i_dev, B_GET_GEOMETRY, &g, sizeof(g)) >= 0 )
+            {
+                if( g.device_type == B_CD ) //ensure the drive is a CD-ROM
+                {
+                    if( ioctl(i_dev, 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( i_dev );
+        }
+    }
+    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;
+    BMessage *msg;
+    int    i;
+    es_descriptor_t *p_es  = NULL;
+
+    /* Insert the null */
+    if( kind == AUDIO_ES ) //audio
+    {
+        msg = new BMessage(SELECT_CHANNEL);
+        msg->AddInt32("channel", -1);
+    }
+    else
+    {
+        msg = new BMessage(SELECT_SUBTITLE);
+        msg->AddInt32("subtitle", -1);
+    }
+    BMenuItem *menu_item;
+    menu_item = new BMenuItem("None", msg);
+    AddItem(menu_item);
+    menu_item->SetMarked(TRUE);
+
+    if( p_intf->p_input == NULL )
+    {
+        return 1;
+    }
+
+
+    vlc_mutex_lock( &p_intf->p_input->stream.stream_lock );
+    for( i = 0; i < p_intf->p_input->stream.i_selected_es_number; i++ )
+    {
+        if( kind == p_intf->p_input->stream.pp_selected_es[i]->i_cat )
+        {
+            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 == p_intf->p_input->stream.pp_es[i]->i_cat )
+        {
+            psz_name = p_intf->p_input->stream.pp_es[i]->psz_desc;
+            if( kind == AUDIO_ES ) //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);
+        }
+    }
+    vlc_mutex_unlock( &p_intf->p_input->stream.stream_lock );
+
+}
+
+/*****************************************************************************
+ * MediaSlider
+ *****************************************************************************/
+MediaSlider::MediaSlider( BRect frame, BMessage *p_message,
+                          int32 i_min, int32 i_max )
+            :BSlider(frame, NULL, NULL, p_message, i_min, i_max )
+{
+
+}
+
+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 *p_owner, int32 i_min,
+                        int32 i_max, thumb_style thumbType = B_TRIANGLE_THUMB )
+           :MediaSlider( frame, NULL, i_min, i_max )
+{
+    fOwner = p_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;
+}
+
+
index 2229f021e8c1b70955ef93487aaad6f9c6b6a209..7d4930c2133dd0a2f5a9dbef9e4c45bffe1d8ec0 100644 (file)
@@ -2,7 +2,7 @@
  * intf_beos.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: intf_beos.cpp,v 1.31 2001/05/31 03:57:54 sam Exp $
+ * $Id: intf_beos.cpp,v 1.32 2001/06/02 09:42:26 tcastley Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
 
 #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"
 {
@@ -70,25 +44,16 @@ extern "C"
 #include "threads.h"
 #include "mtime.h"
 #include "tests.h"
-
 #include "stream_control.h"
-#include "input_ext-intf.h"
-
 #include "interface.h"
-#include "intf_playlist.h"
+#include "input_ext-intf.h"
 #include "intf_msg.h"
-#include "audio_output.h"
-#include "MsgVals.h"
-
 #include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 }
 
 #include "InterfaceWindow.h"
-#include "Bitmaps.h"
-#include "TransportButton.h"
 
 /*****************************************************************************
  * intf_sys_t: description and status of FB interface
@@ -99,756 +64,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 *mFile;
-    BMenu *mAudio;
-    CDMenu *cd_menu;
-
-    BMenuItem *mItem;
-
-    menu_bar->AddItem( mFile = new BMenu( "File" ) );
-    menu_bar->ResizeToPreferred();
-    mFile->AddItem( mItem = new BMenuItem( "Open File" B_UTF8_ELLIPSIS,
-                                           new BMessage(OPEN_FILE), 'O') );
-    cd_menu = new CDMenu( "Open Disc" );
-    mFile->AddItem( cd_menu );
-    mFile->AddSeparatorItem();
-    mFile->AddItem( mItem = new BMenuItem( "About" B_UTF8_ELLIPSIS,
-                                       new BMessage(B_ABOUT_REQUESTED), 'A') );
-    mItem->SetTarget( be_app );
-    mFile->AddItem(mItem = new BMenuItem( "Quit",
-                                        new BMessage(B_QUIT_REQUESTED), 'Q') );
-
-    menu_bar->AddItem ( mAudio = new BMenu( "Audio" ) );
-    menu_bar->ResizeToPreferred();
-    mAudio->AddItem( new LanguageMenu( "Language", AUDIO_ES, p_intf ) );
-    mAudio->AddItem( new LanguageMenu( "Subtitles", SPU_ES, 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
-    int     i_index;
-    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 *psz_device;
-        char psz_source[ B_FILE_NAME_LENGTH + 4 ];
-        if( p_message->FindString("device", &psz_device) != B_ERROR )
-        {
-            snprintf( psz_source, B_FILE_NAME_LENGTH + 4,
-                      "dvd:%s", psz_device );
-            psz_source[ strlen(psz_source) ] = '\0';
-            intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, (char*)psz_source );
-        }
-        break;
-
-    case STOP_PLAYBACK:
-        // this currently stops playback not nicely
-        if( p_intf->p_input != NULL )
-        {
-            // silence the sound, otherwise very horrible
-            vlc_mutex_lock( &p_aout_bank->lock );
-            for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
-            {
-                p_aout_bank->pp_aout[i_index]->i_savedvolume = p_aout_bank->pp_aout[i_index]->i_volume;
-                p_aout_bank->pp_aout[i_index]->i_volume = 0;
-            }
-            vlc_mutex_unlock( &p_aout_bank->lock );
-            snooze( 400000 );
-
-            /* end playing item */
-            p_intf->p_input->b_eof = 1;
-            
-            /* update playlist */
-            vlc_mutex_lock( &p_main->p_playlist->change_lock );
-            p_main->p_playlist->i_index--;
-            p_main->p_playlist->b_stopped = 1;
-            vlc_mutex_unlock( &p_main->p_playlist->change_lock );
-        }
-        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->i_vol = vol_val;
-            }
-            snooze(400000);
-            input_SetStatus(p_intf->p_input, INPUT_STATUS_PLAY);
-            playback_status = PLAYING;
-        }
-        break;
-*/
-
-    case PAUSE_PLAYBACK:
-        /* toggle between pause and play */
-        if( p_intf->p_input != NULL )
-        {
-            /* pause if currently playing */
-            if( playback_status == PLAYING )
-            {
-                /* mute the sound */
-                vlc_mutex_lock( &p_aout_bank->lock );
-                for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
-                {
-                    p_aout_bank->pp_aout[i_index]->i_savedvolume =
-                                       p_aout_bank->pp_aout[i_index]->i_volume;
-                    p_aout_bank->pp_aout[i_index]->i_volume = 0;
-                }
-                vlc_mutex_unlock( &p_aout_bank->lock );
-                
-                /* pause the movie */
-                input_SetStatus( p_intf->p_input, INPUT_STATUS_PAUSE );
-                vlc_mutex_lock( &p_main->p_playlist->change_lock );
-                p_main->p_playlist->b_stopped = 0;
-                vlc_mutex_unlock( &p_main->p_playlist->change_lock );
-                playback_status = PAUSED;
-            }
-            else
-            {
-                /* Play after pausing */
-                /* Restore the volume */
-                vlc_mutex_lock( &p_aout_bank->lock );
-                for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
-                {
-                    p_aout_bank->pp_aout[i_index]->i_volume =
-                                  p_aout_bank->pp_aout[i_index]->i_savedvolume;
-                    p_aout_bank->pp_aout[i_index]->i_savedvolume = 0;
-                }
-                vlc_mutex_unlock( &p_aout_bank->lock );
-                snooze( 400000 );
-                
-                /* Start playing */
-                input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
-                p_main->p_playlist->b_stopped = 0;
-                playback_status = PLAYING;
-            }
-        }
-        else
-        {
-            /* Play a new file */
-            vlc_mutex_lock( &p_main->p_playlist->change_lock );
-            if( p_main->p_playlist->b_stopped )
-            {
-                if( p_main->p_playlist->i_size )
-                {
-                    vlc_mutex_unlock( &p_main->p_playlist->change_lock );
-                    intf_PlaylistJumpto( p_main->p_playlist, 
-                                         p_main->p_playlist->i_index );
-                    playback_status = PLAYING;
-                }
-                else
-                {
-                    vlc_mutex_unlock( &p_main->p_playlist->change_lock );
-                }
-            }
-        }    
-        break;
-
-    case FASTER_PLAY:
-        /* cycle the fast playback modes */
-        if( p_intf->p_input != NULL )
-        {
-            /* mute the sound */
-            vlc_mutex_lock( &p_aout_bank->lock );
-            for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
-            {
-                p_aout_bank->pp_aout[i_index]->i_savedvolume =
-                                       p_aout_bank->pp_aout[i_index]->i_volume;
-                p_aout_bank->pp_aout[i_index]->i_volume = 0;
-            }
-            vlc_mutex_unlock( &p_aout_bank->lock );
-            snooze( 400000 );
-
-            /* change the fast play mode */
-            input_SetStatus( p_intf->p_input, INPUT_STATUS_FASTER );
-            vlc_mutex_lock( &p_main->p_playlist->change_lock );
-            p_main->p_playlist->b_stopped = 0;
-            vlc_mutex_unlock( &p_main->p_playlist->change_lock );
-        }
-        break;
-
-    case SLOWER_PLAY:
-        /*  cycle the slow playback modes */
-        if (p_intf->p_input != NULL )
-        {
-            /* mute the sound */
-            vlc_mutex_lock( &p_aout_bank->lock );
-            for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
-            {
-                p_aout_bank->pp_aout[i_index]->i_savedvolume =
-                                       p_aout_bank->pp_aout[i_index]->i_volume;
-                p_aout_bank->pp_aout[i_index]->i_volume = 0;
-            }
-            vlc_mutex_unlock( &p_aout_bank->lock );
-            snooze( 400000 );
-
-            /* change the slower play */
-            input_SetStatus( p_intf->p_input, INPUT_STATUS_SLOWER );
-            vlc_mutex_lock( &p_main->p_playlist->change_lock );
-            p_main->p_playlist->b_stopped = 0;
-            vlc_mutex_unlock( &p_main->p_playlist->change_lock );
-        }
-        break;
-
-    case SEEK_PLAYBACK:
-        /* handled by semaphores */
-        break;
-
-    case VOLUME_CHG:
-        /* adjust the volume */
-        vlc_mutex_lock( &p_aout_bank->lock );
-        for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
-        {
-            if( p_aout_bank->pp_aout[i_index]->i_savedvolume )
-            {
-                p_aout_bank->pp_aout[i_index]->i_savedvolume = vol_val;
-            }
-            else
-            {
-                p_aout_bank->pp_aout[i_index]->i_volume = vol_val;
-            }
-        }
-        vlc_mutex_unlock( &p_aout_bank->lock );
-        break;
-
-    case VOLUME_MUTE:
-        /* toggle muting */
-        vlc_mutex_lock( &p_aout_bank->lock );
-        for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
-        {
-            if( p_aout_bank->pp_aout[i_index]->i_savedvolume )
-            {
-                p_aout_bank->pp_aout[i_index]->i_volume =
-                                  p_aout_bank->pp_aout[i_index]->i_savedvolume;
-                p_aout_bank->pp_aout[i_index]->i_savedvolume = 0;
-            }
-            else
-            {
-                p_aout_bank->pp_aout[i_index]->i_savedvolume =
-                                       p_aout_bank->pp_aout[i_index]->i_volume;
-                p_aout_bank->pp_aout[i_index]->i_volume = 0;
-            }
-        }
-        vlc_mutex_unlock( &p_aout_bank->lock );
-        break;
-
-    case SELECT_CHANNEL:
-        {
-            int32 i = p_message->FindInt32( "channel" );
-            if ( i == -1 )
-            {
-                input_ChangeES( p_intf->p_input, NULL, AUDIO_ES );
-            }
-            else
-            {
-                input_ChangeES( p_intf->p_input,
-                        p_intf->p_input->stream.pp_es[i], AUDIO_ES );
-            }
-        }
-        break;
-
-    case SELECT_SUBTITLE:
-        {
-            int32 i = p_message->FindInt32( "subtitle" );
-            if ( i == -1 )
-            {
-                input_ChangeES( p_intf->p_input, NULL, SPU_ES);
-            }
-            else
-            {
-                input_ChangeES( p_intf->p_input,
-                        p_intf->p_input->stream.pp_es[i], SPU_ES );
-            }
-        }
-        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, (char*)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 )
-{
-    int i_dev;
-    BDirectory dir;
-    dir.SetTo( directory );
-
-    if( dir.InitCheck() != B_NO_ERROR )
-    {
-        return B_ERROR;
-    }
-
-    dir.Rewind();
-    BEntry entry;
-
-    while( dir.GetNextEntry(&entry) >= 0 )
-    {
-        const char *name;
-        entry_ref e;
-        BPath path;
-
-        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)
-            }
-
-            i_dev = GetCD( name );
-
-            if( i_dev >= 0 )
-            {
-                return i_dev;
-            }
-        }
-        else
-        {
-            device_geometry g;
-            status_t m;
-
-            if( strcmp(e.name, "raw") != 0 )
-            {
-                continue; // ignore partitions
-            }
-
-            i_dev = open( name, O_RDONLY );
-
-            if( i_dev < 0 )
-            {
-                continue;
-            }
-
-            if( ioctl(i_dev, B_GET_GEOMETRY, &g, sizeof(g)) >= 0 )
-            {
-                if( g.device_type == B_CD ) //ensure the drive is a CD-ROM
-                {
-                    if( ioctl(i_dev, 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( i_dev );
-        }
-    }
-    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;
-    BMessage *msg;
-    int    i;
-    es_descriptor_t *p_es  = NULL;
-
-    /* Insert the null */
-    if( kind == AUDIO_ES ) //audio
-    {
-        msg = new BMessage(SELECT_CHANNEL);
-        msg->AddInt32("channel", -1);
-    }
-    else
-    {
-        msg = new BMessage(SELECT_SUBTITLE);
-        msg->AddInt32("subtitle", -1);
-    }
-    BMenuItem *menu_item;
-    menu_item = new BMenuItem("None", msg);
-    AddItem(menu_item);
-    menu_item->SetMarked(TRUE);
-
-    if( p_intf->p_input == NULL )
-    {
-        return 1;
-    }
-
-
-    vlc_mutex_lock( &p_intf->p_input->stream.stream_lock );
-    for( i = 0; i < p_intf->p_input->stream.i_selected_es_number; i++ )
-    {
-        if( kind == p_intf->p_input->stream.pp_selected_es[i]->i_cat )
-        {
-            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 == p_intf->p_input->stream.pp_es[i]->i_cat )
-        {
-            psz_name = p_intf->p_input->stream.pp_es[i]->psz_desc;
-            if( kind == AUDIO_ES ) //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);
-        }
-    }
-    vlc_mutex_unlock( &p_intf->p_input->stream.stream_lock );
-
-}
-
-/*****************************************************************************
- * MediaSlider
- *****************************************************************************/
-MediaSlider::MediaSlider( BRect frame, BMessage *p_message,
-                          int32 i_min, int32 i_max )
-            :BSlider(frame, NULL, NULL, p_message, i_min, i_max )
-{
-
-}
-
-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 *p_owner, int32 i_min,
-                        int32 i_max, thumb_style thumbType = B_TRIANGLE_THUMB )
-           :MediaSlider( frame, NULL, i_min, i_max )
-{
-    fOwner = p_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"
 {
@@ -945,8 +160,6 @@ 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 )
     {
@@ -956,25 +169,7 @@ static void intf_Run( intf_thread_t *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();
-            }
+        p_intf->p_sys->p_window->updateInterface();
         }
 
         /* Wait a bit */