diff options
Diffstat (limited to 'src/wx')
35 files changed, 108 insertions, 18 deletions
diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h index 3057416b2..e20e5289b 100644 --- a/src/wx/audio_mapping_view.h +++ b/src/wx/audio_mapping_view.h @@ -23,9 +23,12 @@ * */ -#include <boost/signals2.hpp> -#include <wx/wx.h> #include "lib/audio_mapping.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS +#include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS +#include <boost/signals2.hpp> /** @class AudioMappingView * @brief This class displays the mapping of one set of audio channels to another, diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h index 5c366ca7b..cfdab5f3c 100644 --- a/src/wx/closed_captions_dialog.h +++ b/src/wx/closed_captions_dialog.h @@ -21,7 +21,10 @@ #include "lib/dcpomatic_time.h" #include "lib/player.h" #include "lib/text_ring_buffers.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS class Butler; class FilmViewer; diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 7d854224d..9a96bcc1b 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -43,10 +43,13 @@ #include "lib/string_text_file_content.h" #include "lib/string_text_file.h" #include "lib/dcpomatic_log.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> #include <wx/notebook.h> #include <wx/listctrl.h> #include <wx/display.h> +DCPOMATIC_ENABLE_WARNINGS #include <boost/filesystem.hpp> #include <boost/foreach.hpp> #include <iostream> @@ -664,7 +667,7 @@ ContentPanel::set_selection (ContentList cl) _no_check_selection = true; ContentList content = _film->content (); - for (size_t i = 0; i < content.size(); ++i) { + for (long int i = 0; i < static_cast<long int>(content.size()); ++i) { if (find(cl.begin(), cl.end(), content[i]) != cl.end()) { _content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } else { diff --git a/src/wx/content_sub_panel.h b/src/wx/content_sub_panel.h index d5f502eea..507d35360 100644 --- a/src/wx/content_sub_panel.h +++ b/src/wx/content_sub_panel.h @@ -21,10 +21,13 @@ #ifndef DCPOMATIC_CONTENT_SUB_PANEL_H #define DCPOMATIC_CONTENT_SUB_PANEL_H -#include <boost/shared_ptr.hpp> -#include <wx/wx.h> -#include "lib/film.h" #include "lib/config.h" +#include "lib/film.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS +#include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS +#include <boost/shared_ptr.hpp> class ContentPanel; class Content; diff --git a/src/wx/content_view.h b/src/wx/content_view.h index 334e9bb68..3f4a65ab1 100644 --- a/src/wx/content_view.h +++ b/src/wx/content_view.h @@ -19,7 +19,10 @@ */ #include "lib/content_store.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/listctrl.h> +DCPOMATIC_ENABLE_WARNINGS #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> #include <vector> diff --git a/src/wx/controls.h b/src/wx/controls.h index b9c4604b6..1d6273af6 100644 --- a/src/wx/controls.h +++ b/src/wx/controls.h @@ -24,7 +24,10 @@ #include "lib/dcpomatic_time.h" #include "lib/types.h" #include "lib/film.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS #include <boost/shared_ptr.hpp> #include <boost/signals2.hpp> diff --git a/src/wx/custom_scale_dialog.cc b/src/wx/custom_scale_dialog.cc index 3452d5765..21eb2e8ed 100644 --- a/src/wx/custom_scale_dialog.cc +++ b/src/wx/custom_scale_dialog.cc @@ -22,10 +22,13 @@ #include "custom_scale_dialog.h" #include "wx_util.h" #include "lib/util.h" +#include "lib/warnings.h" #include <dcp/raw_convert.h> +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> #include <wx/propgrid/property.h> #include <wx/propgrid/props.h> +DCPOMATIC_ENABLE_WARNINGS using boost::optional; diff --git a/src/wx/custom_scale_dialog.h b/src/wx/custom_scale_dialog.h index 4c9ccf388..23b83b469 100644 --- a/src/wx/custom_scale_dialog.h +++ b/src/wx/custom_scale_dialog.h @@ -21,8 +21,11 @@ #include "table_dialog.h" #include <dcp/types.h> +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> #include <wx/spinctrl.h> +DCPOMATIC_ENABLE_WARNINGS class CustomScaleDialog : public TableDialog diff --git a/src/wx/download_certificate_dialog.h b/src/wx/download_certificate_dialog.h index a2fbf808f..ef241a0ca 100644 --- a/src/wx/download_certificate_dialog.h +++ b/src/wx/download_certificate_dialog.h @@ -18,9 +18,12 @@ */ +#include "lib/warnings.h" #include <dcp/certificate.h> +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> #include <wx/notebook.h> +DCPOMATIC_ENABLE_WARNINGS class DownloadCertificatePanel; diff --git a/src/wx/download_certificate_panel.h b/src/wx/download_certificate_panel.h index 2ad03f7c0..ba355f813 100644 --- a/src/wx/download_certificate_panel.h +++ b/src/wx/download_certificate_panel.h @@ -21,8 +21,11 @@ #ifndef DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H #define DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H +#include "lib/warnings.h" #include <dcp/certificate.h> +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS #include <boost/optional.hpp> class DownloadCertificateDialog; diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h index ca58009a4..df69405c4 100644 --- a/src/wx/editable_list.h +++ b/src/wx/editable_list.h @@ -23,8 +23,11 @@ #include "wx_util.h" #include "dcpomatic_button.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> #include <wx/listctrl.h> +DCPOMATIC_ENABLE_WARNINGS #include <boost/function.hpp> #include <vector> diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h index b8d862f81..84a1d361b 100644 --- a/src/wx/film_editor.h +++ b/src/wx/film_editor.h @@ -23,7 +23,10 @@ */ #include "lib/film.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS #include <boost/signals2.hpp> class wxNotebook; diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 21a35c227..870832f4d 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -622,7 +622,7 @@ FilmViewer::average_latency () const total += i; } - return total / _latency_history.size(); + return total / static_cast<Frame>(_latency_history.size()); } void diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index 29985a581..e08cc8e8d 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -28,8 +28,11 @@ #include "lib/player_text.h" #include "lib/timer.h" #include "lib/signaller.h" +#include "lib/warnings.h" #include <RtAudio.h> +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS class wxToggleButton; class FFmpegPlayer; @@ -179,7 +182,7 @@ private: dcp::Size _out_size; RtAudio _audio; - int _audio_channels; + unsigned int _audio_channels; unsigned int _audio_block_size; bool _playing; int _suspended; diff --git a/src/wx/filter_dialog.h b/src/wx/filter_dialog.h index 3ba4a09f5..775995f38 100644 --- a/src/wx/filter_dialog.h +++ b/src/wx/filter_dialog.h @@ -22,7 +22,10 @@ * @brief A dialog to select FFmpeg filters. */ +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS #include <boost/signals2.hpp> class Film; diff --git a/src/wx/focus_manager.cc b/src/wx/focus_manager.cc index f4f23cb28..e10075f3a 100644 --- a/src/wx/focus_manager.cc +++ b/src/wx/focus_manager.cc @@ -19,7 +19,10 @@ */ #include "focus_manager.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/textctrl.h> +DCPOMATIC_ENABLE_WARNINGS FocusManager* FocusManager::_instance; diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h index 3675b8ddc..14506bec5 100644 --- a/src/wx/gl_video_view.h +++ b/src/wx/gl_video_view.h @@ -21,7 +21,10 @@ #include "video_view.h" #include "lib/signaller.h" #include "lib/position.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS #include <wx/glcanvas.h> #include <dcp/util.h> #include <boost/atomic.hpp> diff --git a/src/wx/i18n_hook.h b/src/wx/i18n_hook.h index 40fd89a2c..b2de66172 100644 --- a/src/wx/i18n_hook.h +++ b/src/wx/i18n_hook.h @@ -21,7 +21,10 @@ #ifndef DCPOMATIC_I18N_HOOK_H #define DCPOMATIC_I18N_HOOK_H +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS #include <map> class I18NHook diff --git a/src/wx/job_manager_view.h b/src/wx/job_manager_view.h index 77114a97c..2e471532f 100644 --- a/src/wx/job_manager_view.h +++ b/src/wx/job_manager_view.h @@ -22,7 +22,10 @@ * @brief Class which is a wxPanel for showing the progress of jobs. */ +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS #include <boost/shared_ptr.hpp> #include <list> diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc index b61da04f8..729f619fa 100644 --- a/src/wx/job_view.cc +++ b/src/wx/job_view.cc @@ -179,7 +179,7 @@ JobView::cancel_clicked (wxCommandEvent &) } void -JobView::insert (int pos) +JobView::insert (size_t pos) { _table->Insert (pos, _gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT); _table->Insert (pos + 1, _controls, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3); diff --git a/src/wx/job_view.h b/src/wx/job_view.h index d58a90831..1971036bd 100644 --- a/src/wx/job_view.h +++ b/src/wx/job_view.h @@ -48,7 +48,7 @@ public: void setup (); void maybe_pulse (); - void insert (int pos); + void insert (size_t pos); void detach (); boost::shared_ptr<Job> job () const { diff --git a/src/wx/markers_dialog.h b/src/wx/markers_dialog.h index fbbaa1aee..e2c261873 100644 --- a/src/wx/markers_dialog.h +++ b/src/wx/markers_dialog.h @@ -18,7 +18,10 @@ */ +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> #include <list> diff --git a/src/wx/player_stress_tester.h b/src/wx/player_stress_tester.h index 9da73762f..c8cc14676 100644 --- a/src/wx/player_stress_tester.h +++ b/src/wx/player_stress_tester.h @@ -18,7 +18,10 @@ */ +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS #include <boost/signals2.hpp> #include <boost/filesystem.hpp> diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc index 72ec7ad1f..e8fd5f9e5 100644 --- a/src/wx/playlist_controls.cc +++ b/src/wx/playlist_controls.cc @@ -202,7 +202,7 @@ PlaylistControls::previous_clicked () bool PlaylistControls::can_do_next () { - return _selected_playlist && (_selected_playlist_position + 1) < int(_playlists[*_selected_playlist].get().size()); + return _selected_playlist && (_selected_playlist_position + 1) < _playlists[*_selected_playlist].get().size(); } void @@ -321,7 +321,7 @@ PlaylistControls::get_kdm_from_directory (shared_ptr<DCPContent> dcp) void PlaylistControls::spl_selection_changed () { - long int selected = _spl_view->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + size_t const selected = _spl_view->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (selected == -1) { _current_spl_view->DeleteAllItems (); _selected_playlist = boost::none; @@ -343,7 +343,7 @@ PlaylistControls::spl_selection_changed () } void -PlaylistControls::select_playlist (int selected, int position) +PlaylistControls::select_playlist (size_t selected, size_t position) { log (wxString::Format("load-playlist %s", std_to_wx(_playlists[selected].name()).data())); @@ -351,7 +351,7 @@ PlaylistControls::select_playlist (int selected, int position) BOOST_FOREACH (SPLEntry const & i, _playlists[selected].get()) { dialog.Pulse (); - shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (i.content); + shared_ptr<DCPContent> dcp = dynamic_ponter_cast<DCPContent> (i.content); if (dcp && dcp->needs_kdm()) { optional<dcp::EncryptedKDM> kdm; kdm = get_kdm_from_directory (dcp); @@ -441,7 +441,7 @@ PlaylistControls::viewer_finished () } _selected_playlist_position++; - if (_selected_playlist_position < int(_playlists[*_selected_playlist].get().size())) { + if (_selected_playlist_position < _playlists[*_selected_playlist].get().size()) { /* Next piece of content on the SPL */ update_current_content (); _viewer->start (); diff --git a/src/wx/playlist_controls.h b/src/wx/playlist_controls.h index 4f144834a..9d7fdea91 100644 --- a/src/wx/playlist_controls.h +++ b/src/wx/playlist_controls.h @@ -50,7 +50,7 @@ private: void update_content_directory (); void update_playlist_directory (); void spl_selection_changed (); - void select_playlist (int selected, int position); + void select_playlist (size_t selected, size_t position); void started (); void stopped (); void setup_sensitivity (); @@ -78,5 +78,5 @@ private: std::vector<SPL> _playlists; boost::optional<int> _selected_playlist; - int _selected_playlist_position; + size_t _selected_playlist_position; }; diff --git a/src/wx/question_dialog.h b/src/wx/question_dialog.h index a3b05173a..6b99065f6 100644 --- a/src/wx/question_dialog.h +++ b/src/wx/question_dialog.h @@ -18,7 +18,10 @@ */ +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS class QuestionDialog : public wxDialog { diff --git a/src/wx/repeat_dialog.h b/src/wx/repeat_dialog.h index 0c4fb6a86..38d896c8f 100644 --- a/src/wx/repeat_dialog.h +++ b/src/wx/repeat_dialog.h @@ -18,9 +18,12 @@ */ +#include "table_dialog.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> #include <wx/spinctrl.h> -#include "table_dialog.h" +DCPOMATIC_ENABLE_WARNINGS class RepeatDialog : public TableDialog { diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h index 510297efb..d5ea461aa 100644 --- a/src/wx/screens_panel.h +++ b/src/wx/screens_panel.h @@ -18,9 +18,12 @@ */ +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> #include <wx/srchctrl.h> #include <wx/treectrl.h> +DCPOMATIC_ENABLE_WARNINGS #include <boost/shared_ptr.hpp> #include <boost/signals2.hpp> #include <list> diff --git a/src/wx/system_font_dialog.h b/src/wx/system_font_dialog.h index 48a31a839..da51c9c3a 100644 --- a/src/wx/system_font_dialog.h +++ b/src/wx/system_font_dialog.h @@ -26,7 +26,10 @@ * one of those fonts. */ +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS #include <boost/filesystem.hpp> #include <boost/optional.hpp> #include <vector> diff --git a/src/wx/table_dialog.h b/src/wx/table_dialog.h index a5015ee59..fdc2022c8 100644 --- a/src/wx/table_dialog.h +++ b/src/wx/table_dialog.h @@ -21,7 +21,10 @@ #ifndef DCPOMATIC_TABLE_DIALOG_H #define DCPOMATIC_TABLE_DIALOG_H +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS class TableDialog : public wxDialog { diff --git a/src/wx/time_picker.h b/src/wx/time_picker.h index 9e83c0043..53b0ce2b8 100644 --- a/src/wx/time_picker.h +++ b/src/wx/time_picker.h @@ -18,7 +18,10 @@ */ +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS #include <boost/signals2.hpp> class wxSpinCtrl; diff --git a/src/wx/timeline_content_view.h b/src/wx/timeline_content_view.h index 27cfed53e..2573e3cb3 100644 --- a/src/wx/timeline_content_view.h +++ b/src/wx/timeline_content_view.h @@ -22,8 +22,11 @@ #define DCPOMATIC_TIMELINE_CONTENT_VIEW_H #include "lib/types.h" +#include "lib/warnings.h" #include "timeline_view.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS #include <boost/signals2.hpp> class Content; diff --git a/src/wx/verify_dcp_dialog.h b/src/wx/verify_dcp_dialog.h index d2f21863d..47e5d19a8 100644 --- a/src/wx/verify_dcp_dialog.h +++ b/src/wx/verify_dcp_dialog.h @@ -18,8 +18,11 @@ */ +#include "lib/warnings.h" #include <dcp/verify.h> +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS #include <list> class wxRichTextCtrl; diff --git a/src/wx/video_waveform_plot.h b/src/wx/video_waveform_plot.h index 380186074..1e38f5890 100644 --- a/src/wx/video_waveform_plot.h +++ b/src/wx/video_waveform_plot.h @@ -18,7 +18,10 @@ */ +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> #include <boost/signals2.hpp> diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index af938b670..517b6407a 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -25,8 +25,11 @@ #ifndef DCPOMATIC_WX_UTIL_H #define DCPOMATIC_WX_UTIL_H +#include "lib/warnings.h" #include "lib/dcpomatic_time.h" +DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> +DCPOMATIC_ENABLE_WARNINGS #include <wx/gbsizer.h> #include <boost/function.hpp> #include <boost/thread.hpp> |