diff options
| author | Robin Gareus <robin@gareus.org> | 2013-03-13 22:59:28 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-03-13 22:59:28 +0100 |
| commit | 51937314b98c4f5d9cd0ffc3214d3fab6f374994 (patch) | |
| tree | c1d656bc72111c6b096bb39bc9a2532ffc8ac6c3 /gtk2_ardour | |
| parent | 0c3e840700a915fc1476cef73c591048f688f81e (diff) | |
vtl: fix --strict compiler warnings
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/open_video_monitor_dialog.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/open_video_monitor_dialog.h | 2 | ||||
| -rw-r--r-- | gtk2_ardour/transcode_ffmpeg.cc | 6 | ||||
| -rw-r--r-- | gtk2_ardour/video_monitor.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/open_video_monitor_dialog.cc b/gtk2_ardour/open_video_monitor_dialog.cc index 55762cc014..3d4091ff8b 100644 --- a/gtk2_ardour/open_video_monitor_dialog.cc +++ b/gtk2_ardour/open_video_monitor_dialog.cc @@ -167,7 +167,7 @@ OpenVideoMonitorDialog::on_show () Dialog::on_show (); } -const int +int OpenVideoMonitorDialog::xj_settings_mask () { int rv =0; diff --git a/gtk2_ardour/open_video_monitor_dialog.h b/gtk2_ardour/open_video_monitor_dialog.h index f0324a7caf..9b79352f40 100644 --- a/gtk2_ardour/open_video_monitor_dialog.h +++ b/gtk2_ardour/open_video_monitor_dialog.h @@ -47,7 +47,7 @@ class OpenVideoMonitorDialog : public ArdourDialog ~OpenVideoMonitorDialog (); bool show_again () { return showagain_checkbox.get_active(); } - const int xj_settings_mask (); + int xj_settings_mask (); void setup_settings_mask (const int); void set_filename (const std::string); #if 1 diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc index 7696ecd61f..a38d9c45f0 100644 --- a/gtk2_ardour/transcode_ffmpeg.cc +++ b/gtk2_ardour/transcode_ffmpeg.cc @@ -475,13 +475,13 @@ TranscodeFfmpeg::ffexit () } void -TranscodeFfmpeg::ffprobeparse (std::string d, size_t s) +TranscodeFfmpeg::ffprobeparse (std::string d, size_t /* s */) { ffoutput+=d; } void -TranscodeFfmpeg::ffmpegparse_a (std::string d, size_t s) +TranscodeFfmpeg::ffmpegparse_a (std::string d, size_t /* s */) { const char *t; if (!(t=strstr(d.c_str(), "time="))) { return; } @@ -491,7 +491,7 @@ TranscodeFfmpeg::ffmpegparse_a (std::string d, size_t s) } void -TranscodeFfmpeg::ffmpegparse_v (std::string d, size_t s) +TranscodeFfmpeg::ffmpegparse_v (std::string d, size_t /* s */) { if (strstr(d.c_str(), "ERROR") || strstr(d.c_str(), "Error") || strstr(d.c_str(), "error")) { PBD::warning << "ffmpeg-error: " << d << endmsg; diff --git a/gtk2_ardour/video_monitor.h b/gtk2_ardour/video_monitor.h index 3f391d01f6..7bb74c7e05 100644 --- a/gtk2_ardour/video_monitor.h +++ b/gtk2_ardour/video_monitor.h @@ -66,7 +66,7 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p bool set_custom_setting (const std::string, const std::string); const std::string get_custom_setting (const std::string); void restore_settings_mask (int i) { _restore_settings_mask = i;} - const int restore_settings_mask () { return _restore_settings_mask;} + int restore_settings_mask () const { return _restore_settings_mask;} void set_offset (ARDOUR::frameoffset_t); void manual_seek (ARDOUR::framepos_t, bool, ARDOUR::frameoffset_t); |