diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2005-12-08 18:53:43 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-12-08 18:53:43 +0000 |
| commit | cdd680f0b72a2081e05ad981d0467526310150c8 (patch) | |
| tree | 6cf70c0e66058f9741025534cde8204814dc0ff9 /libs/ardour/location.cc | |
| parent | 9f91aca7622923ca35f049e69ec292e9f12aefb2 (diff) | |
meter/tempo bars show again, fix tempo/meter dialogs, and more
git-svn-id: svn://localhost/trunk/ardour2@183 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/location.cc')
| -rw-r--r-- | libs/ardour/location.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc index ce726fb453..6008f3d70b 100644 --- a/libs/ardour/location.cc +++ b/libs/ardour/location.cc @@ -69,7 +69,7 @@ Location::set_start (jack_nframes_t s) if (_start != s) { _start = s; _end = s; - changed(this); /* EMIT SIGNAL */ + start_changed(this); /* EMIT SIGNAL */ } return 0; } @@ -80,9 +80,10 @@ Location::set_start (jack_nframes_t s) if (s != _start) { _start = s; - start_changed(this); /* EMIT SIGNAL */ + start_changed(this); /* EMIT SIGNAL */ } - return 0; + + return 0; } int @@ -92,7 +93,7 @@ Location::set_end (jack_nframes_t e) if (_start != e) { _start = e; _end = e; - changed(this); /* EMIT SIGNAL */ + end_changed(this); /* EMIT SIGNAL */ } return 0; } @@ -117,10 +118,14 @@ Location::set (jack_nframes_t start, jack_nframes_t end) return -1; } - if (_start != start || _end != end) { + if (_start != start) { _start = start; + start_changed(this); /* EMIT SIGNAL */ + } + + if (_end != end) { _end = end; - changed(this); /* EMIT SIGNAL */ + end_changed(this); /* EMIT SIGNAL */ } return 0; } @@ -467,8 +472,6 @@ Locations::add (Location *loc, bool make_current) LockMonitor lm (lock, __LINE__, __FILE__); locations.push_back (loc); - loc->changed.connect (mem_fun (*this, &Locations::location_changed)); - if (make_current) { current_location = loc; } @@ -525,7 +528,7 @@ Locations::remove (Location *loc) } void -Locations::location_changed (Location* ignored) +Locations::location_changed (Location* loc) { save_state (X_("location changed")); changed (); /* EMIT SIGNAL */ |