/*****************************************************************************
* timer.cpp : wxWindows plugin for vlc
*****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
- * $Id: timer.cpp,v 1.2 2002/11/20 14:24:00 gbazin Exp $
+ * Copyright (C) 2000-2003 VideoLAN
+ * $Id$
*
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
+ * Authors: Gildas Bazin <gbazin@videolan.org>
*
* 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
#include <stdio.h>
#include <vlc/vlc.h>
+#include <vlc/aout.h>
#include <vlc/intf.h>
-/* Let wxWindows take care of the i18n stuff */
-#undef _
-
-#ifdef WIN32 /* mingw32 hack */
-#undef Yield
-#undef CreateDialog
-#endif
-
-#include <wx/wxprec.h>
-#include <wx/wx.h>
+#include "wxwindows.h"
#include <wx/timer.h>
-#include "wxwindows.h"
+//void DisplayStreamDate( wxControl *, intf_thread_t *, int );
+
+/* Callback prototypes */
+static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
+ vlc_value_t old_val, vlc_value_t new_val, void *param );
+static int IntfShowCB( vlc_object_t *p_this, const char *psz_variable,
+ vlc_value_t old_val, vlc_value_t new_val, void *param );
/*****************************************************************************
* Constructor.
{
p_intf = _p_intf;
p_main_interface = _p_main_interface;
+ b_init = 0;
+ i_old_playing_status = PAUSE_S;
+ i_old_rate = INPUT_RATE_DEFAULT;
+
+ /* Register callback for the intf-popupmenu variable */
+ playlist_t *p_playlist =
+ (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist != NULL )
+ {
+ var_AddCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
+ var_AddCallback( p_playlist, "intf-show", IntfShowCB, p_intf );
+ vlc_object_release( p_playlist );
+ }
Start( 100 /*milliseconds*/, wxTIMER_CONTINUOUS );
}
Timer::~Timer()
{
+ /* Unregister callback */
+ playlist_t *p_playlist =
+ (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist != NULL )
+ {
+ var_DelCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
+ var_DelCallback( p_playlist, "intf-show", IntfShowCB, p_intf );
+ vlc_object_release( p_playlist );
+ }
}
/*****************************************************************************
* Private methods.
*****************************************************************************/
-/*****************************************************************************
- * wxModeManage: actualise the aspect of the interface whenever the input
- * changes.
- *****************************************************************************
- * The lock has to be taken before you call the function.
- *****************************************************************************/
-static int wxModeManage( intf_thread_t * p_intf )
-{
- return 0;
-}
-
-/*****************************************************************************
- * wxSetupMenus: function that generates title/chapter/audio/subpic
- * menus with help from preceding functions
- *****************************************************************************
- * Function called with the lock on stream
- *****************************************************************************/
-static int wxSetupMenus( intf_thread_t * p_intf )
-{
- return 0;
-}
/*****************************************************************************
* Manage: manage main thread messages
*****************************************************************************/
void Timer::Notify()
{
- int i_start, i_stop;
-
- vlc_mutex_lock( &p_intf->change_lock );
-
- /* If the "display popup" flag has changed */
- if( p_intf->b_menu_change )
+ input_thread_t *p_input = NULL;
+#if defined( __WXMSW__ ) /* Work-around a bug with accelerators */
+ if( !b_init )
{
- p_intf->b_menu_change = 0;
+ p_main_interface->Init();
+ b_init = VLC_TRUE;
}
+#endif
- /* Update the log window */
- vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
- i_stop = *p_intf->p_sys->p_sub->pi_stop;
- vlc_mutex_unlock( p_intf->p_sys->p_sub->p_lock );
-
- if( p_intf->p_sys->p_sub->i_start != i_stop )
- {
- }
+ vlc_mutex_lock( &p_intf->change_lock );
/* Update the input */
if( p_intf->p_sys->p_input == NULL )
{
- p_intf->p_sys->p_input = (input_thread_t *)vlc_object_find( p_intf,
- VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
- /* Show slider */
- if(p_intf->p_sys->p_input)
+ playlist_t *p_playlist =
+ (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist != NULL )
{
- p_main_interface->slider->Show();
+ p_intf->p_sys->p_input = p_playlist->p_input;
+ vlc_object_release( p_playlist );
+ }
+
+ /* Refresh interface */
+ if( p_intf->p_sys->p_input )
+ {
+ p_main_interface->slider->SetValue( 0 );
+ b_old_seekable = VLC_FALSE;
+ b_disc_shown = VLC_FALSE;
+
p_main_interface->statusbar->SetStatusText(
- p_intf->p_sys->p_input->psz_source, 1 );
+ wxU(p_intf->p_sys->p_input->input.p_item->psz_name), 2 );
+
+ p_main_interface->TogglePlayButton( PLAYING_S );
+ i_old_playing_status = PLAYING_S;
}
}
else if( p_intf->p_sys->p_input->b_dead )
{
- /* Hide slider */
- if(p_intf->p_sys->p_input)
- p_main_interface->slider->Hide();
+ /* Hide slider and Disc Buttons */
+ p_main_interface->disc_frame->Hide();
+ p_main_interface->slider_sizer->Hide(
+ p_main_interface->disc_frame );
+ p_main_interface->slider_sizer->Layout();
+ p_main_interface->slider_sizer->Fit( p_main_interface->slider_frame );
+
+ p_main_interface->slider_frame->Hide();
+ p_main_interface->frame_sizer->Hide(
+ p_main_interface->slider_frame );
+ p_main_interface->frame_sizer->Layout();
+ p_main_interface->frame_sizer->Fit( p_main_interface );
+
+ p_main_interface->TogglePlayButton( PAUSE_S );
+ i_old_playing_status = PAUSE_S;
- p_main_interface->statusbar->SetStatusText( "", 1 );
+ p_main_interface->statusbar->SetStatusText( wxT(""), 0 );
+ p_main_interface->statusbar->SetStatusText( wxT(""), 2 );
- vlc_object_release( p_intf->p_sys->p_input );
p_intf->p_sys->p_input = NULL;
}
if( p_intf->p_sys->p_input )
{
input_thread_t *p_input = p_intf->p_sys->p_input;
-
- vlc_mutex_lock( &p_input->stream.stream_lock );
+ vlc_value_t val;
if( !p_input->b_die )
{
+ vlc_value_t pos;
+
/* New input or stream map change */
- if( p_input->stream.b_changed )
+ p_intf->p_sys->b_playing = 1;
+
+ /* Update the item name */
+ p_main_interface->statusbar->SetStatusText(
+ wxU(p_intf->p_sys->p_input->input.p_item->psz_name), 2 );
+
+ /* Manage the slider */
+ /* FIXME --fenrir */
+ /* Change the name of b_old_seekable into b_show_bar or something like that */
+ var_Get( p_input, "position", &pos );
+
+ vlc_value_t val;
+ var_Change( p_input, "title", VLC_VAR_CHOICESCOUNT, &val, NULL );
+ if( val.i_int > 0 && !b_disc_shown )
+ {
+ b_disc_shown = VLC_TRUE;
+ vlc_value_t val;
+
+ #define HELP_MENU N_("Menu")
+ #define HELP_PCH N_("Previous chapter")
+ #define HELP_NCH N_("Next chapter")
+ #define HELP_PTR N_("Previous track")
+ #define HELP_NTR N_("Next track")
+
+ var_Change( p_input, "chapter", VLC_VAR_CHOICESCOUNT, &val,
+ NULL );
+
+ if( val.i_int > 0 )
+ {
+ p_main_interface->disc_menu_button->Show();
+ p_main_interface->disc_sizer->Show(
+ p_main_interface->disc_menu_button );
+ p_main_interface->disc_sizer->Layout();
+ p_main_interface->disc_sizer->Fit(
+ p_main_interface->disc_frame );
+
+ p_main_interface->disc_menu_button->SetToolTip(
+ wxU(_( HELP_MENU ) ) );
+ p_main_interface->disc_prev_button->SetToolTip(
+ wxU(_( HELP_PCH ) ) );
+ p_main_interface->disc_next_button->SetToolTip(
+ wxU(_( HELP_NCH ) ) );
+ }
+ else
+ {
+ p_main_interface->disc_menu_button->Hide();
+ p_main_interface->disc_sizer->Hide(
+ p_main_interface->disc_menu_button );
+
+ p_main_interface->disc_prev_button->SetToolTip(
+ wxU(_( HELP_PTR ) ) );
+ p_main_interface->disc_next_button->SetToolTip(
+ wxU(_( HELP_NTR ) ) );
+ }
+
+ p_main_interface->disc_frame->Show();
+ p_main_interface->slider_sizer->Show(
+ p_main_interface->disc_frame );
+ }
+
+ if( ! b_old_seekable )
{
- wxModeManage( p_intf );
- wxSetupMenus( p_intf );
- p_intf->p_sys->b_playing = 1;
+ if( pos.f_float > 0.0 )
+ {
+ /* Done like this, as it's the only way to know if the */
+ /* slider has to be displayed */
+ b_old_seekable = VLC_TRUE;
+ p_main_interface->slider_frame->Show();
+ p_main_interface->frame_sizer->Show(
+ p_main_interface->slider_frame );
+ p_main_interface->frame_sizer->Layout();
+ p_main_interface->frame_sizer->Fit( p_main_interface );
+ }
}
- /* Manage the slider */
- if( p_input->stream.b_seekable && p_intf->p_sys->b_playing )
+ if( p_intf->p_sys->b_playing && b_old_seekable )
{
+ /* Update the slider if the user isn't dragging it. */
+ if( p_intf->p_sys->b_slider_free )
+ {
+ char psz_time[ MSTRTIME_MAX_SIZE ];
+ char psz_total[ MSTRTIME_MAX_SIZE ];
+ vlc_value_t time;
+ mtime_t i_seconds;
- stream_position_t position;
+ /* Update the value */
+ if( pos.f_float >= 0.0 )
+ {
+ p_intf->p_sys->i_slider_pos =
+ (int)(SLIDER_MAX_POS * pos.f_float);
+
+ p_main_interface->slider->SetValue(
+ p_intf->p_sys->i_slider_pos );
- /* If the user hasn't touched the slider since the last time,
- * then the input can safely change it */
- if( p_intf->p_sys->i_slider_pos ==
- p_intf->p_sys->i_slider_oldpos )
+ var_Get( p_intf->p_sys->p_input, "time", &time );
+ i_seconds = time.i_time / 1000000;
+ secstotimestr ( psz_time, i_seconds );
+
+ var_Get( p_intf->p_sys->p_input, "length", &time );
+ i_seconds = time.i_time / 1000000;
+ secstotimestr ( psz_total, i_seconds );
+
+ p_main_interface->statusbar->SetStatusText(
+ wxU(psz_time) + wxString(wxT(" / ")) +
+ wxU(psz_total), 0 );
+ }
+ }
+ }
+#if 0
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ if( p_intf->p_sys->p_input->stream.b_seekable && !b_old_seekable )
+ {
+ /* Done like this because b_seekable is set slightly after
+ * the new input object is available. */
+ b_old_seekable = VLC_TRUE;
+ p_main_interface->slider_frame->Show();
+ p_main_interface->frame_sizer->Show(
+ p_main_interface->slider_frame );
+ p_main_interface->frame_sizer->Layout();
+ p_main_interface->frame_sizer->Fit( p_main_interface );
+ }
+ if( p_input->stream.b_seekable && p_intf->p_sys->b_playing )
+ {
+ /* Update the slider if the user isn't dragging it. */
+ if( p_intf->p_sys->b_slider_free )
{
+ vlc_value_t pos;
+ char psz_time[ MSTRTIME_MAX_SIZE ];
+ char psz_total[ MSTRTIME_MAX_SIZE ];
+ vlc_value_t time;
+ mtime_t i_seconds;
+
/* Update the value */
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- input_Tell( p_input, &position );
- vlc_mutex_lock( &p_input->stream.stream_lock );
- p_intf->p_sys->i_slider_oldpos =
- ( 100 * position.i_tell ) / position.i_size;
-
- if( p_intf->p_sys->i_slider_pos !=
- p_intf->p_sys->i_slider_oldpos )
+ var_Get( p_input, "position", &pos );
+ if( pos.f_float >= 0.0 )
{
p_intf->p_sys->i_slider_pos =
- p_intf->p_sys->i_slider_oldpos;
+ (int)(SLIDER_MAX_POS * pos.f_float);
p_main_interface->slider->SetValue(
p_intf->p_sys->i_slider_pos );
+
+ var_Get( p_intf->p_sys->p_input, "time", &time );
+ i_seconds = time.i_time / 1000000;
+ secstotimestr ( psz_time, i_seconds );
+
+ var_Get( p_intf->p_sys->p_input, "length", &time );
+ i_seconds = time.i_time / 1000000;
+ secstotimestr ( psz_total, i_seconds );
+
+ p_main_interface->statusbar->SetStatusText(
+ wxU(psz_time) + wxString(wxT(" / ")) +
+ wxU(psz_total), 0 );
}
}
+ }
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+#endif
+ /* Take care of the volume, etc... */
+ p_main_interface->Update();
- /* Otherwise, send message to the input if the user has
- * finished dragging the slider */
- else if( p_intf->p_sys->b_slider_free )
+ /* Manage Playing status */
+ var_Get( p_input, "state", &val );
+ if( i_old_playing_status != val.i_int )
+ {
+ if( val.i_int == PAUSE_S )
+ {
+ p_main_interface->TogglePlayButton( PAUSE_S );
+ }
+ else
{
- /* release the lock to be able to seek */
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- input_Seek( p_input, p_intf->p_sys->i_slider_pos,
- INPUT_SEEK_PERCENT | INPUT_SEEK_SET );
- vlc_mutex_lock( &p_input->stream.stream_lock );
-
- /* Update the old value */
- p_intf->p_sys->i_slider_oldpos =
- p_intf->p_sys->i_slider_pos;
+ p_main_interface->TogglePlayButton( PLAYING_S );
}
+ i_old_playing_status = val.i_int;
}
- if( p_intf->p_sys->i_part !=
- p_input->stream.p_selected_area->i_part )
+ /* Manage Speed status */
+ var_Get( p_input, "rate", &val );
+ if( i_old_rate != val.i_int )
{
- p_intf->p_sys->b_chapter_update = 1;
- wxSetupMenus( p_intf );
+ p_main_interface->statusbar->SetStatusText(
+ wxString::Format(wxT("x%.2f"),
+ (float)INPUT_RATE_DEFAULT / val.i_int ), 1 );
+ i_old_rate = val.i_int;
}
}
- vlc_mutex_unlock( &p_input->stream.stream_lock );
}
else if( p_intf->p_sys->b_playing && !p_intf->b_die )
{
- wxModeManage( p_intf );
p_intf->p_sys->b_playing = 0;
+ p_main_interface->TogglePlayButton( PAUSE_S );
+ i_old_playing_status = PAUSE_S;
+ }
+
+ /* Show the interface, if requested */
+ if( p_intf->p_sys->b_intf_show )
+ {
+ p_main_interface->Raise();
+ p_intf->p_sys->b_intf_show = VLC_FALSE;
}
if( p_intf->b_die )
vlc_mutex_unlock( &p_intf->change_lock );
}
+
+/*****************************************************************************
+ * PopupMenuCB: callback triggered by the intf-popupmenu playlist variable.
+ * We don't show the menu directly here because we don't want the
+ * caller to block for a too long time.
+ *****************************************************************************/
+static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
+ vlc_value_t old_val, vlc_value_t new_val, void *param )
+{
+ intf_thread_t *p_intf = (intf_thread_t *)param;
+
+ if( p_intf->p_sys->pf_show_dialog )
+ {
+ p_intf->p_sys->pf_show_dialog( p_intf, INTF_DIALOG_POPUPMENU,
+ new_val.b_bool, 0 );
+ }
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * IntfShowCB: callback triggered by the intf-show playlist variable.
+ *****************************************************************************/
+static int IntfShowCB( vlc_object_t *p_this, const char *psz_variable,
+ vlc_value_t old_val, vlc_value_t new_val, void *param )
+{
+ intf_thread_t *p_intf = (intf_thread_t *)param;
+ p_intf->p_sys->b_intf_show = VLC_TRUE;
+
+ return VLC_SUCCESS;
+}