#include <vlc/aout.h>
#include <vlc/vout.h>
#include <vlc/intf.h>
-#include "stream_control.h"
#include "wxwindows.h"
#include "bitmaps/eject.xpm"
#include "bitmaps/slow.xpm"
#include "bitmaps/fast.xpm"
+#include "bitmaps/playlist.xpm"
#include "bitmaps/speaker.xpm"
#define TOOLBAR_BMP_WIDTH 16
wxPoint = wxDefaultPosition, wxSize = wxSize( 20, -1 ) );
virtual ~wxVolCtrl() {};
- void Change( int i_volume );
+ void UpdateVolume();
void OnChange( wxMouseEvent& event );
OpenOther_Event,
EjectDisc_Event,
- StreamWizard_Event,
Wizard_Event,
Playlist_Event,
Prefs_Event,
Extended_Event,
+// Undock_Event,
Bookmarks_Event,
Skins_Event,
SlowStream_Event,
FastStream_Event,
- Adjust_Event,
- RestoreDefaults_Event,
- Hue_Event,
- Contrast_Event,
- Brightness_Event,
- Saturation_Event,
- Gamma_Event,
-
- Ratio_Event,
- Visual_Event,
-
/* it is important for the id corresponding to the "About" command to have
* this standard value as otherwise it won't be handled properly under Mac
* (where it is special and put into the "Apple" menu) */
EVT_MENU_OPEN(Interface::OnMenuOpen)
- EVT_MENU( Extended_Event, Interface::OnExtended)
- EVT_MENU( Bookmarks_Event, Interface::OnShowDialog)
+ EVT_MENU( Extended_Event, Interface::OnExtended )
+// EVT_MENU( Undock_Event, Interface::OnUndock )
- EVT_CHECKBOX( Adjust_Event, Interface::OnEnableAdjust)
- EVT_BUTTON( RestoreDefaults_Event, Interface::OnRestoreDefaults)
- EVT_TEXT( Ratio_Event, Interface::OnRatio)
- EVT_CHECKBOX( Visual_Event, Interface::OnEnableVisual)
+ EVT_MENU( Bookmarks_Event, Interface::OnShowDialog)
#if defined( __WXMSW__ ) || defined( __WXMAC__ )
EVT_CONTEXT_MENU(Interface::OnContextMenu2)
EVT_MENU(OpenNet_Event, Interface::OnShowDialog)
EVT_MENU(OpenCapture_Event, Interface::OnShowDialog)
EVT_MENU(OpenSat_Event, Interface::OnShowDialog)
- EVT_MENU(StreamWizard_Event, Interface::OnShowDialog)
EVT_MENU(Wizard_Event, Interface::OnShowDialog)
EVT_MENU(StopStream_Event, Interface::OnStopStream)
EVT_MENU(PlayStream_Event, Interface::OnPlayStream)
/* Slider events */
EVT_COMMAND_SCROLL(SliderScroll_Event, Interface::OnSliderUpdate)
-
- EVT_COMMAND_SCROLL(Hue_Event, Interface::OnAdjustUpdate)
- EVT_COMMAND_SCROLL(Contrast_Event, Interface::OnAdjustUpdate)
- EVT_COMMAND_SCROLL(Brightness_Event, Interface::OnAdjustUpdate)
- EVT_COMMAND_SCROLL(Saturation_Event, Interface::OnAdjustUpdate)
- EVT_COMMAND_SCROLL(Gamma_Event, Interface::OnAdjustUpdate)
/* Custom events */
EVT_COMMAND(0, wxEVT_INTF, Interface::OnControlEvent)
p_intf = _p_intf;
i_old_playing_status = PAUSE_S;
b_extra = VLC_FALSE;
+// b_undock = VLC_FALSE;
+
+ extra_window = NULL;
/* Give our interface a nice little icon */
SetIcon( wxIcon( vlc_xpm ) );
wxWindow *p_dummy = new wxWindow( this, 0, wxDefaultPosition,
wxSize(0,0) );
p_dummy->SetFocus();
- frame_sizer->Add( p_dummy, 0, wxEXPAND );
+ frame_sizer->Add( p_dummy, 0, 0 );
/* Creation of the menu bar */
CreateOurMenuBar();
CreateOurToolBar();
/* Create the extra panel */
- CreateOurExtendedPanel();
+ extra_frame = new ExtraPanel( p_intf, this );
frame_sizer->Add( extra_frame, 0, wxEXPAND , 0 );
frame_sizer->Hide( extra_frame );
SetDropTarget( new DragAndDrop( p_intf ) );
#endif
- UpdateAcceleratorTable();
+ SetupHotkeys();
/* Start timer */
timer = new Timer( p_intf, this );
delete timer;
}
+void Interface::Init()
+{
+ /* Misc init */
+ SetupHotkeys();
+}
+
+void Interface::Update()
+{
+ /* Misc updates */
+ ((wxVolCtrl *)volctrl)->UpdateVolume();
+}
+
void Interface::OnControlEvent( wxCommandEvent& event )
{
switch( event.GetId() )
wxU(_("Open &Capture Device...\tCtrl-C")) );
file_menu->AppendSeparator();
- file_menu->Append( StreamWizard_Event,
- wxU(_("Streaming &Wizard...\tCtrl-W")) );
-#if 0
- file_menu->Append( Wizard_Event, wxU(_("New Wizard...")) );
-#endif
+ file_menu->Append( Wizard_Event, wxU(_("&Wizard...\tCtrl-W")) );
file_menu->AppendSeparator();
file_menu->Append( Exit_Event, wxU(_("E&xit\tCtrl-X")) );
menubar->GetTextExtent( menubar->GetLabelTop(i), &i_width, &i_height );
i_size += i_width +
#if defined(__WXGTK__)
- 20 /* approximate margin */;
+ 22 /* approximate margin */;
#else
+#if (wxMAJOR_VERSION <= 2) && (wxMINOR_VERSION <= 5) && (wxRELEASE_NUMBER < 3)
4 /* approximate margin */;
+#else
+ 18 /* approximate margin */;
+#endif
#endif
}
frame_sizer->SetMinSize( i_size, -1 );
private:
DECLARE_EVENT_TABLE()
+ int i_y_offset;
};
BEGIN_EVENT_TABLE(VLCVolCtrl, wxControl)
EVT_PAINT(VLCVolCtrl::OnPaint)
END_EVENT_TABLE()
+#if defined(__WXGTK__)
+#define VLCVOL_HEIGHT p_parent->GetSize().GetHeight()
+#else
+#define VLCVOL_HEIGHT TOOLBAR_BMP_HEIGHT
+#endif
VLCVolCtrl::VLCVolCtrl( intf_thread_t *p_intf, wxWindow *p_parent,
wxGauge **pp_volctrl )
- :wxControl( p_parent, -1, wxDefaultPosition, wxSize(64, 16 ), wxBORDER_NONE )
+ :wxControl( p_parent, -1, wxDefaultPosition, wxSize(64, VLCVOL_HEIGHT ),
+ wxBORDER_NONE ),
+ i_y_offset((VLCVOL_HEIGHT - TOOLBAR_BMP_HEIGHT) / 2)
{
- *pp_volctrl = new wxVolCtrl( p_intf, this, -1, wxPoint(18,0),
- wxSize(44,16) );
+ *pp_volctrl = new wxVolCtrl( p_intf, this, -1, wxPoint( 18, i_y_offset ),
+ wxSize( 44, TOOLBAR_BMP_HEIGHT ) );
}
void VLCVolCtrl::OnPaint( wxPaintEvent &evt )
{
wxPaintDC dc( this );
wxBitmap mPlayBitmap( speaker_xpm );
- dc.DrawBitmap( mPlayBitmap, 1, 0, TRUE );
+ dc.DrawBitmap( mPlayBitmap, 0, i_y_offset, TRUE );
}
void Interface::CreateOurToolBar()
{
+#define HELP_OPEN N_("Open")
#define HELP_STOP N_("Stop")
#define HELP_PLAY N_("Play")
#define HELP_PAUSE N_("Pause")
* version because we don't include wx.rc */
wxToolBar *toolbar =
- CreateToolBar( wxTB_HORIZONTAL | wxTB_FLAT | wxTB_DOCKABLE );
+ CreateToolBar( wxTB_HORIZONTAL | wxTB_FLAT ); //| wxTB_DOCKABLE );
toolbar->SetToolBitmapSize( wxSize(TOOLBAR_BMP_WIDTH,TOOLBAR_BMP_HEIGHT) );
+ toolbar->AddTool( OpenFile_Event, wxT(""),
+ wxBitmap( eject_xpm ), wxU(_(HELP_OPEN)) );
+ toolbar->AddSeparator();
toolbar->AddTool( PlayStream_Event, wxT(""), wxBitmap( play_xpm ),
wxU(_(HELP_PLAY)) );
#if 0
toolbar->AddTool( NextStream_Event, wxT(""), wxBitmap( next_xpm ),
wxU(_(HELP_PLN)) );
toolbar->AddSeparator();
- toolbar->AddTool( Playlist_Event, wxT(""), wxBitmap( eject_xpm ),
+ toolbar->AddTool( Playlist_Event, wxT(""), wxBitmap( playlist_xpm ),
wxU(_(HELP_PLO)) );
wxControl *p_dummy_ctrl =
new wxControl( toolbar, -1, wxDefaultPosition,
- wxSize(64, 16 ), wxBORDER_NONE );
+ wxSize(35, 16 ), wxBORDER_NONE );
toolbar->AddControl( p_dummy_ctrl );
}
-void Interface::CreateOurExtendedPanel()
+static int ConvertHotkeyModifiers( int i_hotkey )
{
- char *psz_filters;
-
- extra_frame = new wxPanel( this, -1, wxDefaultPosition, wxDefaultSize );
- extra_frame->SetAutoLayout( TRUE );
- wxBoxSizer *extra_sizer = new wxBoxSizer( wxHORIZONTAL );
-
- /* Create static box to surround the adjust controls */
- wxStaticBox *adjust_box =
- new wxStaticBox( extra_frame, -1, wxU(_("Adjust Image")) );
-
- /* Create the size for the frame */
- wxStaticBoxSizer *adjust_sizer =
- new wxStaticBoxSizer( adjust_box, wxVERTICAL );
- adjust_sizer->SetMinSize( -1, 50 );
-
- /* Create flex grid */
- wxFlexGridSizer *adjust_gridsizer =
- new wxFlexGridSizer( 6, 2, 0, 0);
- adjust_gridsizer->AddGrowableCol(1);
-
- /* Create every controls */
-
- /* Create the adjust button */
- wxCheckBox * adjust_check = new wxCheckBox( extra_frame, Adjust_Event,
- wxU(_("Enable")));
-
- /* Create the restore to defaults button */
- restoredefaults_button =
- new wxButton( extra_frame, RestoreDefaults_Event,
- wxU(_("Restore Defaults")), wxDefaultPosition);
-
- wxStaticText *hue_text = new wxStaticText( extra_frame, -1,
- wxU(_("Hue")) );
- hue_slider = new wxSlider ( extra_frame, Hue_Event, 0, 0,
- 360, wxDefaultPosition, wxDefaultSize );
-
-
- wxStaticText *contrast_text = new wxStaticText( extra_frame, -1,
- wxU(_("Contrast")) );
- contrast_slider = new wxSlider ( extra_frame, Contrast_Event, 0, 0,
- 200, wxDefaultPosition, wxDefaultSize);
-
- wxStaticText *brightness_text = new wxStaticText( extra_frame, -1,
- wxU(_("Brightness")) );
- brightness_slider = new wxSlider ( extra_frame, Brightness_Event, 0, 0,
- 200, wxDefaultPosition, wxDefaultSize) ;
-
- wxStaticText *saturation_text = new wxStaticText( extra_frame, -1,
- wxU(_("Saturation")) );
- saturation_slider = new wxSlider ( extra_frame, Saturation_Event, 0, 0,
- 300, wxDefaultPosition, wxDefaultSize );
-
- wxStaticText *gamma_text = new wxStaticText( extra_frame, -1,
- wxU(_("Gamma")) );
- gamma_slider = new wxSlider ( extra_frame, Gamma_Event, 0, 0,
- 100, wxDefaultPosition, wxDefaultSize );
-
- adjust_gridsizer->Add(adjust_check, 1, wxEXPAND, 0);
- adjust_gridsizer->Add(restoredefaults_button, 1, wxEXPAND, 0);
- adjust_gridsizer->Add(hue_text, 1, wxEXPAND, 0);
- adjust_gridsizer->Add(hue_slider, 1, wxEXPAND, 0);
- adjust_gridsizer->Add(contrast_text, 1, wxEXPAND, 0);
- adjust_gridsizer->Add(contrast_slider, 1, wxEXPAND, 0);
- adjust_gridsizer->Add(brightness_text, 1, wxEXPAND, 0);
- adjust_gridsizer->Add(brightness_slider, 1, wxEXPAND, 0);
- adjust_gridsizer->Add(saturation_text, 1, wxEXPAND, 0);
- adjust_gridsizer->Add(saturation_slider, 1, wxEXPAND, 0);
- adjust_gridsizer->Add(gamma_text, 1, wxEXPAND, 0);
- adjust_gridsizer->Add(gamma_slider, 1, wxEXPAND, 0);
-
- adjust_sizer->Add(adjust_gridsizer,1,wxEXPAND, 0);
-
- extra_sizer->Add(adjust_sizer,1,wxBOTTOM,5);
-
- /* Create sizer to surround the other controls */
- wxBoxSizer *other_sizer = new wxBoxSizer( wxVERTICAL );
-
-
- wxStaticBox *video_box =
- new wxStaticBox( extra_frame, -1, wxU(_("Video Options")) );
- /* Create the sizer for the frame */
- wxStaticBoxSizer *video_sizer =
- new wxStaticBoxSizer( video_box, wxVERTICAL );
- video_sizer->SetMinSize( -1, 50 );
-
- static const wxString ratio_array[] =
- {
- wxT("4:3"),
- wxT("16:9"),
- };
-
- wxBoxSizer *ratio_sizer = new wxBoxSizer( wxHORIZONTAL );
- wxStaticText *ratio_text = new wxStaticText( extra_frame, -1,
- wxU(_("Aspect Ratio")) );
-
- ratio_combo = new wxComboBox( extra_frame, Ratio_Event, wxT(""),
- wxDefaultPosition, wxSize(120,-1),
- WXSIZEOF(ratio_array), ratio_array,
- 0 );
-
- ratio_sizer->Add( ratio_text, 0, wxALL, 2 );
- ratio_sizer->Add( ratio_combo, 0, wxALL, 2 );
- ratio_sizer->Layout();
+ int i_accel_flags = 0;
+ if( i_hotkey & KEY_MODIFIER_ALT ) i_accel_flags |= wxACCEL_ALT;
+ if( i_hotkey & KEY_MODIFIER_CTRL ) i_accel_flags |= wxACCEL_CTRL;
+ if( i_hotkey & KEY_MODIFIER_SHIFT ) i_accel_flags |= wxACCEL_SHIFT;
+ if( !i_accel_flags ) i_accel_flags = wxACCEL_NORMAL;
+ return i_accel_flags;
+}
- video_sizer->Add( ratio_sizer , 0 , wxALL , 0 );
- video_sizer->Layout();
+static int ConvertHotkey( int i_hotkey )
+{
+ int i_key = i_hotkey & ~KEY_MODIFIER;
+ if( i_key & KEY_ASCII ) return i_key & KEY_ASCII;
+ else if( i_key & KEY_SPECIAL )
+ {
+ switch ( i_key )
+ {
+ case KEY_LEFT: return WXK_LEFT;
+ case KEY_RIGHT: return WXK_RIGHT;
+ case KEY_UP: return WXK_UP;
+ case KEY_DOWN: return WXK_DOWN;
+ case KEY_SPACE: return WXK_SPACE;
+ case KEY_ENTER: return WXK_RETURN;
+ case KEY_F1: return WXK_F1;
+ case KEY_F2: return WXK_F2;
+ case KEY_F3: return WXK_F3;
+ case KEY_F4: return WXK_F4;
+ case KEY_F5: return WXK_F5;
+ case KEY_F6: return WXK_F6;
+ case KEY_F7: return WXK_F7;
+ case KEY_F8: return WXK_F8;
+ case KEY_F9: return WXK_F9;
+ case KEY_F10: return WXK_F10;
+ case KEY_F11: return WXK_F11;
+ case KEY_F12: return WXK_F12;
+ case KEY_HOME: return WXK_HOME;
+ case KEY_END: return WXK_HOME;
+ case KEY_MENU: return WXK_MENU;
+ case KEY_ESC: return WXK_ESCAPE;
+ case KEY_PAGEUP: return WXK_PRIOR;
+ case KEY_PAGEDOWN: return WXK_NEXT;
+ case KEY_TAB: return WXK_TAB;
+ case KEY_BACKSPACE: return WXK_BACK;
+ }
+ }
+ return WXK_F24;
+}
-#if 0
- wxBoxSizer *visual_sizer = new wxBoxSizer( wxHORIZONTAL );
+void Interface::SetupHotkeys()
+{
+ struct vlc_t::hotkey *p_hotkeys = p_intf->p_vlc->p_hotkeys;
+ int i_hotkeys;
- wxCheckBox *visual_checkbox = new wxCheckBox( extra_frame, Visual_Event,
- wxU(_("Visualizations")) );
+ /* Count number of hoteys */
+ for( i_hotkeys = 0; p_hotkeys[i_hotkeys].psz_action != NULL; i_hotkeys++ );
- visual_sizer->Add( visual_checkbox, 0, wxEXPAND, 0);
- visual_sizer->Layout();
+ p_intf->p_sys->i_first_hotkey_event = wxID_HIGHEST + 7000;
+ p_intf->p_sys->i_hotkeys = i_hotkeys;
- wxStaticBox *audio_box =
- new wxStaticBox( extra_frame, -1, wxU(_("Audio Options")) );
- /* Create the sizer for the frame */
- wxStaticBoxSizer *audio_sizer =
- new wxStaticBoxSizer( audio_box, wxVERTICAL );
- audio_sizer->SetMinSize( -1, 50 );
+ wxAcceleratorEntry p_entries[i_hotkeys];
- audio_sizer->Add( visual_sizer, 0, wxALL, 0);
- audio_sizer->Layout();
+ /* Setup the hotkeys as accelerators */
+ for( int i = 0; i < i_hotkeys; i++ )
+ {
+ int i_mod = ConvertHotkeyModifiers( p_hotkeys[i].i_key );
+ int i_key = ConvertHotkey( p_hotkeys[i].i_key );
- other_sizer->Add( audio_sizer , 0 , wxALL | wxEXPAND , 0 );
+#ifdef WIN32
+ if( i_mod ) i_key = toupper(i_key);
#endif
- other_sizer->Add( video_sizer, 0, wxALL | wxEXPAND , 0);
- other_sizer->Layout();
- extra_sizer->Add(other_sizer,0,wxBOTTOM,5);
-
- extra_frame->SetSizer( extra_sizer );
-
- /* Layout the whole panel */
- extra_sizer->Layout();
+ p_entries[i].Set( i_mod, i_key,
+ p_intf->p_sys->i_first_hotkey_event + i );
+ }
- extra_sizer->SetSizeHints(extra_frame);
+ wxAcceleratorTable accel( i_hotkeys, p_entries );
- /* Write down initial values */
-#if 0
- psz_filters = config_GetPsz( p_intf, "audio-filter" );
- if( psz_filters && strstr( psz_filters, "visual" ) )
- {
- visual_checkbox->SetValue(1);
- }
- if( psz_filters ) free( psz_filters );
-#endif
- psz_filters = config_GetPsz( p_intf, "filter" );
- if( psz_filters && strstr( psz_filters, "adjust" ) )
+ if( !accel.Ok() )
{
- adjust_check->SetValue( 1 );
- restoredefaults_button->Enable();
- saturation_slider->Enable();
- contrast_slider->Enable();
- brightness_slider->Enable();
- hue_slider->Enable();
- gamma_slider->Enable();
+ msg_Err( p_intf, "invalid accelerator table" );
}
else
{
- adjust_check->SetValue( 0 );
- restoredefaults_button->Disable();
- saturation_slider->Disable();
- contrast_slider->Disable();
- brightness_slider->Disable();
- hue_slider->Disable();
- gamma_slider->Disable();
+ SetAcceleratorTable( accel );
+ msg_Dbg( p_intf, "accelerator table loaded" );
}
- if( psz_filters ) free( psz_filters );
-
- int i_value = config_GetInt( p_intf, "hue" );
- if( i_value > 0 && i_value < 360 )
- hue_slider->SetValue( i_value );
-
- float f_value;
- f_value = config_GetFloat( p_intf, "saturation" );
- if( f_value > 0 && f_value < 5 )
- saturation_slider->SetValue( (int)(100 * f_value) );
- f_value = config_GetFloat( p_intf, "contrast" );
- if( f_value > 0 && f_value < 4 )
- contrast_slider->SetValue( (int)(100 * f_value) );
- f_value = config_GetFloat( p_intf, "brightness" );
- if( f_value > 0 && f_value < 2 )
- brightness_slider->SetValue( (int)(100 * f_value) );
- f_value = config_GetFloat( p_intf, "gamma" );
- if( f_value > 0 && f_value < 10 )
- gamma_slider->SetValue( (int)(10 * f_value) );
-
- extra_frame->Hide();
-}
-
-void Interface::UpdateAcceleratorTable()
-{
- /* Set some hotkeys */
- wxAcceleratorEntry entries[7];
- vlc_value_t val;
- int i = 0;
-
- var_Get( p_intf->p_vlc, "key-quit", &val );
- entries[i++].Set( ConvertHotkeyModifiers( val.i_int ),
- ConvertHotkey( val.i_int ), Exit_Event );
- var_Get( p_intf->p_vlc, "key-stop", &val );
- entries[i++].Set( ConvertHotkeyModifiers( val.i_int ),
- ConvertHotkey( val.i_int ), StopStream_Event );
- var_Get( p_intf->p_vlc, "key-play-pause", &val );
- entries[i++].Set( ConvertHotkeyModifiers( val.i_int ),
- ConvertHotkey( val.i_int ), PlayStream_Event );
- var_Get( p_intf->p_vlc, "key-next", &val );
- entries[i++].Set( ConvertHotkeyModifiers( val.i_int ),
- ConvertHotkey( val.i_int ), NextStream_Event );
- var_Get( p_intf->p_vlc, "key-prev", &val );
- entries[i++].Set( ConvertHotkeyModifiers( val.i_int ),
- ConvertHotkey( val.i_int ), PrevStream_Event );
- var_Get( p_intf->p_vlc, "key-faster", &val );
- entries[i++].Set( ConvertHotkeyModifiers( val.i_int ),
- ConvertHotkey( val.i_int ), FastStream_Event );
- var_Get( p_intf->p_vlc, "key-slower", &val );
- entries[i++].Set( ConvertHotkeyModifiers( val.i_int ),
- ConvertHotkey( val.i_int ), SlowStream_Event );
-
- wxAcceleratorTable accel( 7, entries );
-
- if( !accel.Ok() )
- msg_Err( p_intf, "invalid accelerator table" );
-
- SetAcceleratorTable( accel );
- msg_Dbg( p_intf, "accelerator table loaded" );
-
}
/*****************************************************************************
/* Add static items */
p_settings_menu->AppendCheckItem( Extended_Event,
wxU(_("&Extended GUI") ) );
- p_settings_menu->AppendCheckItem( Bookmarks_Event,
- wxU(_("&Bookmarks...") ) );
+ if( b_extra ) p_settings_menu->Check( Extended_Event, TRUE );
+#if 0
+ p_settings_menu->AppendCheckItem( Undock_Event,
+ wxU(_("&Undock Ext. GUI") ) );
+ if( b_undock ) p_settings_menu->Check( Undock_Event, TRUE );
+#endif
+ p_settings_menu->Append( Bookmarks_Event, wxU(_("&Bookmarks...") ) );
p_settings_menu->Append( Prefs_Event, wxU(_("&Preferences...")) );
}
void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
{
wxString msg;
- msg.Printf( wxString(wxT("VLC media player " VERSION)) +
+ msg.Printf( wxString(wxT("VLC media player " PACKAGE_VERSION)) +
wxU(_(" (wxWindows interface)\n\n")) +
wxU(_("(c) 1996-2004 - the VideoLAN Team\n\n")) +
wxU( vlc_wraptext(INTF_ABOUT_MSG,WRAPCOUNT,ISUTF8) ) + wxT("\n\n") +
case Prefs_Event:
i_id = INTF_DIALOG_PREFS;
break;
- case StreamWizard_Event:
- i_id = INTF_DIALOG_STREAMWIZARD;
- break;
case Wizard_Event:
i_id = INTF_DIALOG_WIZARD;
break;
void Interface::OnExtended(wxCommandEvent& event)
{
- if( b_extra == VLC_FALSE)
+ b_extra = (b_extra == VLC_TRUE ? VLC_FALSE : VLC_TRUE );
+
+ if( b_extra == VLC_FALSE )
{
- extra_frame->Show();
- frame_sizer->Show( extra_frame );
- b_extra = VLC_TRUE;
+ extra_frame->Hide();
+ frame_sizer->Hide( extra_frame );
}
else
{
- extra_frame->Hide();
- frame_sizer->Hide( extra_frame );
- b_extra = VLC_FALSE;
+ extra_frame->Show();
+ frame_sizer->Show( extra_frame );
}
frame_sizer->Layout();
frame_sizer->Fit(this);
}
-void Interface::OnEnableAdjust(wxCommandEvent& event)
-{
- char *psz_filters=config_GetPsz( p_intf, "filter");
- char *psz_new = NULL;
- if( event.IsChecked() )
- {
- if(psz_filters == NULL)
+#if 0
+ if( b_undock == VLC_TRUE )
{
- psz_new = strdup( "adjust" );
+ fprintf(stderr,"Deleting window\n");
+ if( extra_window )
+ {
+ delete extra_window;
+ extra_window = NULL;
+ }
}
else
{
- psz_new= (char *) malloc(strlen(psz_filters) + 8 );
- sprintf( psz_new, "%s:adjust", psz_filters);
+ extra_frame->Hide();
+ frame_sizer->Hide( extra_frame );
+ frame_sizer->Layout();
+ frame_sizer->Fit(this);
}
- config_PutPsz( p_intf, "filter", psz_new );
- vlc_value_t val;
- vout_thread_t *p_vout =
- (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
- if( p_vout != NULL )
- {
- val.psz_string = strdup( psz_new );
- var_Set( p_vout, "filter", val);
- vlc_object_release( p_vout );
- }
- if( val.psz_string ) free( val.psz_string );
- restoredefaults_button->Enable();
- brightness_slider->Enable();
- saturation_slider->Enable();
- contrast_slider->Enable();
- hue_slider->Enable();
- gamma_slider->Enable();
}
else
{
- if( psz_filters != NULL )
+ if( b_undock == VLC_TRUE )
{
-
- char *psz_current;
- unsigned int i=0;
- for( i = 0; i< strlen(psz_filters ); i++)
- {
- if ( !strncasecmp( &psz_filters[i],"adjust",6 ))
- {
- if(i > 0)
- if( psz_filters[i-1] == ':' ) i--;
- psz_current = strchr( &psz_filters[i+1] , ':' );
- if( !psz_current )
- psz_filters[i] = '\0';
- else
- {
- memmove( &psz_filters[i] , psz_current,
- &psz_filters[strlen(psz_filters)]-psz_current
- +1);
- }
- }
- }
- config_PutPsz( p_intf, "filter", psz_filters);
- vlc_value_t val;
- val.psz_string = strdup( psz_filters );
- vout_thread_t *p_vout =
- (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
- if( p_vout != NULL )
+ fprintf(stderr,"Creating window\n");
+ extra_frame->Hide();
+ frame_sizer->Hide( extra_frame );
+ frame_sizer->Detach( extra_frame );
+ frame_sizer->Layout();
+ frame_sizer->Fit(this);
+ extra_window = new ExtraWindow( p_intf, this, extra_frame );
+ }
+ else
+ {
+ fprintf(stderr,"Deleting window\n");
+ if( extra_window )
{
- var_Set( p_vout, "filter", val);
- vlc_object_release( p_vout );
+ delete extra_window;
}
- if( val.psz_string ) free( val.psz_string );
+ extra_frame->Show();
+ frame_sizer->Show( extra_frame );
+ frame_sizer->Layout();
+ frame_sizer->Fit(this);
}
- restoredefaults_button->Disable();
- brightness_slider->Disable();
- saturation_slider->Disable();
- contrast_slider->Disable();
- hue_slider->Disable();
- gamma_slider->Disable();
}
- if(psz_filters) free(psz_filters);
- if(psz_new) free(psz_new);
}
-void Interface::OnRestoreDefaults( wxCommandEvent &event)
+void Interface::OnUndock(wxCommandEvent& event)
{
- hue_slider->SetValue(0);
- saturation_slider->SetValue(100);
- brightness_slider->SetValue(100);
- contrast_slider->SetValue(100),
- gamma_slider->SetValue(10);
-
- wxScrollEvent *hscroll_event = new wxScrollEvent(0, Hue_Event, 0);
- OnAdjustUpdate(*hscroll_event);
-
- wxScrollEvent *sscroll_event = new wxScrollEvent(0, Saturation_Event, 100);
- OnAdjustUpdate(*sscroll_event);
-
- wxScrollEvent *bscroll_event = new wxScrollEvent(0, Brightness_Event, 100);
- OnAdjustUpdate(*bscroll_event);
-
- wxScrollEvent *cscroll_event = new wxScrollEvent(0, Contrast_Event, 100);
- OnAdjustUpdate(*cscroll_event);
-
- wxScrollEvent *gscroll_event = new wxScrollEvent(0, Gamma_Event, 10);
- OnAdjustUpdate(*gscroll_event);
-
-}
+ b_undock = (b_undock == VLC_TRUE ? VLC_FALSE : VLC_TRUE );
-void Interface::OnAdjustUpdate( wxScrollEvent &event)
-{
- vout_thread_t *p_vout = (vout_thread_t *)vlc_object_find(p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE);
- if(p_vout == NULL)
- switch(event.GetId())
+ if( b_extra == VLC_TRUE )
+ {
+ if( b_undock == VLC_FALSE )
{
- case Hue_Event:
- config_PutInt( p_intf , "hue" , event.GetPosition() );
- break;
-
- case Saturation_Event:
- config_PutFloat( p_intf , "saturation" , (float)event.GetPosition()/100 );
- break;
-
- case Brightness_Event:
- config_PutFloat( p_intf , "brightness" , (float)event.GetPosition()/100 );
- break;
-
- case Contrast_Event:
- config_PutFloat( p_intf , "contrast" , (float)event.GetPosition()/100 );
- break;
-
- case Gamma_Event:
- config_PutFloat( p_intf , "gamma" , (float)event.GetPosition()/10 );
- break;
+ fprintf(stderr,"Deleting window\n");
+ if( extra_window )
+ {
+ delete extra_window;
+ extra_window = NULL;
+ }
+ extra_frame->Show();
+ frame_sizer->Show( extra_frame );
+ frame_sizer->Layout();
+ frame_sizer->Fit(this);
}
- else
- {
- vlc_value_t val;
- switch(event.GetId())
+ else
{
- case Hue_Event:
- val.i_int = event.GetPosition();
- var_Set(p_vout, "hue", val);
- break;
-
- case Saturation_Event:
- val.f_float = (float)event.GetPosition()/100;
- var_Set(p_vout, "saturation", val);
- break;
-
- case Brightness_Event:
- val.f_float = (float)event.GetPosition()/100;
- var_Set(p_vout, "brightness", val);
- break;
-
- case Contrast_Event:
- val.f_float = (float)event.GetPosition()/100;
- var_Set(p_vout, "contrast", val);
- break;
-
- case Gamma_Event:
- val.f_float = (float)event.GetPosition()/10;
- var_Set(p_vout, "gamma", val);
- break;
+ fprintf(stderr,"Creating window\n");
+ extra_frame->Hide();
+ frame_sizer->Hide( extra_frame );
+ frame_sizer->Detach( extra_frame );
+ frame_sizer->Layout();
+ frame_sizer->Fit(this);
+ extra_window = new ExtraWindow( p_intf, this, extra_frame );
}
- vlc_object_release(p_vout);
- }
-}
-
-void Interface::OnRatio( wxCommandEvent& event )
-{
- config_PutPsz( p_intf, "aspect-ratio", ratio_combo->GetValue().mb_str() );
-}
-
-void Interface::OnEnableVisual(wxCommandEvent& event)
-{
- if( event.IsChecked() )
- {
- config_PutPsz( p_intf, "audio-filter", "visual" );
- }
- else
- {
- config_PutPsz( p_intf, "audio-filter", "" );
}
}
+#endif
void Interface::OnPlayStream( wxCommandEvent& WXUNUSED(event) )
{
if( p_intf->p_sys->p_input )
{
/* Update stream date */
-#define p_area p_intf->p_sys->p_input->stream.p_selected_area
char psz_time[ MSTRTIME_MAX_SIZE ], psz_total[ MSTRTIME_MAX_SIZE ];
mtime_t i_seconds;
vlc_value_t val;
- var_Get( p_intf->p_sys->p_input, "length", &val );
- i_seconds = val.i_time / 1000000;
- secstotimestr ( psz_total, i_seconds );
+ i_seconds = var_GetTime( p_intf->p_sys->p_input, "length" ) / I64C(1000000 );
+ secstotimestr( psz_total, i_seconds );
- statusbar->SetStatusText(
- wxU(input_OffsetToTime( p_intf->p_sys->p_input,
- psz_time, p_area->i_size * event.GetPosition()
- / SLIDER_MAX_POS )) + wxString(wxT(" / ")) +
- wxU(psz_total), 0 );
-#undef p_area
+ i_seconds = var_GetTime( p_intf->p_sys->p_input, "time" ) / I64C(1000000 );
+ secstotimestr( psz_time, i_seconds );
+
+ statusbar->SetStatusText( wxU(psz_time)+ wxString(wxT(" / ")) + wxU(psz_total), 0 );
}
}
#endif
return;
}
- vlc_mutex_lock( &p_playlist->object_lock );
+ /* FIXME --fenrir */
+#if 0
if( p_playlist->p_input != NULL )
{
vlc_mutex_lock( &p_playlist->p_input->stream.stream_lock );
vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
}
vlc_mutex_unlock( &p_playlist->object_lock );
+#endif
playlist_Prev( p_playlist );
vlc_object_release( p_playlist );
return;
}
+ /* FIXME --fenrir */
+#if 0
+ var_Change( p_input, "title", VLC_VAR_CHOICESCOUNT, &val, NULL );
vlc_mutex_lock( &p_playlist->object_lock );
if( p_playlist->p_input != NULL )
{
vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
}
vlc_mutex_unlock( &p_playlist->object_lock );
-
+#endif
playlist_Next( p_playlist );
vlc_object_release( p_playlist );
}
if( i_playing_status == PLAYING_S )
{
- GetToolBar()->InsertTool( 0, PlayStream_Event, wxU(_("Pause")),
+ GetToolBar()->InsertTool( 2, PlayStream_Event, wxU(_("Pause")),
wxBitmap( pause_xpm ), wxNullBitmap,
wxITEM_NORMAL, wxU(_(HELP_PAUSE)) );
}
else
{
- GetToolBar()->InsertTool( 0, PlayStream_Event, wxU(_("Play")),
+ GetToolBar()->InsertTool( 2, PlayStream_Event, wxU(_("Play")),
wxBitmap( play_xpm ), wxNullBitmap,
wxITEM_NORMAL, wxU(_(HELP_PLAY)) );
}
#endif
/*****************************************************************************
- * Definition of wxVolCtrl class.
+ * Definition of VolCtrl class.
*****************************************************************************/
wxVolCtrl::wxVolCtrl( intf_thread_t *_p_intf, wxWindow* parent, wxWindowID id,
wxPoint point, wxSize size )
: wxGauge( parent, id, 200, point, size, wxGA_HORIZONTAL | wxGA_SMOOTH )
{
p_intf = _p_intf;
-
- audio_volume_t i_volume;
- aout_VolumeGet( p_intf, &i_volume );
- i_volume = i_volume * 200 * 2 / AOUT_VOLUME_MAX;
- SetValue( i_volume );
- SetToolTip( wxString::Format((wxString)wxU(_("Volume")) + wxT(" %d"),
- i_volume ) );
+ UpdateVolume();
}
void wxVolCtrl::OnChange( wxMouseEvent& event )
if( !event.LeftDown() && !event.LeftIsDown() ) return;
int i_volume = event.GetX() * 200 / GetClientSize().GetWidth();
- Change( i_volume );
+ aout_VolumeSet( p_intf, i_volume * AOUT_VOLUME_MAX / 200 / 2 );
+ UpdateVolume();
}
-void wxVolCtrl::Change( int i_volume )
+void wxVolCtrl::UpdateVolume()
{
- aout_VolumeSet( p_intf, i_volume * AOUT_VOLUME_MAX / 200 / 2 );
- SetValue( i_volume );
+ audio_volume_t i_volume;
+ aout_VolumeGet( p_intf, &i_volume );
+
+ int i_gauge_volume = i_volume * 200 * 2 / AOUT_VOLUME_MAX;
+ if( i_gauge_volume == GetValue() ) return;
+
+ SetValue( i_gauge_volume );
SetToolTip( wxString::Format((wxString)wxU(_("Volume")) + wxT(" %d"),
- i_volume ) );
+ i_gauge_volume / 2 ) );
}
projects / vlc / blobdiff