summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-12-07 19:35:38 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-12-07 19:35:38 +0000
commit3468797237081ad981117c4b9df9b0736e177c1b (patch)
treebdcbc86c5e520bb3a2c7d91492daa519e822a705
parentb3ab885061e627bc351b03794f306ad4025154a0 (diff)
fix wierd rec-enable behaviour, at possible expense of adding more RT cost
git-svn-id: svn://localhost/ardour2/branches/3.0@13615 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--libs/ardour/audio_diskstream.cc5
-rw-r--r--libs/ardour/track.cc6
2 files changed, 3 insertions, 8 deletions
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index 8378fa210c..6e2c8a570d 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -1661,6 +1661,8 @@ AudioDiskstream::set_record_enabled (bool yn)
} else {
disengage_record_enable ();
}
+
+ RecordEnableChanged (); /* EMIT SIGNAL */
}
}
@@ -1697,8 +1699,6 @@ AudioDiskstream::prep_record_enable ()
}
}
- RecordEnableChanged (); /* EMIT SIGNAL */
-
return true;
}
@@ -1712,7 +1712,6 @@ AudioDiskstream::prep_record_disable ()
}
}
capturing_sources.clear ();
- RecordEnableChanged (); /* EMIT SIGNAL */
return true;
}
diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index 22edb52dcb..c7cff72fd3 100644
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -279,11 +279,7 @@ Track::set_record_enabled (bool yn, void *src)
return;
}
- if (yn) {
- _diskstream->engage_record_enable();
- } else {
- _diskstream->disengage_record_enable();
- }
+ _diskstream->set_record_enabled (yn);
_rec_enable_control->Changed ();
}