diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-07-16 00:50:12 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-07-16 00:57:23 +0200 |
| commit | 2a7f3a1840bf2495656efff17a6c35ab3873b441 (patch) | |
| tree | aec803fbfced7c575a2fa0998e7be7fcbf1a2ea3 /src/wx | |
| parent | 3bc9ca466dc3e9afaf290283d6895338f23c948d (diff) | |
Remove unused content pointer from change signals.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/audio_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/content_timeline.cc | 2 | ||||
| -rw-r--r-- | src/wx/content_widget.h | 4 | ||||
| -rw-r--r-- | src/wx/dcp_referencing_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/dcp_timeline.cc | 2 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index 9f31107f4..795a39a44 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -164,7 +164,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, FilmViewer& v overall_sizer->SetSizeHints (this); _film_connection = film->Change.connect (boost::bind(&AudioDialog::film_change, this, _1, _2)); - _film_content_connection = film->ContentChange.connect(boost::bind(&AudioDialog::content_change, this, _1, _3)); + _film_content_connection = film->ContentChange.connect(boost::bind(&AudioDialog::content_change, this, _1, _2)); DCPOMATIC_ASSERT (film->directory()); if (content) { SetTitle(wxString::Format(_("%s audio - %s"), variant::wx::dcpomatic(), std_to_wx(content->path(0).string()))); diff --git a/src/wx/content_timeline.cc b/src/wx/content_timeline.cc index f4388b2be..52e0cb8ca 100644 --- a/src/wx/content_timeline.cc +++ b/src/wx/content_timeline.cc @@ -122,7 +122,7 @@ ContentTimeline::ContentTimeline(wxWindow* parent, ContentPanel* cp, shared_ptr< SetMinSize (wxSize (640, 4 * pixels_per_track() + 96)); _film_changed_connection = film->Change.connect(bind(&ContentTimeline::film_change, this, _1, _2)); - _film_content_change_connection = film->ContentChange.connect(bind(&ContentTimeline::film_content_change, this, _1, _3, _4)); + _film_content_change_connection = film->ContentChange.connect(bind(&ContentTimeline::film_content_change, this, _1, _2, _3)); Bind(wxEVT_TIMER, boost::bind(&ContentTimeline::update_playhead, this)); _timer.Start (200, wxTIMER_CONTINUOUS); diff --git a/src/wx/content_widget.h b/src/wx/content_widget.h index f7edf6b30..3c736f2a9 100644 --- a/src/wx/content_widget.h +++ b/src/wx/content_widget.h @@ -118,9 +118,9 @@ public: for (typename List::iterator i = _content.begin(); i != _content.end(); ++i) { #if BOOST_VERSION >= 106100 - _connections.push_back ((*i)->Change.connect (boost::bind (&ContentWidget::model_changed, this, boost::placeholders::_1, boost::placeholders::_3))); + _connections.push_back((*i)->Change.connect(boost::bind(&ContentWidget::model_changed, this, boost::placeholders::_1, boost::placeholders::_2))); #else - _connections.push_back ((*i)->Change.connect (boost::bind (&ContentWidget::model_changed, this, _1, _3))); + _connections.push_back((*i)->Change.connect(boost::bind(&ContentWidget::model_changed, this, _1, _2))); #endif } } diff --git a/src/wx/dcp_referencing_dialog.cc b/src/wx/dcp_referencing_dialog.cc index 63631b9fd..9f4a71658 100644 --- a/src/wx/dcp_referencing_dialog.cc +++ b/src/wx/dcp_referencing_dialog.cc @@ -47,7 +47,7 @@ DCPReferencingDialog::DCPReferencingDialog(wxWindow* parent, shared_ptr<const Fi , _overall_sizer(new wxBoxSizer(wxVERTICAL)) { _film_connection = film->Change.connect(boost::bind(&DCPReferencingDialog::film_changed, this, _1, _2)); - _film_content_connection = film->ContentChange.connect(boost::bind(&DCPReferencingDialog::film_content_changed, this, _1, _3)); + _film_content_connection = film->ContentChange.connect(boost::bind(&DCPReferencingDialog::film_content_changed, this, _1, _2)); _overall_sizer->Add(_dcp_grid, 1, wxALL, DCPOMATIC_DIALOG_BORDER); SetSizer(_overall_sizer); diff --git a/src/wx/dcp_timeline.cc b/src/wx/dcp_timeline.cc index a5b106c00..6ea91a060 100644 --- a/src/wx/dcp_timeline.cc +++ b/src/wx/dcp_timeline.cc @@ -167,7 +167,7 @@ DCPTimeline::DCPTimeline(wxWindow* parent, shared_ptr<Film> film) _canvas->Bind(wxEVT_MOTION, boost::bind(&DCPTimeline::mouse_moved, this, _1)); _film_connection = film->Change.connect(boost::bind(&DCPTimeline::film_changed, this, _1, _2)); - _film_content_connection = film->ContentChange.connect(boost::bind(&DCPTimeline::film_content_changed, this, _1, _3)); + _film_content_connection = film->ContentChange.connect(boost::bind(&DCPTimeline::film_content_changed, this, _1, _2)); _menu = new wxMenu; _add_reel_boundary = _menu->Append(ID_add_reel_boundary, _("Add reel boundary")); diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 11a00b460..9a5edac32 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -152,7 +152,7 @@ FilmEditor::set_film (shared_ptr<Film> film) } _film->Change.connect (bind(&FilmEditor::film_change, this, _1, _2)); - _film->ContentChange.connect (bind(&FilmEditor::film_content_change, this, _1, _3)); + _film->ContentChange.connect(bind(&FilmEditor::film_content_change, this, _1, _2)); if (!_film->content().empty()) { _content_panel->set_selection (_film->content().front()); |
