ardour/livetrax
13
0
Fork 0
Code

remove another NUTEMPO warning by connecting AudioClock to static MapChanged signal

Browse Source
This commit is contained in:
Paul Davis 2021-01-07 20:07:59 -07:00
parent eccfc1db10
commit 7762dde95e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/audio_clock.cc
View File

@ -136,6 +136,8 @@ AudioClock::AudioClock (const string& clock_name, bool transient, const string&
UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &AudioClock::set_colors)); UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &AudioClock::set_colors));
UIConfiguration::instance().DPIReset.connect (sigc::mem_fun (*this, &AudioClock::dpi_reset)); UIConfiguration::instance().DPIReset.connect (sigc::mem_fun (*this, &AudioClock::dpi_reset));
TempoMap::MapChanged.connect (tempo_map_connection, invalidator (*this), boost::bind (&AudioClock::tempo_map_changed, this), gui_context());
} }
AudioClock::~AudioClock () AudioClock::~AudioClock ()
@ -802,7 +804,7 @@ AudioClock::end_edit_relative (bool add)
} }
void void
AudioClock::session_property_changed (const PropertyChange&) AudioClock::tempo_map_changed ()
{ {
AudioClock::set (last_when, true); AudioClock::set (last_when, true);
} }
@ -1332,8 +1334,6 @@ AudioClock::set_session (Session *s)
Config->ParameterChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_configuration_changed, this, _1), gui_context()); Config->ParameterChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_configuration_changed, this, _1), gui_context());
_session->config.ParameterChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_configuration_changed, this, _1), gui_context()); _session->config.ParameterChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_configuration_changed, this, _1), gui_context());
#warning NUTEMPO probably need a static signal here, map object will change address etc
// TempoMap::use()->Changed.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_property_changed, this), gui_context());
XMLNode* node = _session->extra_xml (X_("ClockModes")); XMLNode* node = _session->extra_xml (X_("ClockModes"));

4
gtk2_ardour/audio_clock.h
View File

@ -244,7 +244,7 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
samplepos_t samples_from_audiosamples_string (const std::string&) const; samplepos_t samples_from_audiosamples_string (const std::string&) const;
void session_configuration_changed (std::string); void session_configuration_changed (std::string);
void session_property_changed (const PBD::PropertyChange&); void tempo_map_changed ();
Field index_to_field () const; Field index_to_field () const;
@ -273,6 +273,8 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
double xscale; double xscale;
double yscale; double yscale;
PBD::ScopedConnection tempo_map_connection;
}; };
#endif /* __audio_clock_h__ */ #endif /* __audio_clock_h__ */