/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int InteractCallback( vlc_object_t *, const char *, vlc_value_t,
+ static int InteractCallback( vlc_object_t *, const char *, vlc_value_t,
vlc_value_t, void *);
/*****************************************************************************
};
-class wxVolCtrl;
-class VLCVolCtrl : public wxControl
-{
-public:
- VLCVolCtrl( intf_thread_t *p_intf, wxWindow *p_parent );
- virtual ~VLCVolCtrl() {};
-
- virtual void OnPaint( wxPaintEvent &event );
- void OnChange( wxMouseEvent& event );
- void UpdateVolume();
-
- private:
- DECLARE_EVENT_TABLE()
-
- wxVolCtrl *gauge;
- int i_y_offset;
- vlc_bool_t b_mute;
- intf_thread_t *p_intf;
-};
-
-BEGIN_EVENT_TABLE(VLCVolCtrl, wxControl)
- EVT_PAINT(VLCVolCtrl::OnPaint)
-
- /* Mouse events */
- EVT_LEFT_UP(VLCVolCtrl::OnChange)
-END_EVENT_TABLE()
-
class Splitter : public wxSplitterWindow
{
public:
p_intf->p_sys->p_video_sizer->GetMinSize() != wxSize(0,0) )
{
if( !b_video ) i_delay = mdate() + 1000000;
- b_video = VLC_TRUE;
+ b_video = true;
SetSashSize( -1 );
wxSize size = GetWindow1()->GetSizer()->GetMinSize();
if( b_video ) i_delay = mdate() + 1000000;
- b_video = VLC_FALSE;
+ b_video = false;
if( event.GetSize().GetHeight() - size.GetHeight() )
{
intf_thread_t *p_intf;
int i_sash_position;
int i_width;
- vlc_bool_t b_video;
+ bool b_video;
mtime_t i_delay;
- vlc_bool_t b_show_on_start;
+ bool b_show_on_start;
};
BEGIN_EVENT_TABLE(Splitter, wxSplitterWindow)
NextStream_Event,
SlowStream_Event,
FastStream_Event,
+ ToggleMute_Event,
+ SlideVolume_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
About_Event = wxID_ABOUT,
OnWebLink_Event,
OnWebHelp_Event,
+#ifdef UPDATE_CHECK
UpdateVLC_Event,
- VLM_Event,
+#endif
+ //VLM_Event,
Iconize_Event,
};
EVT_MENU(About_Event, Interface::OnAbout)
EVT_MENU(OnWebLink_Event, Interface::OnWebLink)
EVT_MENU(OnWebHelp_Event, Interface::OnWebHelp)
+#ifdef UPDATE_CHECK
EVT_MENU(UpdateVLC_Event, Interface::OnShowDialog)
- EVT_MENU(VLM_Event, Interface::OnShowDialog)
+#endif
+ //EVT_MENU(VLM_Event, Interface::OnShowDialog)
EVT_MENU(Playlist_Event, Interface::OnShowDialog)
EVT_MENU(PlaylistSmall_Event, Interface::OnSmallPlaylist)
EVT_MENU(NextStream_Event, Interface::OnNextStream)
EVT_MENU(SlowStream_Event, Interface::OnSlowStream)
EVT_MENU(FastStream_Event, Interface::OnFastStream)
+ EVT_MENU(ToggleMute_Event, Interface::OnToggleMute)
+ EVT_COMMAND_SCROLL(SlideVolume_Event, Interface::OnSlideVolume)
/* Custom events */
EVT_COMMAND(0, wxEVT_INTF, Interface::OnControlEvent)
{
/* Initializations */
p_intf = _p_intf;
- b_extra = VLC_FALSE;
+ b_extra = false;
extra_frame = 0;
playlist_manager = 0;
i_update_counter = 0;
/* Give our interface a nice little icon */
- SetIcon( wxIcon( vlc_xpm ) );
+ SetIcon( wxIcon( (const char**) vlc_xpm ) );
/* Create a splitter window that will fill in the interface window.
* We need a splitter bar in order to make the embedded playlist
/* Creation of the status bar
* Helptext for menu items and toolbar tools will automatically get
* displayed here. */
- int i_status_width[3] = {100, 40, -1};
+ int i_status_width[3] = {150, 55, -1};
statusbar = CreateStatusBar( 3 ); /* 2 fields */
statusbar->SetStatusWidths( 3, i_status_width );
statusbar->SetStatusText( wxString::Format(wxT("x%.2f"), 1.0), 1 );
var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
var_AddCallback( p_intf, "interaction", InteractCallback, this );
- p_intf->b_interaction = VLC_TRUE;
+ p_intf->b_interaction = true;
/* Show embedded playlist if requested */
if( splitter->ShowOnStart() ) OnSmallPlaylist( dummy );
PopEventHandler(true);
- if( video_window ) delete video_window;
+ delete video_window;
/* wxCocoa pretends to support this, but at least 2.6.x doesn't */
#ifndef __APPLE__
#ifdef wxHAS_TASK_BAR_ICON
- if( p_systray ) delete p_systray;
+ delete p_systray;
#endif
#endif
- p_intf->b_interaction = VLC_FALSE;
+ p_intf->b_interaction = false;
var_DelCallback( p_intf, "interaction", InteractCallback, this );
- if( p_intf->p_sys->p_wxwindow ) delete p_intf->p_sys->p_wxwindow;
+ delete p_intf->p_sys->p_wxwindow;
/* Clean up */
void Interface::Update()
{
/* Misc updates */
- if( !(i_update_counter % 10) ) ((VLCVolCtrl *)volctrl)->UpdateVolume();
if( playlist_manager ) playlist_manager->Update();
view_menu->Append( Logs_Event, wxU(_("&Messages...\tCtrl-M")) );
view_menu->Append( FileInfo_Event,
wxU(_("Stream and Media &Info...\tCtrl-I")) );
+#if 0
view_menu->Append( VLM_Event,
wxU(_("VLM Control...\tCtrl-V")) );
+#endif
/* Create the "Auto-generated" menus */
p_settings_menu = SettingsMenu( p_intf, this );
help_menu->Append( OnWebHelp_Event, wxU(_("Online Help")) );
help_menu->AppendSeparator();
help_menu->Append( About_Event, wxU(_("About...")) );
+#ifdef UPDATE_CHECK
help_menu->AppendSeparator();
help_menu->Append( UpdateVLC_Event, wxU(_("Check for Updates...")) );
+#endif
/* Append the freshly created menus to the menu bar... */
wxMenuBar *menubar = new wxMenuBar();
menubar->Append( file_menu, wxU(_("&File")) );
- menubar->Append( view_menu, wxU(_("&View")) );
+ menubar->Append( view_menu, wxU(_("V&iew")) );
menubar->Append( p_settings_menu, wxU(_("&Settings")) );
menubar->Append( p_audio_menu, wxU(_("&Audio")) );
menubar->Append( p_video_menu, wxU(_("&Video")) );
#define HELP_PLN N_("Next playlist item")
#define HELP_SLOW N_("Play slower")
#define HELP_FAST N_("Play faster")
+#define HELP_VOL N_("Toggle mute/unmute of the audio")
#define LABEL_OPEN N_("Open")
#define LABEL_STOP N_("Stop")
#define LABEL_PLN N_("Next")
#define LABEL_SLOW N_("Slower")
#define LABEL_FAST N_("Faster")
+#define LABEL_VOL N_("Mute")
+
int minimal = config_GetInt( p_intf, "wx-minimal" );
bool label = config_GetInt( p_intf, "wx-labels" );
wxBitmap( playlist_small_xpm ), wxU(_(HELP_SPLO)) );
}
- wxControl *p_dummy_ctrl =
- new wxControl( toolbar, -1, wxDefaultPosition,
- wxSize(16, 16 ), wxBORDER_NONE );
-
- toolbar->AddControl( p_dummy_ctrl );
+ wxToolBarToolBase *v_tool = toolbar->AddTool( ToggleMute_Event,
+ wxU(LABEL_VOL), wxBitmap( speaker_xpm ),
+ wxU(_(HELP_VOL)), wxITEM_CHECK );
+ v_tool->SetClientData( v_tool );
- volctrl = new VLCVolCtrl( p_intf, toolbar );
- toolbar->AddControl( volctrl );
+ wxSlider *v_gauge = new wxSlider(toolbar, SlideVolume_Event, 256, 0,
+ AOUT_VOLUME_MAX, wxDefaultPosition,
+ wxSize(64,TOOLBAR_BMP_HEIGHT), wxSL_HORIZONTAL);
+ toolbar->AddControl(v_gauge);
toolbar->Realize();
void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
{
wxString msg;
- msg.Printf( wxString(wxT("VLC media player " PACKAGE_VERSION)) +
+ msg.Printf( wxString(wxT("VLC media player " VERSION_MESSAGE)) +
wxU(_(" (wxWidgets interface)\n\n")) +
- wxU(_("(c) 1996-2006 - the VideoLAN Team\n\n")) +
+ wxU(_("(c) " COPYRIGHT_YEARS " - the VideoLAN Team\n\n")) +
wxU(_("Compiled by "))+ wxU(VLC_CompileBy())+ wxU("@") +
wxU(VLC_CompileHost())+ wxT(".")+ wxU(VLC_CompileDomain())+ wxT(".\n") +
wxU(_("Compiler: "))+ wxU(VLC_Compiler())+wxT( ".\n") +
-#ifndef HAVE_SHARED_LIBVLC
- wxU(_("Based on SVN revision: "))+wxU(VLC_Changeset())+wxT(".\n\n") +
-#endif
+ wxU(_("Based on Git commit: "))+wxU(VLC_Changeset())+wxT(".\n\n") +
#ifdef __WXMSW__
wxU( vlc_wraptext(LICENSE_MSG,WRAPCOUNT) ) + wxT("\n\n") +
#else
case Bookmarks_Event:
i_id = INTF_DIALOG_BOOKMARKS;
break;
+#ifdef UPDATE_CHECK
case UpdateVLC_Event:
i_id = INTF_DIALOG_UPDATEVLC;
break;
+#endif
+#if 0
case VLM_Event:
i_id = INTF_DIALOG_VLM;
break;
+#endif
default:
i_id = INTF_DIALOG_FILE;
break;
void Interface::PlayStream()
{
wxCommandEvent dummy;
- playlist_t *p_playlist =
- (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t *p_playlist = pl_Yield( p_intf );
if( p_playlist == NULL ) return;
- if( !playlist_IsEmpty(p_playlist) && p_playlist->i_enabled )
+ if( !playlist_IsEmpty(p_playlist) )
{
vlc_value_t state;
{
/* No stream was playing, start one */
playlist_Play( p_playlist );
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
input_manager->Update();
return;
}
var_Set( p_input, "state", state );
vlc_object_release( p_input );
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
input_manager->Update();
}
else
{
/* If the playlist is empty, open a file requester instead */
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
OnShowDialog( dummy );
GetToolBar()->ToggleTool( PlayStream_Event, false );
}
}
void Interface::StopStream()
{
- playlist_t * p_playlist =
- (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t * p_playlist = pl_Yield( p_intf );
if( p_playlist == NULL )
{
return;
}
playlist_Stop( p_playlist );
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
input_manager->Update();
}
void Interface::PrevStream()
{
- playlist_t * p_playlist =
- (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t * p_playlist = pl_Yield( p_intf );
if( p_playlist == NULL )
{
return;
}
playlist_Prev( p_playlist );
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
}
void Interface::OnNextStream( wxCommandEvent& WXUNUSED(event) )
void Interface::NextStream()
{
- playlist_t * p_playlist =
- (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t * p_playlist = pl_Yield( p_intf );
if( p_playlist == NULL )
{
return;
}
playlist_Next( p_playlist );
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
}
void Interface::OnSlowStream( wxCommandEvent& WXUNUSED(event) )
FIND_ANYWHERE );
if( p_input )
{
- vlc_value_t val; val.b_bool = VLC_TRUE;
+ vlc_value_t val; val.b_bool = true;
var_Set( p_input, "rate-slower", val );
vlc_object_release( p_input );
FIND_ANYWHERE );
if( p_input )
{
- vlc_value_t val; val.b_bool = VLC_TRUE;
+ vlc_value_t val; val.b_bool = true;
var_Set( p_input, "rate-faster", val );
vlc_object_release( p_input );
}
}
+void Interface::OnToggleMute ( wxCommandEvent& WXUNUSED(event) )
+{
+ aout_VolumeMute(p_intf, NULL);
+ SyncVolume();
+
+}
+
+void Interface::SyncVolume()
+{
+ wxToolBarToolBase *p_tool = (wxToolBarToolBase *)
+ GetToolBar()->GetToolClientData( ToggleMute_Event );
+ if ( !p_tool) return;
+
+ audio_volume_t i_volume;
+ aout_VolumeGet(p_intf, &i_volume);
+
+ /* Updating the Mute Button... IF the slider is completely moved to the left,
+ * the mute icon is shown too. */
+ p_tool->SetNormalBitmap( wxBitmap( i_volume ? speaker_xpm : speaker_mute_xpm ) );
+ GetToolBar()->Realize();
+#if defined( __WXMSW__ )
+ /* Needed to work around a bug in wxToolBar::Realize() */
+ GetToolBar()->SetSize( GetSize().GetWidth(),
+ GetToolBar()->GetSize().GetHeight() );
+ GetToolBar()->Update();
+#endif
+ /* the Toggle to true and false is nescessary; otherwise, the Icon
+ * is not repainted */
+ GetToolBar()->ToggleTool( ToggleMute_Event, true );
+ GetToolBar()->ToggleTool( ToggleMute_Event, false );
+ GetToolBar()->Update();
+}
+
+void Interface::OnSlideVolume( wxScrollEvent& WXUNUSED(event))
+{
+ wxSlider *p_tool = (wxSlider *)
+ GetToolBar()->FindControl( SlideVolume_Event );
+ if ( !p_tool) return;
+
+ aout_VolumeSet(p_intf , p_tool->GetValue());
+ SyncVolume();
+
+}
+
void Interface::TogglePlayButton( int i_playing_status )
{
wxToolBarToolBase *p_tool = (wxToolBarToolBase *)
/*****************************************************************************
* Definition of DragAndDrop class.
*****************************************************************************/
-DragAndDrop::DragAndDrop( intf_thread_t *_p_intf, vlc_bool_t _b_enqueue )
+DragAndDrop::DragAndDrop( intf_thread_t *_p_intf, bool _b_enqueue )
{
p_intf = _p_intf;
b_enqueue = _b_enqueue;
const wxArrayString& filenames )
{
/* Add dropped files to the playlist */
-
- playlist_t *p_playlist =
- (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t *p_playlist = pl_Yield( p_intf );
if( p_playlist == NULL )
{
return FALSE;
VLC_OBJECT_INPUT, FIND_ANYWHERE );
if( p_input )
{
- if( input_AddSubtitles( p_input, psz_utf8, VLC_TRUE ) )
+ if( input_AddSubtitles( p_input, psz_utf8, true ) )
{
vlc_object_release( p_input );
wxDnDLocaleFree( psz_utf8 );
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
return TRUE;
}
vlc_object_release( p_input );
playlist_Add( p_playlist, psz_utf8, NULL,
PLAYLIST_APPEND | ((i | b_enqueue) ? 0 : PLAYLIST_GO),
- PLAYLIST_END, VLC_TRUE );
+ PLAYLIST_END, true, false );
wxDnDLocaleFree( psz_utf8 );
}
-
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
return TRUE;
}
#endif
-/*****************************************************************************
- * 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();
- int GetVolume();
-
- 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;
- UpdateVolume();
-}
-
-void wxVolCtrl::OnChange( wxMouseEvent& event )
-{
- if( !event.LeftDown() && !event.LeftIsDown() ) return;
-
- int i_volume = event.GetX() * 200 / GetClientSize().GetWidth();
- aout_VolumeSet( p_intf, i_volume * AOUT_VOLUME_MAX / 200 / 2 );
- UpdateVolume();
-}
-
-void wxVolCtrl::UpdateVolume()
-{
- 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_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();
-
- int i_volume = gauge->GetValue();
- if( !!i_volume == !b_mute ) return;
- b_mute = !b_mute;
- Refresh();
-}
-
/*****************************************************************************
* Systray class.
*****************************************************************************/
p_main_interface = _p_main_interface;
p_intf = _p_intf;
- SetIcon( wxIcon( vlc16x16_xpm ), wxT("VLC media player") );
+ SetIcon( wxIcon( (const char**) vlc16x16_xpm ), wxT("VLC media player") );
if( !IsOk() || !IsIconInstalled() )
{
msg_Warn(p_intf, "cannot set systray icon, weird things may happen");
void Systray::UpdateTooltip( const wxChar* tooltip )
{
- SetIcon( wxIcon( vlc16x16_xpm ), tooltip );
+ SetIcon( wxIcon( (const char**) vlc16x16_xpm ), tooltip );
}
#endif
#endif
projects / vlc / blobdiff