/*****************************************************************************
* interface.cpp : wxWindows plugin for vlc
*****************************************************************************
- * Copyright (C) 2000-2004, 2003 VideoLAN
+ * Copyright (C) 2000-2005 VideoLAN
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
#include <vlc/vlc.h>
#include <vlc/aout.h>
#include <vlc/vout.h>
+#include <vlc/input.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"
+#include "bitmaps/speaker_mute.xpm"
#define TOOLBAR_BMP_WIDTH 16
#define TOOLBAR_BMP_HEIGHT 16
/* include the icon graphic */
#include "../../../share/vlc32x32.xpm"
+/* include a small icon graphic for the systray icon */
+#ifdef wxHAS_TASK_BAR_ICON
+#include "../../../share/vlc16x16.xpm"
+#endif
/*****************************************************************************
* Local class declarations.
};
-class wxVolCtrl: public wxGauge
+class wxVolCtrl;
+class VLCVolCtrl : public wxControl
{
public:
- /* Constructor */
- wxVolCtrl( intf_thread_t *_p_intf, wxWindow* parent, wxWindowID id,
- wxPoint = wxDefaultPosition, wxSize = wxSize( 20, -1 ) );
- virtual ~wxVolCtrl() {};
-
- void Change( int i_volume );
+ VLCVolCtrl( intf_thread_t *p_intf, wxWindow *p_parent );
+ virtual ~VLCVolCtrl() {};
+ virtual void OnPaint( wxPaintEvent &event );
void OnChange( wxMouseEvent& event );
+ void UpdateVolume();
-private:
- intf_thread_t *p_intf;
+ private:
+ DECLARE_EVENT_TABLE()
- DECLARE_EVENT_TABLE();
+ wxVolCtrl *gauge;
+ int i_y_offset;
+ vlc_bool_t b_mute;
+ intf_thread_t *p_intf;
};
-BEGIN_EVENT_TABLE(wxVolCtrl, wxWindow)
+BEGIN_EVENT_TABLE(VLCVolCtrl, wxControl)
+ EVT_PAINT(VLCVolCtrl::OnPaint)
+
/* Mouse events */
- EVT_LEFT_DOWN(wxVolCtrl::OnChange)
- EVT_MOTION(wxVolCtrl::OnChange)
+ EVT_LEFT_UP(VLCVolCtrl::OnChange)
END_EVENT_TABLE()
/*****************************************************************************
OpenFileSimple_Event,
OpenAdv_Event,
OpenFile_Event,
+ OpenDir_Event,
OpenDisc_Event,
OpenNet_Event,
+ OpenCapture_Event,
OpenSat_Event,
OpenOther_Event,
EjectDisc_Event,
- StreamWizard_Event,
+ Wizard_Event,
Playlist_Event,
Logs_Event,
Prefs_Event,
Extended_Event,
+// Undock_Event,
Bookmarks_Event,
Skins_Event,
SlowStream_Event,
FastStream_Event,
- Adjust_Event,
- Hue_Event,
- Contrast_Event,
- Brightness_Event,
- Saturation_Event,
- Gamma_Event,
-
- Ratio_Event,
- Visual_Event,
+ DiscMenu_Event,
+ DiscPrev_Event,
+ DiscNext_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) */
- About_Event = wxID_ABOUT
+ About_Event = wxID_ABOUT,
+
+ Iconize_Event
};
BEGIN_EVENT_TABLE(Interface, wxFrame)
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_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(OpenFileSimple_Event, Interface::OnShowDialog)
EVT_MENU(OpenAdv_Event, Interface::OnShowDialog)
EVT_MENU(OpenFile_Event, Interface::OnShowDialog)
+ EVT_MENU(OpenDir_Event, Interface::OnShowDialog)
EVT_MENU(OpenDisc_Event, Interface::OnShowDialog)
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)
EVT_MENU(PrevStream_Event, Interface::OnPrevStream)
EVT_MENU(SlowStream_Event, Interface::OnSlowStream)
EVT_MENU(FastStream_Event, Interface::OnFastStream)
+ /* Disc Buttons events */
+ EVT_BUTTON(DiscMenu_Event, Interface::OnDiscMenu)
+ EVT_BUTTON(DiscPrev_Event, Interface::OnDiscPrev)
+ EVT_BUTTON(DiscNext_Event, Interface::OnDiscNext)
+
/* Slider events */
EVT_COMMAND_SCROLL(SliderScroll_Event, Interface::OnSliderUpdate)
- EVT_COMMAND_SCROLL(Hue_Event, Interface::OnHueUpdate)
- EVT_COMMAND_SCROLL(Contrast_Event, Interface::OnContrastUpdate)
- EVT_COMMAND_SCROLL(Brightness_Event, Interface::OnBrightnessUpdate)
- EVT_COMMAND_SCROLL(Saturation_Event, Interface::OnSaturationUpdate)
- EVT_COMMAND_SCROLL(Gamma_Event, Interface::OnGammaUpdate)
-
/* Custom events */
EVT_COMMAND(0, wxEVT_INTF, Interface::OnControlEvent)
EVT_COMMAND(1, wxEVT_INTF, Interface::OnControlEvent)
+ EVT_TIMER(ID_CONTROLS_TIMER, Interface::OnControlsTimer)
+ EVT_TIMER(ID_SLIDER_TIMER, Interface::OnSliderTimer)
END_EVENT_TABLE()
/*****************************************************************************
* Constructor.
*****************************************************************************/
-Interface::Interface( intf_thread_t *_p_intf ):
+Interface::Interface( intf_thread_t *_p_intf, long style ):
wxFrame( NULL, -1, wxT("VLC media player"),
- wxDefaultPosition, wxSize(700,100), wxDEFAULT_FRAME_STYLE )
+ wxDefaultPosition, wxSize(700,100), style )
{
/* Initializations */
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 );
+
+#ifdef wxHAS_TASK_BAR_ICON
+ /* Systray integration */
+ p_systray = NULL;
+ if ( config_GetInt( p_intf, "wxwin-systray" ) )
+ {
+ p_systray = new Systray(this, p_intf);
+ p_systray->SetIcon( wxIcon( vlc16x16_xpm ), wxT("VLC media player") );
+ if ( (! p_systray->IsOk()) || (! p_systray->IsIconInstalled()) )
+ {
+ msg_Warn(p_intf, "Cannot set systray icon, weird things may happen");
+ }
+ }
+#endif
/* 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 );
statusbar->SetStatusText( wxString::Format(wxT("x%.2f"), 1.0), 1 );
/* Video window */
+ video_window = 0;
if( config_GetInt( p_intf, "wxwin-embed" ) )
{
- VideoWindow( p_intf, this );
- frame_sizer->Add( p_intf->p_sys->p_video_sizer, 1, wxEXPAND , 0 );
+ video_window = CreateVideoWindow( p_intf, this );
+ frame_sizer->Add( p_intf->p_sys->p_video_sizer, 1, wxEXPAND, 0 );
}
/* Creation of the slider sub-window */
frame_sizer->Layout();
frame_sizer->Fit(this);
-#if !defined(__WXX11__)
+#if wxUSE_DRAG_AND_DROP
/* Associate drop targets with the main interface */
SetDropTarget( new DragAndDrop( p_intf ) );
#endif
- UpdateAcceleratorTable();
+ SetupHotkeys();
+
+ m_controls_timer.SetOwner(this, ID_CONTROLS_TIMER);
+ m_slider_timer.SetOwner(this, ID_SLIDER_TIMER);
/* Start timer */
timer = new Timer( p_intf, this );
+
+ /* */
+ WindowSettings *ws = p_intf->p_sys->p_window_settings;
+ wxPoint p;
+ wxSize s;
+ bool b_shown;
+
+ ws->SetScreen( wxSystemSettings::GetMetric( wxSYS_SCREEN_X ),
+ wxSystemSettings::GetMetric( wxSYS_SCREEN_Y ) );
+
+ if( ws->GetSettings( WindowSettings::ID_MAIN, b_shown, p, s ) )
+ Move( p );
}
Interface::~Interface()
{
- if( p_intf->p_sys->p_wxwindow )
- {
- delete p_intf->p_sys->p_wxwindow;
- }
+ WindowSettings *ws = p_intf->p_sys->p_window_settings;
+
+ ws->SetSettings( WindowSettings::ID_MAIN, true,
+ GetPosition(), GetSize() );
+
+ if( video_window ) delete video_window;
+
+#ifdef wxHAS_TASK_BAR_ICON
+ if( p_systray ) delete p_systray;
+#endif
+
+ if( p_intf->p_sys->p_wxwindow ) delete p_intf->p_sys->p_wxwindow;
/* Clean up */
delete timer;
}
+void Interface::Init()
+{
+ /* Misc init */
+ SetupHotkeys();
+}
+
+void Interface::Update()
+{
+ /* Misc updates */
+ ((VLCVolCtrl *)volctrl)->UpdateVolume();
+}
+
void Interface::OnControlEvent( wxCommandEvent& event )
{
switch( event.GetId() )
{
case 0:
+ {
+ if( p_intf->p_sys->b_video_autosize )
+ {
frame_sizer->Layout();
frame_sizer->Fit(this);
+ }
+ }
break;
case 1:
*****************************************************************************/
void Interface::CreateOurMenuBar()
{
-#define HELP_SIMPLE N_("Quick file open")
-#define HELP_ADV N_("Advanced open")
-#define HELP_FILE N_("Open a file")
-#define HELP_DISC N_("Open Disc Media")
-#define HELP_NET N_("Open a network stream")
-#define HELP_SAT N_("Open a satellite stream")
-#define HELP_EJECT N_("Eject the DVD/CD")
-#define HELP_EXIT N_("Exit this program")
-
-#define HELP_STREAMWIZARD N_("Open the streaming wizard")
-
-#define HELP_PLAYLIST N_("Open the playlist")
-#define HELP_LOGS N_("Show the program logs")
-#define HELP_FILEINFO N_("Show information about the file being played")
-
-#define HELP_PREFS N_("Go to the preferences menu")
-#define HELP_EXTENDED N_("Shows the extended GUI")
-#define HELP_BOOKMARKS N_("Shows the bookmarks window")
-
-#define HELP_ABOUT N_("About this program")
+ int minimal = config_GetInt( p_intf, "wxwin-minimal" );
/* Create the "File" menu */
wxMenu *file_menu = new wxMenu;
+
+ if (!minimal)
+ {
file_menu->Append( OpenFileSimple_Event,
- wxU(_("Quick &Open File...\tCtrl-O")),
- wxU(_(HELP_SIMPLE)) );
+ wxU(_("Quick &Open File...\tCtrl-O")) );
file_menu->AppendSeparator();
- file_menu->Append( OpenFile_Event, wxU(_("Open &File...\tCtrl-F")),
- wxU(_(HELP_FILE)));
- file_menu->Append( OpenDisc_Event, wxU(_("Open &Disc...\tCtrl-D")),
- wxU(_(HELP_DISC)));
+ file_menu->Append( OpenFile_Event, wxU(_("Open &File...\tCtrl-F")) );
+ file_menu->Append( OpenDir_Event, wxU(_("Open D&irectory...\tCtrl-I")) );
+ file_menu->Append( OpenDisc_Event, wxU(_("Open &Disc...\tCtrl-D")) );
file_menu->Append( OpenNet_Event,
- wxU(_("Open &Network Stream...\tCtrl-N")),
- wxU(_(HELP_NET)));
+ wxU(_("Open &Network Stream...\tCtrl-N")) );
+ file_menu->Append( OpenCapture_Event,
+ wxU(_("Open &Capture Device...\tCtrl-C")) );
file_menu->AppendSeparator();
- file_menu->Append( StreamWizard_Event,
- wxU(_("Streaming &Wizard...\tCtrl-W")),
- wxU(_(HELP_STREAMWIZARD)) );
+ file_menu->Append( Wizard_Event, wxU(_("&Wizard...\tCtrl-W")) );
file_menu->AppendSeparator();
- file_menu->Append( Exit_Event, wxU(_("E&xit\tCtrl-X")),
- wxU(_(HELP_EXIT)) );
+ }
+ file_menu->Append( Exit_Event, wxU(_("E&xit\tCtrl-X")) );
/* Create the "View" menu */
wxMenu *view_menu = new wxMenu;
- view_menu->Append( Playlist_Event, wxU(_("&Playlist...\tCtrl-P")),
- wxU(_(HELP_PLAYLIST)) );
- view_menu->Append( Logs_Event, wxU(_("&Messages...\tCtrl-M")),
- wxU(_(HELP_LOGS)) );
+ if (!minimal)
+ {
+ view_menu->Append( Playlist_Event, wxU(_("&Playlist...\tCtrl-P")) );
+ }
+ view_menu->Append( Logs_Event, wxU(_("&Messages...\tCtrl-M")) );
view_menu->Append( FileInfo_Event,
- wxU(_("Stream and Media &info...\tCtrl-I")),
- wxU(_(HELP_FILEINFO)) );
+ wxU(_("Stream and Media &info...\tCtrl-I")) );
/* Create the "Auto-generated" menus */
p_settings_menu = SettingsMenu( p_intf, this );
/* Create the "Help" menu */
wxMenu *help_menu = new wxMenu;
- help_menu->Append( About_Event, wxU(_("About VLC media player")),
- wxU(_(HELP_ABOUT)) );
+ help_menu->Append( About_Event, wxU(_("About VLC media player")) );
/* Append the freshly created menus to the menu bar... */
- wxMenuBar *menubar = new wxMenuBar( wxMB_DOCKABLE );
+ wxMenuBar *menubar = new wxMenuBar();
menubar->Append( file_menu, wxU(_("&File")) );
menubar->Append( view_menu, wxU(_("&View")) );
menubar->Append( p_settings_menu, wxU(_("&Settings")) );
/* Attach the menu bar to the frame */
SetMenuBar( menubar );
+ /* Find out size of menu bar */
+ int i_size = 0;
+ for( unsigned int i = 0; i < menubar->GetMenuCount(); i++ )
+ {
+ int i_width, i_height;
+ menubar->GetTextExtent( menubar->GetLabelTop(i), &i_width, &i_height );
+ i_size += i_width +
+#if defined(__WXGTK__)
+ 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 );
+
/* Intercept all menu events in our custom event handler */
PushEventHandler( new MenuEvtHandler( p_intf, this ) );
-#if !defined(__WXX11__)
+#if wxUSE_DRAG_AND_DROP
/* Associate drop targets with the menubar */
menubar->SetDropTarget( new DragAndDrop( p_intf ) );
#endif
}
-class VLCVolCtrl : public wxControl
-{
-public:
- VLCVolCtrl( intf_thread_t *p_intf, wxWindow *p_parent, wxGauge ** );
- virtual ~VLCVolCtrl() {};
-
- virtual void OnPaint( wxPaintEvent &event );
-
- private:
- DECLARE_EVENT_TABLE()
-};
-
-BEGIN_EVENT_TABLE(VLCVolCtrl, wxControl)
- EVT_PAINT(VLCVolCtrl::OnPaint)
-END_EVENT_TABLE()
-
-VLCVolCtrl::VLCVolCtrl( intf_thread_t *p_intf, wxWindow *p_parent,
- wxGauge **pp_volctrl )
- :wxControl( p_parent, -1, wxDefaultPosition, wxSize(64, 16 ), wxBORDER_NONE )
-{
- *pp_volctrl = new wxVolCtrl( p_intf, this, -1, wxPoint(18,0),
- wxSize(44,16) );
-}
-
-void VLCVolCtrl::OnPaint( wxPaintEvent &evt )
-{
- wxPaintDC dc( this );
- wxBitmap mPlayBitmap( speaker_xpm );
- dc.DrawBitmap( mPlayBitmap, 1, 0, TRUE );
-}
-
void Interface::CreateOurToolBar()
{
+#define HELP_OPEN N_("Open")
#define HELP_STOP N_("Stop")
-
#define HELP_PLAY N_("Play")
#define HELP_PAUSE N_("Pause")
#define HELP_PLO N_("Playlist")
#define HELP_SLOW N_("Play slower")
#define HELP_FAST N_("Play faster")
+ int minimal = config_GetInt( p_intf, "wxwin-minimal" );
+
wxLogNull LogDummy; /* Hack to suppress annoying log message on the win32
* version because we don't include wx.rc */
wxToolBar *toolbar =
- CreateToolBar( wxTB_HORIZONTAL | wxTB_FLAT | wxTB_DOCKABLE );
+ CreateToolBar( wxTB_HORIZONTAL | wxTB_FLAT );
toolbar->SetToolBitmapSize( wxSize(TOOLBAR_BMP_WIDTH,TOOLBAR_BMP_HEIGHT) );
- toolbar->AddTool( PlayStream_Event, wxT(""), wxBitmap( play_xpm ),
- wxU(_(HELP_PLAY)) );
-#if 0
- toolbar->AddTool( PlayStream_Event, wxT(""), wxBitmap( pause_xpm ),
- wxU(_(HELP_PAUSE)) );
-#endif
+ if (!minimal)
+ {
+ toolbar->AddTool( OpenFile_Event, wxT(""),
+ wxBitmap( eject_xpm ), wxU(_(HELP_OPEN)) );
+ toolbar->AddSeparator();
+ }
+
+ wxToolBarToolBase *p_tool = toolbar->AddTool( PlayStream_Event, wxT(""),
+ wxBitmap( play_xpm ), wxU(_(HELP_PLAY)) );
+ p_tool->SetClientData( p_tool );
+
+ if (!minimal)
+ {
toolbar->AddTool( StopStream_Event, wxT(""), wxBitmap( stop_xpm ),
wxU(_(HELP_STOP)) );
toolbar->AddSeparator();
+
toolbar->AddTool( PrevStream_Event, wxT(""),
wxBitmap( prev_xpm ), wxU(_(HELP_PLP)) );
toolbar->AddTool( SlowStream_Event, wxT(""),
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 );
- VLCVolCtrl *sound_control = new VLCVolCtrl( p_intf, toolbar, &volctrl );
- toolbar->AddControl( sound_control );
+ volctrl = new VLCVolCtrl( p_intf, toolbar );
+ toolbar->AddControl( volctrl );
toolbar->Realize();
- // '7' is the number of buttons on the toolbar, '3' is arbitrary :)
- frame_sizer->SetMinSize( TOOLBAR_BMP_WIDTH * 7 * 3, -1 );
-
-#if !defined(__WXX11__)
+#if wxUSE_DRAG_AND_DROP
/* Associate drop targets with the toolbar */
toolbar->SetDropTarget( new DragAndDrop( p_intf ) );
#endif
/* Create a new frame and sizer containing the slider */
slider_frame = new wxPanel( this, -1, wxDefaultPosition, wxDefaultSize );
slider_frame->SetAutoLayout( TRUE );
- wxBoxSizer *frame_sizer = new wxBoxSizer( wxHORIZONTAL );
- //frame_sizer->SetMinSize( -1, 50 );
+ slider_sizer = new wxBoxSizer( wxHORIZONTAL );
+ //slider_sizer->SetMinSize( -1, 50 );
/* Create slider */
slider = new wxSlider( slider_frame, SliderScroll_Event, 0, 0,
SLIDER_MAX_POS, wxDefaultPosition, wxDefaultSize );
+ /* Add Disc Buttons */
+ disc_frame = new wxPanel( slider_frame, -1, wxDefaultPosition,
+ wxDefaultSize );
+ disc_frame->SetAutoLayout( TRUE );
+ disc_sizer = new wxBoxSizer( wxHORIZONTAL );
+
+ disc_menu_button = new wxBitmapButton( disc_frame, DiscMenu_Event,
+ wxBitmap( playlist_xpm ) );
+ disc_prev_button = new wxBitmapButton( disc_frame, DiscPrev_Event,
+ wxBitmap( prev_xpm ) );
+ disc_next_button = new wxBitmapButton( disc_frame, DiscNext_Event,
+ wxBitmap( next_xpm ) );
+
+ disc_sizer->Add( disc_menu_button, 1, wxEXPAND | wxLEFT | wxRIGHT, 1 );
+ disc_sizer->Add( disc_prev_button, 1, wxEXPAND | wxLEFT | wxRIGHT, 1 );
+ disc_sizer->Add( disc_next_button, 1, wxEXPAND | wxLEFT | wxRIGHT, 1 );
+
+ disc_frame->SetSizer( disc_sizer );
+ disc_sizer->Layout();
+
/* Add everything to the frame */
- frame_sizer->Add( slider, 1, wxEXPAND | wxALL, 5 );
- slider_frame->SetSizer( frame_sizer );
- frame_sizer->Layout();
- frame_sizer->SetSizeHints(slider_frame);
+ slider_sizer->Add( slider, 1, wxEXPAND | wxALL, 5 );
+ slider_sizer->Add( disc_frame, 0, wxALL, 2 );
+ slider_frame->SetSizer( slider_sizer );
+
+ disc_frame->Hide();
+ slider_sizer->Hide( disc_frame );
+
+ slider_sizer->Layout();
+ slider_sizer->Fit( slider_frame );
/* Hide the slider by default */
slider_frame->Hide();
}
+static int ConvertHotkeyModifiers( int i_hotkey )
+{
+ 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;
+}
-void Interface::CreateOurExtendedPanel()
+static int ConvertHotkey( 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 every controls */
-
- /* Create the adjust button */
- wxCheckBox * adjust_check = new wxCheckBox( extra_frame, Adjust_Event,
- wxU(_("Enable")));
-
-
- wxBoxSizer *hue_sizer = new wxBoxSizer( wxHORIZONTAL );
- wxStaticText *hue_text = new wxStaticText( extra_frame, -1,
- wxU(_("Hue")) );
- hue_slider = new wxSlider ( extra_frame, Hue_Event, 0, 0,
- 360, wxDefaultPosition, wxDefaultSize );
-
- hue_sizer->Add(hue_text,1, 0 ,0);
- hue_sizer->Add(hue_slider,1, 0 ,0);
- hue_sizer->Layout();
-
- wxBoxSizer *contrast_sizer = new wxBoxSizer( wxHORIZONTAL );
- wxStaticText *contrast_text = new wxStaticText( extra_frame, -1,
- wxU(_("Contrast")) );
- contrast_slider = new wxSlider ( extra_frame, Contrast_Event, 0, 0,
- 200, wxDefaultPosition, wxDefaultSize);
- contrast_sizer->Add(contrast_text,1, 0 ,0);
- contrast_sizer->Add(contrast_slider,1, 0 ,0);
- contrast_sizer->Layout();
-
- wxBoxSizer *brightness_sizer = new wxBoxSizer( wxHORIZONTAL );
- wxStaticText *brightness_text = new wxStaticText( extra_frame, -1,
- wxU(_("Brightness")) );
- brightness_slider = new wxSlider ( extra_frame, Brightness_Event, 0, 0,
- 200, wxDefaultPosition, wxDefaultSize) ;
- brightness_sizer->Add(brightness_text,1,0,0);
- brightness_sizer->Add(brightness_slider,1,0,0);
- brightness_sizer->Layout();
-
- wxBoxSizer *saturation_sizer = new wxBoxSizer( wxHORIZONTAL );
- wxStaticText *saturation_text = new wxStaticText( extra_frame, -1,
- wxU(_("Saturation")) );
- saturation_slider = new wxSlider ( extra_frame, Saturation_Event, 0, 0,
- 300, wxDefaultPosition, wxDefaultSize );
- saturation_sizer->Add(saturation_text,1,0,0);
- saturation_sizer->Add(saturation_slider,1,0,0);
- saturation_sizer->Layout();
-
- wxBoxSizer *gamma_sizer = new wxBoxSizer( wxHORIZONTAL );
- wxStaticText *gamma_text = new wxStaticText( extra_frame, -1,
- wxU(_("Gamma")) );
- gamma_slider = new wxSlider ( extra_frame, Gamma_Event, 0, 0,
- 100, wxDefaultPosition, wxDefaultSize );
- gamma_sizer->Add(gamma_text,1,0,0);
- gamma_sizer->Add(gamma_slider,1,0,0);
- gamma_sizer->Layout();
-
- adjust_sizer->Add(adjust_check, 1, wxEXPAND, 0);
- adjust_sizer->Add(hue_sizer, 1, wxEXPAND, 0);
- adjust_sizer->Add(contrast_sizer, 1, wxEXPAND, 0);
- adjust_sizer->Add(brightness_sizer, 1, wxEXPAND, 0);
- adjust_sizer->Add(saturation_sizer, 1, wxEXPAND, 0);
- adjust_sizer->Add(gamma_sizer, 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[] =
+ int i_key = i_hotkey & ~KEY_MODIFIER;
+ if( i_key & KEY_ASCII ) return i_key & KEY_ASCII;
+ else if( i_key & KEY_SPECIAL )
{
- wxT("4:3"),
- wxT("16:9"),
- };
-
- wxBoxSizer *ratio_sizer = new wxBoxSizer( wxHORIZONTAL );
- wxStaticText *ratio_text = new wxStaticText( extra_frame, -1,
- wxU(_("Aspect Ratio")) );
+ 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_END;
+ case KEY_INSERT: return WXK_INSERT;
+ case KEY_DELETE: return WXK_DELETE;
+ 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;
+}
- ratio_combo = new wxComboBox( extra_frame, Ratio_Event, wxT(""),
- wxDefaultPosition, wxSize(120,-1),
- WXSIZEOF(ratio_array), ratio_array,
- 0 );
+void Interface::SetupHotkeys()
+{
+ struct vlc_t::hotkey *p_hotkeys = p_intf->p_vlc->p_hotkeys;
+ int i_hotkeys;
- ratio_sizer->Add( ratio_text, 0, wxALL, 2 );
- ratio_sizer->Add( ratio_combo, 0, wxALL, 2 );
- ratio_sizer->Layout();
+ /* Count number of hoteys */
+ for( i_hotkeys = 0; p_hotkeys[i_hotkeys].psz_action != NULL; i_hotkeys++ );
- video_sizer->Add( ratio_sizer , 0 , wxALL , 0 );
- video_sizer->Layout();
+ p_intf->p_sys->i_first_hotkey_event = wxID_HIGHEST + 7000;
+ p_intf->p_sys->i_hotkeys = i_hotkeys;
-#if 0
- wxBoxSizer *visual_sizer = new wxBoxSizer( wxHORIZONTAL );
+ wxAcceleratorEntry *p_entries = new wxAcceleratorEntry[i_hotkeys];
- wxCheckBox *visual_checkbox = new wxCheckBox( extra_frame, Visual_Event,
- wxU(_("Visualisations")) );
+ /* 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 );
- visual_sizer->Add( visual_checkbox, 0, wxEXPAND, 0);
- visual_sizer->Layout();
+#ifdef WIN32
+ if( !(p_hotkeys[i].i_key & KEY_SPECIAL) && i_mod )
+ i_key = toupper(i_key);
+#endif
- 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 );
+ p_entries[i].Set( i_mod, i_key,
+ p_intf->p_sys->i_first_hotkey_event + i );
+ }
- audio_sizer->Add( visual_sizer, 0, wxALL, 0);
- audio_sizer->Layout();
+ wxAcceleratorTable accel( i_hotkeys, p_entries );
- other_sizer->Add( audio_sizer , 0 , wxALL | wxEXPAND , 0 );
-#endif
- other_sizer->Add( video_sizer, 0, wxALL | wxEXPAND , 0);
- other_sizer->Layout();
+ if( !accel.Ok() )
+ {
+ msg_Err( p_intf, "invalid accelerator table" );
+ }
+ else
+ {
+ SetAcceleratorTable( accel );
+ }
- extra_sizer->Add(other_sizer,0,wxBOTTOM,5);
+ delete [] p_entries;
+}
- extra_frame->SetSizer( extra_sizer );
+void Interface::HideSlider( bool layout )
+{
+ ShowSlider( false, layout );
+}
- /* Layout the whole panel */
- extra_sizer->Layout();
+void Interface::ShowSlider( bool show, bool layout )
+{
+ if( show )
+ {
+ //prevent the hide timers from hiding it now
+ m_slider_timer.Stop();
+ m_controls_timer.Stop();
- extra_sizer->SetSizeHints(extra_frame);
+ //prevent continuous layout
+ if( slider_frame->IsShown() ) return;
- /* 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);
+ slider_frame->Show();
+ frame_sizer->Show( slider_frame );
}
- if( psz_filters ) free( psz_filters );
-#endif
- psz_filters = config_GetPsz( p_intf, "filter" );
- if( psz_filters && strstr( psz_filters, "adjust" ) )
+ else
{
- adjust_check->SetValue( 1 );
- saturation_slider->Enable();
- contrast_slider->Enable();
- brightness_slider->Enable();
- hue_slider->Enable();
- gamma_slider->Enable();
+ //prevent continuous layout
+ if( !slider_frame->IsShown() ) return;
+
+ slider_frame->Hide();
+ frame_sizer->Hide( slider_frame );
}
- else
+
+ if( layout )
{
- adjust_check->SetValue( 0 );
- saturation_slider->Disable();
- contrast_slider->Disable();
- brightness_slider->Disable();
- hue_slider->Disable();
- gamma_slider->Disable();
+ frame_sizer->Layout();
+ if( p_intf->p_sys->b_video_autosize )
+ {
+ UpdateVideoWindow( p_intf, video_window );
+ frame_sizer->Fit( this );
+ }
}
- 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()
+void Interface::HideDiscFrame( bool layout )
{
- /* 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 );
+ ShowDiscFrame( false, layout );
+}
- if( !accel.Ok() )
- msg_Err( p_intf, "invalid accelerator table" );
+void Interface::ShowDiscFrame( bool show, bool layout )
+{
+ if( show )
+ {
+ //prevent the hide timer from hiding it now
+ m_controls_timer.Stop();
+
+ //prevent continuous layout
+ if( disc_frame->IsShown() ) return;
+
+ disc_frame->Show();
+ slider_sizer->Show( disc_frame );
+ }
+ else
+ {
+ //prevent continuous layout
+ if( !disc_frame->IsShown() ) return;
- SetAcceleratorTable( accel );
- msg_Dbg( p_intf, "accelerator table loaded" );
+ disc_frame->Hide();
+ slider_sizer->Hide( disc_frame );
+ }
+ if( layout )
+ {
+ slider_sizer->Layout();
+ if( p_intf->p_sys->b_video_autosize )
+ {
+ UpdateVideoWindow( p_intf, video_window );
+ slider_sizer->Fit( slider_frame );
+ }
+ }
}
/*****************************************************************************
* Event Handlers.
*****************************************************************************/
+void Interface::OnControlsTimer( wxTimerEvent& WXUNUSED(event) )
+{
+ /* Hide slider and Disc Buttons */
+ //postpone layout, we'll do it ourselves
+ HideDiscFrame( false );
+ HideSlider( false );
+
+ slider_sizer->Layout();
+ if( p_intf->p_sys->b_video_autosize )
+ {
+ slider_sizer->Fit( slider_frame );
+ UpdateVideoWindow( p_intf, video_window );
+ frame_sizer->Fit( this );
+ }
+}
+
+void Interface::OnSliderTimer( wxTimerEvent& WXUNUSED(event) )
+{
+ HideSlider();
+}
-void Interface::OnMenuOpen(wxMenuEvent& event)
+void Interface::OnMenuOpen( wxMenuEvent& event )
{
#if defined( __WXMSW__ )
# define GetEventObject GetMenu
/* Add static items */
p_settings_menu->AppendCheckItem( Extended_Event,
- wxU(_("&Extended GUI") ), wxU(_(HELP_EXTENDED)) );
- p_settings_menu->AppendCheckItem( Bookmarks_Event,
- wxU(_("&Bookmarks...") ), wxU(_(HELP_BOOKMARKS)) );
- p_settings_menu->Append( Prefs_Event, wxU(_("&Preferences...")),
- wxU(_(HELP_PREFS)) );
+ wxU(_("&Extended GUI") ) );
+ 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...")) );
}
else if( event.GetEventObject() == p_audio_menu )
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(_("(c) 1996-2005 - the VideoLAN Team\n\n")) +
wxU( vlc_wraptext(INTF_ABOUT_MSG,WRAPCOUNT,ISUTF8) ) + wxT("\n\n") +
wxU(_("The VideoLAN team <videolan@videolan.org>\n"
"http://www.videolan.org/\n\n")) );
case OpenFile_Event:
i_id = INTF_DIALOG_FILE;
break;
+ case OpenDir_Event:
+ i_id = INTF_DIALOG_DIRECTORY;
+ break;
case OpenDisc_Event:
i_id = INTF_DIALOG_DISC;
break;
case OpenNet_Event:
i_id = INTF_DIALOG_NET;
break;
+ case OpenCapture_Event:
+ i_id = INTF_DIALOG_CAPTURE;
+ break;
case OpenSat_Event:
i_id = INTF_DIALOG_SAT;
break;
case Prefs_Event:
i_id = INTF_DIALOG_PREFS;
break;
- case StreamWizard_Event:
- i_id = INTF_DIALOG_STREAMWIZARD;
+ case Wizard_Event:
+ i_id = INTF_DIALOG_WIZARD;
break;
case Bookmarks_Event:
i_id = INTF_DIALOG_BOOKMARKS;
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 );
- 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 );
+#if (wxCHECK_VERSION(2,5,0))
+ frame_sizer->Detach( extra_frame );
+#else
+ frame_sizer->Remove( extra_frame );
+#endif
+ 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);
}
- 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::OnHueUpdate( wxScrollEvent& event)
-{
- config_PutInt( p_intf , "hue" , event.GetPosition() );
}
-void Interface::OnSaturationUpdate( wxScrollEvent& event)
+void Interface::OnUndock(wxCommandEvent& event)
{
- config_PutFloat( p_intf , "saturation" , (float)event.GetPosition()/100 );
-}
-
-void Interface::OnBrightnessUpdate( wxScrollEvent& event)
-{
- config_PutFloat( p_intf , "brightness", (float)event.GetPosition()/100 );
-}
-
-void Interface::OnContrastUpdate(wxScrollEvent& event)
-{
- config_PutFloat( p_intf , "contrast" , (float)event.GetPosition()/100 );
-}
+ b_undock = (b_undock == VLC_TRUE ? VLC_FALSE : VLC_TRUE );
-void Interface::OnGammaUpdate(wxScrollEvent& event)
-{
- config_PutFloat( p_intf , "gamma" , (float)event.GetPosition()/10 );
+ if( b_extra == VLC_TRUE )
+ {
+ if( b_undock == VLC_FALSE )
+ {
+ 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
+ {
+ fprintf(stderr,"Creating window\n");
+ extra_frame->Hide();
+ frame_sizer->Hide( extra_frame );
+#if (wxCHECK_VERSION(2,5,0))
+ frame_sizer->Detach( extra_frame );
+#else
+ frame_sizer->Remove( extra_frame );
+#endif
+ frame_sizer->Layout();
+ frame_sizer->Fit(this);
+ extra_window = new ExtraWindow( p_intf, this, extra_frame );
+ }
+ }
}
+#endif
-void Interface::OnRatio( wxCommandEvent& event )
-{
- config_PutPsz( p_intf, "aspect-ratio", ratio_combo->GetValue().mb_str() );
-}
-void Interface::OnEnableVisual(wxCommandEvent& event)
+void Interface::OnPlayStream( wxCommandEvent& WXUNUSED(event) )
{
- if( event.IsChecked() )
- {
- config_PutPsz( p_intf, "audio-filter", "visual" );
- }
- else
- {
- config_PutPsz( p_intf, "audio-filter", "" );
- }
+ PlayStream();
}
-void Interface::OnPlayStream( wxCommandEvent& WXUNUSED(event) )
+void Interface::PlayStream()
{
wxCommandEvent dummy;
playlist_t *p_playlist =
}
void Interface::OnStopStream( wxCommandEvent& WXUNUSED(event) )
+{
+ StopStream();
+}
+void Interface::StopStream()
{
playlist_t * p_playlist =
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
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 );
-
- 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, "length" ) /
+ I64C(1000000 );
+ secstotimestr( psz_total, i_seconds );
+
+ 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
}
void Interface::OnPrevStream( wxCommandEvent& WXUNUSED(event) )
+{
+ PrevStream();
+}
+
+void Interface::PrevStream()
{
playlist_t * p_playlist =
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
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 );
}
void Interface::OnNextStream( wxCommandEvent& WXUNUSED(event) )
+{
+ NextStream();
+}
+
+void Interface::NextStream()
{
playlist_t * p_playlist =
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_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 == i_old_playing_status )
return;
- GetToolBar()->DeleteTool( PlayStream_Event );
+ wxToolBarToolBase *p_tool = (wxToolBarToolBase *)
+ GetToolBar()->GetToolClientData( PlayStream_Event );
+ if( !p_tool ) return;
if( i_playing_status == PLAYING_S )
{
- GetToolBar()->InsertTool( 0, PlayStream_Event, wxU(_("Pause")),
- wxBitmap( pause_xpm ), wxNullBitmap,
- wxITEM_NORMAL, wxU(_(HELP_PAUSE)) );
+ p_tool->SetNormalBitmap( wxBitmap( pause_xpm ) );
+ p_tool->SetLabel( wxU(_("Pause")) );
+ p_tool->SetShortHelp( wxU(_(HELP_PAUSE)) );
}
else
{
- GetToolBar()->InsertTool( 0, PlayStream_Event, wxU(_("Play")),
- wxBitmap( play_xpm ), wxNullBitmap,
- wxITEM_NORMAL, wxU(_(HELP_PLAY)) );
+ p_tool->SetNormalBitmap( wxBitmap( play_xpm ) );
+ p_tool->SetLabel( wxU(_("Play")) );
+ p_tool->SetShortHelp( wxU(_(HELP_PLAY)) );
}
GetToolBar()->Realize();
i_old_playing_status = i_playing_status;
}
-#if !defined(__WXX11__)
+void Interface::OnDiscMenu( wxCommandEvent& WXUNUSED(event) )
+{
+ input_thread_t *p_input =
+ (input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
+ if( p_input )
+ {
+ vlc_value_t val; val.i_int = 2;
+
+ var_Set( p_input, "title 0", val);
+ vlc_object_release( p_input );
+ }
+}
+
+void Interface::OnDiscPrev( wxCommandEvent& WXUNUSED(event) )
+{
+ input_thread_t *p_input =
+ (input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
+ if( p_input )
+ {
+ int i_type = var_Type( p_input, "prev-chapter" );
+ vlc_value_t val; val.b_bool = VLC_TRUE;
+
+ var_Set( p_input, ( i_type & VLC_VAR_TYPE ) != 0 ?
+ "prev-chapter" : "prev-title", val );
+
+ vlc_object_release( p_input );
+ }
+}
+
+void Interface::OnDiscNext( wxCommandEvent& WXUNUSED(event) )
+{
+ input_thread_t *p_input =
+ (input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
+ if( p_input )
+ {
+ int i_type = var_Type( p_input, "next-chapter" );
+ vlc_value_t val; val.b_bool = VLC_TRUE;
+
+ var_Set( p_input, ( i_type & VLC_VAR_TYPE ) != 0 ?
+ "next-chapter" : "next-title", val );
+
+ vlc_object_release( p_input );
+ }
+}
+
+#if wxUSE_DRAG_AND_DROP
/*****************************************************************************
* Definition of DragAndDrop class.
*****************************************************************************/
#endif
/*****************************************************************************
- * Definition of wxVolCtrl class.
+ * Definition of VolCtrl class.
*****************************************************************************/
+class wxVolCtrl: public wxGauge
+{
+public:
+ /* Constructor */
+ wxVolCtrl( intf_thread_t *_p_intf, wxWindow* parent, wxWindowID id,
+ wxPoint = wxDefaultPosition, wxSize = wxSize( 20, -1 ) );
+ virtual ~wxVolCtrl() {};
+
+ void UpdateVolume();
+
+ void OnChange( wxMouseEvent& event );
+
+private:
+ intf_thread_t *p_intf;
+
+ DECLARE_EVENT_TABLE();
+};
+
+BEGIN_EVENT_TABLE(wxVolCtrl, wxWindow)
+ /* Mouse events */
+ EVT_LEFT_DOWN(wxVolCtrl::OnChange)
+ EVT_MOTION(wxVolCtrl::OnChange)
+END_EVENT_TABLE()
+
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 ) );
+}
+
+#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 )
+ :wxControl( p_parent, -1, wxDefaultPosition, wxSize(64, VLCVOL_HEIGHT ),
+ wxBORDER_NONE ),
+ i_y_offset((VLCVOL_HEIGHT - TOOLBAR_BMP_HEIGHT) / 2),
+ b_mute(0), p_intf(_p_intf)
+{
+ gauge = 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( b_mute ? speaker_mute_xpm : speaker_xpm );
+ dc.DrawBitmap( mPlayBitmap, 0, i_y_offset, TRUE );
+}
+
+void VLCVolCtrl::OnChange( wxMouseEvent& event )
+{
+ if( event.GetX() < TOOLBAR_BMP_WIDTH )
+ {
+ int i_volume;
+ aout_VolumeMute( p_intf, (audio_volume_t *)&i_volume );
+
+ b_mute = !b_mute;
+ Refresh();
+ }
}
+
+void VLCVolCtrl::UpdateVolume()
+{
+ gauge->UpdateVolume();
+}
+
+/*****************************************************************************
+ * Systray class.
+ *****************************************************************************/
+
+#ifdef wxHAS_TASK_BAR_ICON
+
+BEGIN_EVENT_TABLE(Systray, wxTaskBarIcon)
+ /* Mouse events */
+#ifdef WIN32
+ EVT_TASKBAR_LEFT_DCLICK(Systray::OnLeftClick)
+#else
+ EVT_TASKBAR_LEFT_DOWN(Systray::OnLeftClick)
+#endif
+ /* Menu events */
+ EVT_MENU(Iconize_Event, Systray::OnMenuIconize)
+ EVT_MENU(Exit_Event, Systray::OnExit)
+ EVT_MENU(PlayStream_Event, Systray::OnPlayStream)
+ EVT_MENU(NextStream_Event, Systray::OnNextStream)
+ EVT_MENU(PrevStream_Event, Systray::OnPrevStream)
+ EVT_MENU(StopStream_Event, Systray::OnStopStream)
+END_EVENT_TABLE()
+
+Systray::Systray( Interface *_p_main_interface, intf_thread_t *_p_intf )
+{
+ p_main_interface = _p_main_interface;
+ p_intf = _p_intf;
+}
+
+/* Event handlers */
+void Systray::OnMenuIconize( wxCommandEvent& event )
+{
+ p_main_interface->Show( ! p_main_interface->IsShown() );
+ if ( p_main_interface->IsShown() ) p_main_interface->Raise();
+}
+
+void Systray::OnLeftClick( wxTaskBarIconEvent& event )
+{
+ wxCommandEvent cevent;
+ OnMenuIconize(cevent);
+}
+
+void Systray::OnExit( wxCommandEvent& event )
+{
+ p_main_interface->Close(TRUE);
+}
+
+void Systray::OnPrevStream( wxCommandEvent& event )
+{
+ p_main_interface->PrevStream();
+}
+
+void Systray::OnNextStream( wxCommandEvent& event )
+{
+ p_main_interface->NextStream();
+}
+
+void Systray::OnPlayStream( wxCommandEvent& event )
+{
+ p_main_interface->PlayStream();
+}
+
+void Systray::OnStopStream( wxCommandEvent& event )
+{
+ p_main_interface->StopStream();
+}
+
+/* Systray popup menu */
+wxMenu* Systray::CreatePopupMenu()
+{
+ int minimal = config_GetInt( p_intf, "wxwin-minimal" );
+
+ wxMenu* systray_menu = new wxMenu;
+ systray_menu->Append( Exit_Event, wxU(_("Quit VLC")) );
+ systray_menu->AppendSeparator();
+ systray_menu->Append( PlayStream_Event, wxU(_("Play/Pause")) );
+
+ if (!minimal)
+ {
+ systray_menu->Append( PrevStream_Event, wxU(_("Previous")) );
+ systray_menu->Append( NextStream_Event, wxU(_("Next")) );
+ systray_menu->Append( StopStream_Event, wxU(_("Stop")) );
+ }
+ systray_menu->AppendSeparator();
+ systray_menu->Append( Iconize_Event, wxU(_("Show/Hide interface")) );
+ return systray_menu;
+}
+
+void Systray::UpdateTooltip( const wxChar* tooltip )
+{
+ SetIcon( wxIcon( vlc16x16_xpm ), tooltip );
+}
+#endif
projects / vlc / blobdiff