OpenFile_Event,
OpenDisc_Event,
OpenNet_Event,
+ OpenCapture_Event,
OpenSat_Event,
OpenOther_Event,
EjectDisc_Event,
StreamWizard_Event,
+ Wizard_Event,
Playlist_Event,
Logs_Event,
FastStream_Event,
Adjust_Event,
+ RestoreDefaults_Event,
Hue_Event,
Contrast_Event,
Brightness_Event,
EVT_MENU( Bookmarks_Event, Interface::OnShowDialog)
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(OpenFile_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)
/* 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)
+
+ 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::UpdateSizeEvent)
+ EVT_COMMAND(0, wxEVT_INTF, Interface::OnControlEvent)
+ EVT_COMMAND(1, wxEVT_INTF, Interface::OnControlEvent)
END_EVENT_TABLE()
delete timer;
}
-void Interface::UpdateSizeEvent( wxCommandEvent& event )
+void Interface::OnControlEvent( wxCommandEvent& event )
{
- frame_sizer->Layout();
- frame_sizer->Fit(this);
+ switch( event.GetId() )
+ {
+ case 0:
+ frame_sizer->Layout();
+ frame_sizer->Fit(this);
+ break;
+
+ case 1:
+ long i_style = GetWindowStyle();
+ if( event.GetInt() ) i_style |= wxSTAY_ON_TOP;
+ else i_style &= ~wxSTAY_ON_TOP;
+ SetWindowStyle( i_style );
+ break;
+ }
}
/*****************************************************************************
*****************************************************************************/
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")
-
/* Create the "File" menu */
wxMenu *file_menu = new wxMenu;
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( 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)) );
+ wxU(_("Streaming &Wizard...\tCtrl-W")) );
+#if 0
+ file_menu->Append( Wizard_Event, wxU(_("New Wizard...")) );
+#endif
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)) );
+ 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)) );
-
- /* Create the "Settings" menu */
- p_settings_menu = new wxMenu;
- b_settings_menu = 1;
-
- /* Create the "Audio" menu */
- p_audio_menu = new wxMenu;
- b_audio_menu = 1;
+ wxU(_("Stream and Media &info...\tCtrl-I")) );
- /* Create the "Video" menu */
- p_video_menu = new wxMenu;
- b_video_menu = 1;
-
- /* Create the "Navigation" menu */
- p_navig_menu = new wxMenu;
- b_navig_menu = 1;
+ /* Create the "Auto-generated" menus */
+ p_settings_menu = SettingsMenu( p_intf, this );
+ p_audio_menu = AudioMenu( p_intf, this );
+ p_video_menu = VideoMenu( p_intf, this );
+ p_navig_menu = NavigMenu( 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 );
/* 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__)
+ 20 /* approximate margin */;
+#else
+ 4 /* approximate margin */;
+#endif
+ }
+ frame_sizer->SetMinSize( i_size, -1 );
+
/* Intercept all menu events in our custom event handler */
PushEventHandler( new MenuEvtHandler( p_intf, this ) );
void Interface::CreateOurToolBar()
{
#define HELP_STOP N_("Stop")
-
#define HELP_PLAY N_("Play")
#define HELP_PAUSE N_("Pause")
#define HELP_PLO N_("Playlist")
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__)
/* Associate drop targets with the toolbar */
toolbar->SetDropTarget( new DragAndDrop( p_intf ) );
/* 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 );
-
- /* Create static box to surround the slider */
- slider_box = new wxStaticBox( slider_frame, -1, wxT("") );
-
- /* Create sizer for slider frame */
- wxStaticBoxSizer *slider_sizer =
- new wxStaticBoxSizer( slider_box, wxHORIZONTAL );
- slider_sizer->SetMinSize( -1, 50 );
+ wxBoxSizer *frame_sizer = new wxBoxSizer( wxHORIZONTAL );
+ //frame_sizer->SetMinSize( -1, 50 );
/* Create slider */
slider = new wxSlider( slider_frame, SliderScroll_Event, 0, 0,
SLIDER_MAX_POS, wxDefaultPosition, wxDefaultSize );
- slider_sizer->Add( slider, 1, wxEXPAND | wxALL, 5 );
/* Add everything to the frame */
- frame_sizer->Add( slider_sizer, 1, wxEXPAND | wxBOTTOM, 5 );
+ frame_sizer->Add( slider, 1, wxEXPAND | wxALL, 5 );
slider_frame->SetSizer( frame_sizer );
frame_sizer->Layout();
frame_sizer->SetSizeHints(slider_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 */
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);
- 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);
+ 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 */
if( psz_filters && strstr( psz_filters, "adjust" ) )
{
adjust_check->SetValue( 1 );
+ restoredefaults_button->Enable();
saturation_slider->Enable();
contrast_slider->Enable();
brightness_slider->Enable();
else
{
adjust_check->SetValue( 0 );
+ restoredefaults_button->Disable();
saturation_slider->Disable();
contrast_slider->Disable();
brightness_slider->Disable();
/*****************************************************************************
* Event Handlers.
*****************************************************************************/
-/* Work-around helper for buggy wxGTK */
-void RecursiveDestroy( wxMenu *menu )
-{
- wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
- for( ; node; )
- {
- wxMenuItem *item = node->GetData();
- node = node->GetNext();
-
- /* Delete the submenus */
- wxMenu *submenu = item->GetSubMenu();
- if( submenu )
- {
- RecursiveDestroy( submenu );
- }
- menu->Delete( item );
- }
-}
void Interface::OnMenuOpen(wxMenuEvent& event)
{
-#if !defined( __WXMSW__ )
+#if defined( __WXMSW__ )
+# define GetEventObject GetMenu
+#endif
+
if( event.GetEventObject() == p_settings_menu )
{
- if( b_settings_menu )
- {
- p_settings_menu = SettingsMenu( p_intf, this );
-
- /* 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)) );
-
- /* Work-around for buggy wxGTK */
- wxMenu *menu = GetMenuBar()->GetMenu( 2 );
- RecursiveDestroy( menu );
- /* End work-around */
-
- menu = GetMenuBar()->Replace( 2, p_settings_menu,
- wxU(_("&Settings")));
- if( menu ) delete menu;
-
- b_settings_menu = 0;
- }
- else b_settings_menu = 1;
+ p_settings_menu = SettingsMenu( p_intf, this, p_settings_menu );
+
+ /* Add static items */
+ p_settings_menu->AppendCheckItem( Extended_Event,
+ wxU(_("&Extended GUI") ) );
+ p_settings_menu->AppendCheckItem( Bookmarks_Event,
+ wxU(_("&Bookmarks...") ) );
+ p_settings_menu->Append( Prefs_Event, wxU(_("&Preferences...")) );
}
+
else if( event.GetEventObject() == p_audio_menu )
{
- if( b_audio_menu )
- {
- p_audio_menu = AudioMenu( p_intf, this );
-
- /* Work-around for buggy wxGTK */
- wxMenu *menu = GetMenuBar()->GetMenu( 3 );
- RecursiveDestroy( menu );
- /* End work-around */
-
- menu =
- GetMenuBar()->Replace( 3, p_audio_menu, wxU(_("&Audio")) );
- if( menu ) delete menu;
-
- b_audio_menu = 0;
- }
- else b_audio_menu = 1;
+ p_audio_menu = AudioMenu( p_intf, this, p_audio_menu );
}
+
else if( event.GetEventObject() == p_video_menu )
{
- if( b_video_menu )
- {
- p_video_menu = VideoMenu( p_intf, this );
-
- /* Work-around for buggy wxGTK */
- wxMenu *menu = GetMenuBar()->GetMenu( 4 );
- RecursiveDestroy( menu );
- /* End work-around */
-
- menu =
- GetMenuBar()->Replace( 4, p_video_menu, wxU(_("&Video")) );
- if( menu ) delete menu;
-
- b_video_menu = 0;
- }
- else b_video_menu = 1;
+ p_video_menu = VideoMenu( p_intf, this, p_video_menu );
}
+
else if( event.GetEventObject() == p_navig_menu )
{
- if( b_navig_menu )
- {
- p_navig_menu = NavigMenu( p_intf, this );
-
- /* Work-around for buggy wxGTK */
- wxMenu *menu = GetMenuBar()->GetMenu( 5 );
- RecursiveDestroy( menu );
- /* End work-around */
-
- menu =
- GetMenuBar()->Replace( 5, p_navig_menu, wxU(_("&Navigation")));
- if( menu ) delete menu;
-
- b_navig_menu = 0;
- }
- else b_navig_menu = 1;
+ p_navig_menu = NavigMenu( p_intf, this, p_navig_menu );
}
-#else
- p_settings_menu = SettingsMenu( p_intf, this );
- /* 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)) );
- wxMenu *menu =
- GetMenuBar()->Replace( 2, p_settings_menu, wxU(_("&Settings")) );
- if( menu ) delete menu;
-
- p_audio_menu = AudioMenu( p_intf, this );
- menu = GetMenuBar()->Replace( 3, p_audio_menu, wxU(_("&Audio")) );
- if( menu ) delete menu;
-
- p_video_menu = VideoMenu( p_intf, this );
- menu = GetMenuBar()->Replace( 4, p_video_menu, wxU(_("&Video")) );
- if( menu ) delete menu;
-
- p_navig_menu = NavigMenu( p_intf, this );
- menu = GetMenuBar()->Replace( 5, p_navig_menu, wxU(_("&Navigation")) );
- if( menu ) delete menu;
+#if defined( __WXMSW__ )
+# undef GetEventObject
#endif
-
}
#if defined( __WXMSW__ ) || defined( __WXMAC__ )
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 StreamWizard_Event:
i_id = INTF_DIALOG_STREAMWIZARD;
break;
+ case Wizard_Event:
+ i_id = INTF_DIALOG_WIZARD;
+ break;
case Bookmarks_Event:
i_id = INTF_DIALOG_BOOKMARKS;
break;
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();
}
if( val.psz_string ) free( val.psz_string );
}
+ restoredefaults_button->Disable();
brightness_slider->Disable();
saturation_slider->Disable();
contrast_slider->Disable();
if(psz_new) free(psz_new);
}
-void Interface::OnHueUpdate( wxScrollEvent& event)
+void Interface::OnRestoreDefaults( wxCommandEvent &event)
{
- config_PutInt( p_intf , "hue" , event.GetPosition() );
-}
+ 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);
-void Interface::OnSaturationUpdate( wxScrollEvent& 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 );
}
-void Interface::OnGammaUpdate(wxScrollEvent& event)
+void Interface::OnAdjustUpdate( wxScrollEvent &event)
{
- config_PutFloat( p_intf , "gamma" , (float)event.GetPosition()/10 );
+ 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())
+ {
+ 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;
+ }
+ else
+ {
+ vlc_value_t val;
+ switch(event.GetId())
+ {
+ 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;
+ }
+ vlc_object_release(p_vout);
+ }
}
void Interface::OnRatio( wxCommandEvent& event )
{
/* Update stream date */
#define p_area p_intf->p_sys->p_input->stream.p_selected_area
- char psz_time[ MSTRTIME_MAX_SIZE ];
+ 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 );
- slider_box->SetLabel(
+ statusbar->SetStatusText(
wxU(input_OffsetToTime( p_intf->p_sys->p_input,
- psz_time,
- p_area->i_size * event.GetPosition()
- / SLIDER_MAX_POS )) );
+ psz_time, p_area->i_size * event.GetPosition()
+ / SLIDER_MAX_POS )) + wxString(wxT(" / ")) +
+ wxU(psz_total), 0 );
#undef p_area
}
}
projects / vlc / blobdiff