* interface.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: interface.cpp,v 1.38 2003/06/12 21:28:39 gbazin Exp $
+ * $Id: interface.cpp,v 1.67 2003/10/19 22:52:11 sigmunau Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
#include <vlc/vlc.h>
#include <vlc/aout.h>
-
-#ifdef WIN32 /* mingw32 hack */
-#undef Yield
-#undef CreateDialog
-#endif
-
-/* Let vlc take care of the i18n stuff */
-#define WXINTL_NO_GETTEXT_MACRO
-
-#include <wx/wxprec.h>
-#include <wx/wx.h>
-
+#include <vlc/vout.h>
#include <vlc/intf.h>
#include "stream_control.h"
#define TOOLBAR_BMP_HEIGHT 36
/* include the icon graphic */
-#include "share/vlc32x32.xpm"
+#include "../../../share/vlc32x32.xpm"
/*****************************************************************************
* Local class declarations.
BEGIN_EVENT_TABLE(wxVolCtrl, wxWindow)
/* Mouse events */
EVT_LEFT_DOWN(wxVolCtrl::OnChange)
+ EVT_MOTION(wxVolCtrl::OnChange)
END_EVENT_TABLE()
/*****************************************************************************
{
/* menu items */
Exit_Event = wxID_HIGHEST,
+ OpenFileSimple_Event,
OpenFile_Event,
OpenDisc_Event,
OpenNet_Event,
FileInfo_Event,
Prefs_Event,
+ Extra_Event,
+ Skins_Event,
SliderScroll_Event,
StopStream_Event,
SlowStream_Event,
FastStream_Event,
+ Adjust_Event,
+ Hue_Event,
+ Contrast_Event,
+ Brightness_Event,
+ Saturation_Event,
+
+ Ratio_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) */
/* Menu events */
EVT_MENU(Exit_Event, Interface::OnExit)
EVT_MENU(About_Event, Interface::OnAbout)
- EVT_MENU(Playlist_Event, Interface::OnPlaylist)
- EVT_MENU(Logs_Event, Interface::OnLogs)
- EVT_MENU(FileInfo_Event, Interface::OnFileInfo)
- EVT_MENU(Prefs_Event, Interface::OnPreferences)
+
+ EVT_MENU(Playlist_Event, Interface::OnShowDialog)
+ EVT_MENU(Logs_Event, Interface::OnShowDialog)
+ EVT_MENU(FileInfo_Event, Interface::OnShowDialog)
+ EVT_MENU(Prefs_Event, Interface::OnShowDialog)
EVT_MENU_OPEN(Interface::OnMenuOpen)
+ EVT_MENU( Extra_Event, Interface::OnExtra)
+ EVT_CHECKBOX( Adjust_Event, Interface::OnEnableAdjust)
+
+ EVT_COMBOBOX( Ratio_Event, Interface::OnRatio)
+
#if defined( __WXMSW__ ) || defined( __WXMAC__ )
EVT_CONTEXT_MENU(Interface::OnContextMenu2)
#endif
EVT_RIGHT_UP(Interface::OnContextMenu)
/* Toolbar events */
- EVT_MENU(OpenFile_Event, Interface::OnOpenFile)
- EVT_MENU(OpenDisc_Event, Interface::OnOpenDisc)
- EVT_MENU(OpenNet_Event, Interface::OnOpenNet)
- EVT_MENU(OpenSat_Event, Interface::OnOpenSat)
+ EVT_MENU(OpenFileSimple_Event, Interface::OnShowDialog)
+ EVT_MENU(OpenFile_Event, Interface::OnShowDialog)
+ EVT_MENU(OpenDisc_Event, Interface::OnShowDialog)
+ EVT_MENU(OpenNet_Event, Interface::OnShowDialog)
+ EVT_MENU(OpenSat_Event, Interface::OnShowDialog)
EVT_MENU(StopStream_Event, Interface::OnStopStream)
EVT_MENU(PlayStream_Event, Interface::OnPlayStream)
EVT_MENU(PrevStream_Event, Interface::OnPrevStream)
/* 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)
+
END_EVENT_TABLE()
/*****************************************************************************
{
/* Initializations */
p_intf = _p_intf;
- p_prefs_dialog = NULL;
i_old_playing_status = PAUSE_S;
- p_open_dialog = NULL;
+ b_extra = VLC_FALSE;
/* Give our interface a nice little icon */
- p_intf->p_sys->p_icon = new wxIcon( vlc_xpm );
- SetIcon( *p_intf->p_sys->p_icon );
+ SetIcon( wxIcon( vlc_xpm ) );
/* Create a sizer for the main frame */
- frame_sizer = new wxBoxSizer( wxHORIZONTAL );
+ //frame_sizer= new wxFlexGridSizer( 1, 0, 0);
+ frame_sizer = new wxBoxSizer( wxVERTICAL );
SetSizer( frame_sizer );
+ /* Create a dummy widget that can get the keyboard focus */
+ wxWindow *p_dummy = new wxWindow( this, 0, wxDefaultPosition,
+ wxSize(0,0) );
+ p_dummy->SetFocus();
+ frame_sizer->Add( p_dummy );
+
/* Creation of the menu bar */
CreateOurMenuBar();
/* Creation of the slider sub-window */
CreateOurSlider();
- frame_sizer->Add( slider_frame, 1, wxGROW, 0 );
+ frame_sizer->Add( slider_frame, 0, wxEXPAND , 0 );
frame_sizer->Hide( slider_frame );
+ /* Create the extra panel */
+ CreateOurExtraPanel();
+ frame_sizer->Add( extra_frame, 0, wxEXPAND , 0 );
+ frame_sizer->Hide( extra_frame );
+
/* Creation of the status bar
* Helptext for menu items and toolbar tools will automatically get
* displayed here. */
statusbar->SetStatusWidths( 3, i_status_width );
statusbar->SetStatusText( wxString::Format(wxT("x%.2f"), 1.0), 1 );
-
/* Make sure we've got the right background colour */
SetBackgroundColour( slider_frame->GetBackgroundColour() );
/* Associate drop targets with the main interface */
SetDropTarget( new DragAndDrop( p_intf ) );
#endif
+
+ UpdateAcceleratorTable();
+
+ /* Start timer */
+ timer = new Timer( p_intf, this );
}
Interface::~Interface()
{
+ if( p_intf->p_sys->p_wxwindow )
+ {
+ delete p_intf->p_sys->p_wxwindow;
+ }
+
/* Clean up */
- if( p_open_dialog ) delete p_open_dialog;
- if( p_prefs_dialog ) p_prefs_dialog->Destroy();
- if( p_intf->p_sys->p_icon ) delete p_intf->p_sys->p_icon;
+ delete timer;
}
/*****************************************************************************
#define HELP_FILEINFO N_("Show information about the file being played")
#define HELP_PREFS N_("Go to the preferences menu")
+#define EXTRA_PREFS N_("Shows the extended GUI")
#define HELP_ABOUT N_("About this program")
/* Create the "File" menu */
wxMenu *file_menu = new wxMenu;
- file_menu->Append( OpenFile_Event, wxU(_("&Open File...")),
+ file_menu->Append( OpenFileSimple_Event, wxU(_("Simple &Open ...")),
+ wxU(_(HELP_FILE)) );
+ file_menu->Append( OpenFile_Event, wxU(_("Open &File...")),
wxU(_(HELP_FILE)) );
file_menu->Append( OpenDisc_Event, wxU(_("Open &Disc...")),
wxU(_(HELP_DISC)) );
- file_menu->Append( OpenNet_Event, wxU(_("&Network Stream...")),
+ file_menu->Append( OpenNet_Event, wxU(_("Open &Network Stream...")),
wxU(_(HELP_NET)) );
#if 0
- file_menu->Append( OpenSat_Event, wxU(_("&Satellite Stream...")),
+ file_menu->Append( OpenSat_Event, wxU(_("Open &Satellite Stream...")),
wxU(_(HELP_NET)) );
#endif
#if 0
wxMenu *settings_menu = new wxMenu;
settings_menu->Append( Prefs_Event, wxU(_("&Preferences...")),
wxU(_(HELP_PREFS)) );
+ settings_menu->AppendCheckItem( Extra_Event, wxU(_("&Extended GUI") ),
+ wxU(_(EXTRA_PREFS)) );
/* Create the "Audio" menu */
p_audio_menu = new wxMenu;
p_navig_menu = new wxMenu;
b_navig_menu = 1;
+ /* Create the "Miscellaneous" menu */
+ p_misc_menu = new wxMenu;
+ b_misc_menu = 1;
+
/* Create the "Help" menu */
wxMenu *help_menu = new wxMenu;
help_menu->Append( About_Event, wxU(_("&About...")), wxU(_(HELP_ABOUT)) );
menubar->Append( p_audio_menu, wxU(_("&Audio")) );
menubar->Append( p_video_menu, wxU(_("&Video")) );
menubar->Append( p_navig_menu, wxU(_("&Navigation")) );
+ menubar->Append( p_misc_menu, wxU(_("&Miscellaneous")) );
menubar->Append( help_menu, wxU(_("&Help")) );
/* Attach the menu bar to the frame */
* version because we don't include wx.rc */
wxToolBar *toolbar = CreateToolBar(
- wxTB_HORIZONTAL | wxTB_FLAT | wxTB_DOCKABLE );
+ wxTB_HORIZONTAL | wxTB_FLAT | wxTB_DOCKABLE );
toolbar->SetToolBitmapSize( wxSize(TOOLBAR_BMP_WIDTH,TOOLBAR_BMP_HEIGHT) );
* toolbar and set this as the minimum for the main frame size. */
wxBoxSizer *toolbar_sizer = new wxBoxSizer( wxHORIZONTAL );
toolbar_sizer->Add( toolbar, 0, 0, 0 );
+
toolbar_sizer->Layout();
#ifndef WIN32
slider_frame->Hide();
}
-void Interface::Open( int i_access_method )
-{
- /* Show/hide the open dialog */
- if( p_open_dialog == NULL )
- p_open_dialog = new OpenDialog( p_intf, this, i_access_method );
- if( p_open_dialog &&
- p_open_dialog->ShowModal( i_access_method ) == wxID_OK )
+void Interface::CreateOurExtraPanel()
+{
+ 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 */
+ adjust_box = new wxStaticBox( extra_frame, -1, wxU(_("Image adjust")) );
+
+ /* 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();
+
+ 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);
+
+ extra_sizer->Add(adjust_sizer,1,wxBOTTOM,5);
+
+
+ /* Create static box to surround the other controls */
+ other_box = new wxStaticBox( extra_frame, -1, wxU(_("Video Options")) );
+
+ /* Create the sizer for the frame */
+ wxStaticBoxSizer *other_sizer =
+ new wxStaticBoxSizer( other_box, wxVERTICAL );
+ other_sizer->SetMinSize( -1, 50 );
+
+ static const wxString ratio_array[] =
{
- /* Update the playlist */
- playlist_t *p_playlist =
- (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist == NULL )
- {
- return;
- }
+ wxT("4:3"),
+ wxT("16:9"),
+ };
- for( size_t i = 0; i < p_open_dialog->mrl.GetCount(); i++ )
- {
- playlist_Add( p_playlist,
- (const char *)p_open_dialog->mrl[i].mb_str(),
- PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO), PLAYLIST_END );
- }
+ wxBoxSizer *ratio_sizer = new wxBoxSizer( wxHORIZONTAL );
+ wxStaticText *ratio_text = new wxStaticText( extra_frame, -1,
+ wxU(_("Ratio")) );
- TogglePlayButton( PLAYING_S );
+ ratio_combo = new wxComboBox( extra_frame, Ratio_Event, wxT(""),
+ wxDefaultPosition, wxSize(120,-1),
+ WXSIZEOF(ratio_array), ratio_array,
+ 0 );
- vlc_object_release( p_playlist );
+ ratio_sizer->Add( ratio_text, 0, wxALL, 2 );
+ ratio_sizer->Add( ratio_combo, 0, wxALL, 2 );
+ ratio_sizer->Layout();
+
+ other_sizer->Add(ratio_sizer,0,wxALL,0 );
+
+ extra_sizer->Add(other_sizer,0,wxBOTTOM,5);
+
+ extra_frame->SetSizer( extra_sizer );
+
+ /* Layout the whole panel */
+ extra_sizer->Layout();
+
+ extra_sizer->SetSizeHints(extra_frame);
+
+ /* Write down initial values */
+ psz_filters = config_GetPsz( p_intf, "filter" );
+
+ if(psz_filters == NULL) psz_filters=strdup("");
+
+ if( strstr(psz_filters,"adjust") )
+ {
+ adjust_check->SetValue( 1 );
+ saturation_slider->Enable();
+ contrast_slider->Enable();
+ brightness_slider->Enable();
+ hue_slider->Enable();
+ }
+ else
+ {
+ adjust_check->SetValue( 0 );
+ saturation_slider->Disable();
+ contrast_slider->Disable();
+ brightness_slider->Disable();
+ hue_slider->Disable();
}
+
+ 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) );
+
+ extra_frame->Hide();
+ free(psz_filters);
}
+void Interface::UpdateAcceleratorTable()
+{
+ /* Set some hotkeys */
+ wxAcceleratorEntry entries[7];
+ int i_key = config_GetInt( p_intf, "quit-key" );
+ int i = 0;
+ entries[i++].Set( ConvertHotkeyModifiers( i_key ), ConvertHotkey( i_key ),
+ Exit_Event );
+ i_key = config_GetInt( p_intf, "stop-key" );
+ entries[i++].Set( ConvertHotkeyModifiers( i_key ), ConvertHotkey( i_key ),
+ StopStream_Event );
+ i_key = config_GetInt( p_intf, "play-pause-key" );
+ entries[i++].Set( ConvertHotkeyModifiers( i_key ), ConvertHotkey( i_key ),
+ PlayStream_Event );
+ i_key = config_GetInt( p_intf, "next-key" );
+ entries[i++].Set( ConvertHotkeyModifiers( i_key ), ConvertHotkey( i_key ),
+ NextStream_Event );
+ i_key = config_GetInt( p_intf, "prev-key" );
+ entries[i++].Set( ConvertHotkeyModifiers( i_key ), ConvertHotkey( i_key ),
+ PrevStream_Event );
+ i_key = config_GetInt( p_intf, "faster-key" );
+ entries[i++].Set( ConvertHotkeyModifiers( i_key ), ConvertHotkey( i_key ),
+ FastStream_Event );
+ i_key = config_GetInt( p_intf, "slower-key" );
+ entries[i++].Set( ConvertHotkeyModifiers( i_key ), ConvertHotkey( i_key ),
+ 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" );
+
+}
+
+
+
/*****************************************************************************
* Event Handlers.
*****************************************************************************/
}
else b_navig_menu = 1;
}
+ else if( event.GetEventObject() == p_misc_menu )
+ {
+ if( b_misc_menu )
+ {
+ p_misc_menu = MiscMenu( p_intf, this );
+
+ /* Work-around for buggy wxGTK */
+ wxMenu *menu = GetMenuBar()->GetMenu( 6 );
+ RecursiveDestroy( menu );
+ /* End work-around */
+
+ menu = GetMenuBar()->Replace( 6, p_misc_menu,
+ wxU(_("&Miscellaneous")));
+ if( menu ) delete menu;
+
+ b_misc_menu = 0;
+ }
+ else b_misc_menu = 1;
+ }
#else
p_audio_menu = AudioMenu( p_intf, this );
menu = GetMenuBar()->Replace( 5, p_navig_menu, wxU(_("&Navigation")) );
if( menu ) delete menu;
+ p_misc_menu = MiscMenu( p_intf, this );
+ menu = GetMenuBar()->Replace( 6, p_misc_menu, wxU(_("&Miscellaneous")) );
+ if( menu ) delete menu;
#endif
}
#if defined( __WXMSW__ ) || defined( __WXMAC__ )
void Interface::OnContextMenu2(wxContextMenuEvent& event)
{
- ::PopupMenu( p_intf, this, ScreenToClient(event.GetPosition()) );
+ /* Only show the context menu for the main interface */
+ if( GetId() != event.GetId() )
+ {
+ event.Skip();
+ return;
+ }
+
+ if( p_intf->p_sys->pf_show_dialog )
+ p_intf->p_sys->pf_show_dialog( p_intf, INTF_DIALOG_POPUPMENU, 1, 0 );
}
#endif
void Interface::OnContextMenu(wxMouseEvent& event)
{
- ::PopupMenu( p_intf, this, event.GetPosition() );
+ if( p_intf->p_sys->pf_show_dialog )
+ p_intf->p_sys->pf_show_dialog( p_intf, INTF_DIALOG_POPUPMENU, 1, 0 );
}
void Interface::OnExit( wxCommandEvent& WXUNUSED(event) )
void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
{
wxString msg;
- msg.Printf( wxString(wxT("VLC media player")) +
+ msg.Printf( wxString(wxT("VLC media player " VERSION)) +
wxU(_(" (wxWindows interface)\n\n")) +
wxU(_("(C) 1996-2003 - the VideoLAN Team\n\n")) +
+ wxU( INTF_ABOUT_MSG ) + wxT("\n\n") +
wxU(_("The VideoLAN team <videolan@videolan.org>\n"
- "http://www.videolan.org/\n\n")) +
- wxU(_("This is the VideoLAN Client, a DVD, MPEG and DivX player."
- "\nIt can play MPEG and MPEG2 files from a file or from a "
- "network source.")) );
+ "http://www.videolan.org/\n\n")) );
wxMessageBox( msg, wxString::Format(wxU(_("About %s")),
wxT("VLC media player")), wxOK | wxICON_INFORMATION, this );
}
-void Interface::OnPlaylist( wxCommandEvent& WXUNUSED(event) )
+void Interface::OnShowDialog( wxCommandEvent& event )
{
- /* Show/hide the playlist window */
- Playlist *p_playlist_window = p_intf->p_sys->p_playlist_window;
- if( p_playlist_window )
+ if( p_intf->p_sys->pf_show_dialog )
{
- p_playlist_window->ShowPlaylist( ! p_playlist_window->IsShown() );
+ int i_id;
+
+ switch( event.GetId() )
+ {
+ case OpenFileSimple_Event:
+ i_id = INTF_DIALOG_FILE_SIMPLE;
+ break;
+ case OpenFile_Event:
+ i_id = INTF_DIALOG_FILE;
+ break;
+ case OpenDisc_Event:
+ i_id = INTF_DIALOG_DISC;
+ break;
+ case OpenNet_Event:
+ i_id = INTF_DIALOG_NET;
+ break;
+ case OpenSat_Event:
+ i_id = INTF_DIALOG_SAT;
+ break;
+ case Playlist_Event:
+ i_id = INTF_DIALOG_PLAYLIST;
+ break;
+ case Logs_Event:
+ i_id = INTF_DIALOG_MESSAGES;
+ break;
+ case FileInfo_Event:
+ i_id = INTF_DIALOG_FILEINFO;
+ break;
+ case Prefs_Event:
+ i_id = INTF_DIALOG_PREFS;
+ break;
+ default:
+ i_id = INTF_DIALOG_FILE;
+ break;
+
+ }
+
+ p_intf->p_sys->pf_show_dialog( p_intf, i_id, 1, 0 );
}
}
-void Interface::OnLogs( wxCommandEvent& WXUNUSED(event) )
+void Interface::OnExtra(wxCommandEvent& event)
{
- /* Show/hide the log window */
- wxFrame *p_messages_window = p_intf->p_sys->p_messages_window;
- if( p_messages_window )
+ if( b_extra == VLC_FALSE)
{
- p_messages_window->Show( ! p_messages_window->IsShown() );
+ extra_frame->Show();
+ frame_sizer->Show( extra_frame );
+ b_extra = VLC_TRUE;
}
-}
-
-void Interface::OnFileInfo( wxCommandEvent& WXUNUSED(event) )
-{
- /* Show/hide the file info window */
- wxFrame *p_fileinfo_window = p_intf->p_sys->p_fileinfo_window;
- if( p_fileinfo_window )
+ else
{
- p_fileinfo_window->Show( ! p_fileinfo_window->IsShown() );
+ extra_frame->Hide();
+ frame_sizer->Hide( extra_frame );
+ b_extra = VLC_FALSE;
}
+ frame_sizer->Layout();
+ frame_sizer->Fit(this);
}
-void Interface::OnPreferences( wxCommandEvent& WXUNUSED(event) )
+void Interface::OnEnableAdjust(wxCommandEvent& event)
{
- /* Show/hide the open dialog */
- if( p_prefs_dialog == NULL )
+ char *psz_filters=config_GetPsz( p_intf, "filter");
+ char *psz_new = NULL;
+ if( event.IsChecked() )
{
- p_prefs_dialog = new PrefsDialog( p_intf, this );
+ if(psz_filters == NULL)
+ {
+ psz_new = strdup( "adjust" );
+ }
+ else
+ {
+ psz_new= (char *) malloc(strlen(psz_filters) + 8 );
+ sprintf( psz_new, "%s:adjust", psz_filters);
+ }
+ 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();
}
-
- if( p_prefs_dialog )
+ else
{
- p_prefs_dialog->Show( true );
+ if( psz_filters != NULL )
+ {
+
+ 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 )
+ {
+ var_Set( p_vout, "filter", val);
+ vlc_object_release( p_vout );
+ }
+ if( val.psz_string ) free( val.psz_string );
+ }
+ brightness_slider->Disable();
+ saturation_slider->Disable();
+ contrast_slider->Disable();
+ hue_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::OnOpenFile( wxCommandEvent& WXUNUSED(event) )
+void Interface::OnSaturationUpdate( wxScrollEvent& event)
{
- Open( FILE_ACCESS );
+ config_PutFloat( p_intf , "saturation" , (float)event.GetPosition()/100 );
}
-void Interface::OnOpenDisc( wxCommandEvent& WXUNUSED(event) )
+void Interface::OnBrightnessUpdate( wxScrollEvent& event)
{
- Open( DISC_ACCESS );
+ config_PutFloat( p_intf , "brightness", (float)event.GetPosition()/100 );
}
-void Interface::OnOpenNet( wxCommandEvent& WXUNUSED(event) )
+void Interface::OnContrastUpdate(wxScrollEvent& event)
{
- Open( NET_ACCESS );
+ config_PutFloat( p_intf , "contrast" , (float)event.GetPosition()/100 );
+
}
-void Interface::OnOpenSat( wxCommandEvent& WXUNUSED(event) )
+void Interface::OnRatio( wxCommandEvent& event )
{
- Open( SAT_ACCESS );
+ config_PutPsz( p_intf, "aspect-ratio", ratio_combo->GetValue().mb_str() );
}
void Interface::OnPlayStream( wxCommandEvent& WXUNUSED(event) )
playlist_t *p_playlist =
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
- if( p_playlist == NULL )
- {
- /* If the playlist is empty, open a file requester instead */
- OnOpenFile( dummy );
- return;
- }
+ if( p_playlist == NULL ) return;
- vlc_mutex_lock( &p_playlist->object_lock );
- if( p_playlist->i_size )
+ if( p_playlist->i_size && p_playlist->i_enabled )
{
- vlc_mutex_unlock( &p_playlist->object_lock );
+ vlc_value_t state;
input_thread_t *p_input = (input_thread_t *)vlc_object_find( p_intf,
VLC_OBJECT_INPUT,
return;
}
- if( p_input->stream.control.i_status != PAUSE_S )
+ var_Get( p_input, "state", &state );
+
+ if( state.i_int != PAUSE_S )
{
/* A stream is being played, pause it */
- input_SetStatus( p_input, INPUT_STATUS_PAUSE );
- TogglePlayButton( PAUSE_S );
- vlc_object_release( p_playlist );
- vlc_object_release( p_input );
- return;
+ state.i_int = PAUSE_S;
+ }
+ else
+ {
+ /* Stream is paused, resume it */
+ state.i_int = PLAYING_S;
}
+ var_Set( p_input, "state", state );
- /* Stream is paused, resume it */
- playlist_Play( p_playlist );
- TogglePlayButton( PLAYING_S );
+ TogglePlayButton( state.i_int );
vlc_object_release( p_input );
vlc_object_release( p_playlist );
}
else
{
- vlc_mutex_unlock( &p_playlist->object_lock );
+ /* If the playlist is empty, open a file requester instead */
vlc_object_release( p_playlist );
- OnOpenFile( dummy );
+ OnShowDialog( dummy );
}
}
if( p_intf->p_sys->i_slider_pos != event.GetPosition()
&& p_intf->p_sys->p_input )
{
- p_intf->p_sys->i_slider_pos = event.GetPosition();
- input_Seek( p_intf->p_sys->p_input, p_intf->p_sys->i_slider_pos *
- 100 / SLIDER_MAX_POS,
- INPUT_SEEK_PERCENT | INPUT_SEEK_SET );
+ vlc_value_t pos;
+ pos.f_float = (float)event.GetPosition() / (float)SLIDER_MAX_POS;
+
+ var_Set( p_intf->p_sys->p_input, "position", pos );
}
#ifdef WIN32
return;
}
+ vlc_mutex_lock( &p_playlist->object_lock );
+ if( p_playlist->p_input != NULL )
+ {
+ vlc_mutex_lock( &p_playlist->p_input->stream.stream_lock );
+ if( p_playlist->p_input->stream.p_selected_area->i_id > 1 )
+ {
+ vlc_value_t val; val.b_bool = VLC_TRUE;
+ vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
+ var_Set( p_playlist->p_input, "prev-title", val );
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ vlc_object_release( p_playlist );
+ return;
+ }
+ vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
+ }
+ vlc_mutex_unlock( &p_playlist->object_lock );
+
playlist_Prev( p_playlist );
vlc_object_release( p_playlist );
}
return;
}
+ vlc_mutex_lock( &p_playlist->object_lock );
+ if( p_playlist->p_input != NULL )
+ {
+ vlc_mutex_lock( &p_playlist->p_input->stream.stream_lock );
+ if( p_playlist->p_input->stream.i_area_nb > 1 &&
+ p_playlist->p_input->stream.p_selected_area->i_id <
+ p_playlist->p_input->stream.i_area_nb - 1 )
+ {
+ vlc_value_t val; val.b_bool = VLC_TRUE;
+ vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
+ var_Set( p_playlist->p_input, "next-title", val );
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ vlc_object_release( p_playlist );
+ return;
+ }
+ vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
+ }
+ vlc_mutex_unlock( &p_playlist->object_lock );
+
playlist_Next( p_playlist );
vlc_object_release( p_playlist );
}
FIND_ANYWHERE );
if( p_input )
{
- input_SetStatus( p_input, INPUT_STATUS_SLOWER );
+ vlc_value_t val; val.b_bool = VLC_TRUE;
+
+ var_Set( p_input, "rate-slower", val );
vlc_object_release( p_input );
}
}
FIND_ANYWHERE );
if( p_input )
{
- input_SetStatus( p_input, INPUT_STATUS_FASTER );
+ vlc_value_t val; val.b_bool = VLC_TRUE;
+
+ var_Set( p_input, "rate-faster", val );
vlc_object_release( p_input );
}
}
if( i_playing_status == PLAYING_S )
{
GetToolBar()->InsertTool( 5, PlayStream_Event, wxU(_("Pause")),
- wxBitmap( pause_xpm ) );
+ wxBitmap( pause_xpm ), wxNullBitmap,
+ wxITEM_NORMAL, wxU(_(HELP_PAUSE)) );
}
else
{
GetToolBar()->InsertTool( 5, PlayStream_Event, wxU(_("Play")),
- wxBitmap( play_xpm ) );
+ wxBitmap( play_xpm ), wxNullBitmap,
+ wxITEM_NORMAL, wxU(_(HELP_PLAY)) );
}
GetToolBar()->Realize();
}
for( size_t i = 0; i < filenames.GetCount(); i++ )
- playlist_Add( p_playlist, (const char *)filenames[i].mb_str(),
+ playlist_Add( p_playlist, (const char *)filenames[i].mb_str(), 0, 0,
PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO), PLAYLIST_END );
vlc_object_release( p_playlist );
* Definition of wxVolCtrl class.
*****************************************************************************/
wxVolCtrl::wxVolCtrl( intf_thread_t *_p_intf, wxWindow* parent, wxWindowID id )
- : wxGauge( parent, id, 200, wxDefaultPosition, wxDefaultSize, wxGA_VERTICAL )
+ : wxGauge( parent, id, 200, wxDefaultPosition, wxDefaultSize,
+ wxGA_VERTICAL | wxGA_SMOOTH )
{
p_intf = _p_intf;
}
void wxVolCtrl::OnChange( wxMouseEvent& event )
{
- int i_volume = (GetRect().height - event.GetY()) * 200 / GetRect().height;
+ if( !event.LeftDown() && !event.LeftIsDown() ) return;
+
+ int i_volume = (GetClientSize().GetHeight() - event.GetY()) * 200 /
+ GetClientSize().GetHeight();
Change( i_volume );
}
void wxVolCtrl::Change( int i_volume )
{
- aout_VolumeSet( p_intf, i_volume * AOUT_VOLUME_MAX / 200 );
+ aout_VolumeSet( p_intf, i_volume * AOUT_VOLUME_MAX / 200 / 2 );
SetValue( i_volume );
- SetToolTip( wxString::Format(wxU(_("Volume")) + wxT(" %d"), i_volume ) );
+ SetToolTip( wxString::Format((wxString)wxU(_("Volume")) + wxT(" %d"),
+ i_volume ) );
}
projects / vlc / blobdiff