merge with master, with minor conflict fixes

[ardour.git] / libs / ardour / audio_track.cc

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 0530dbfce93abd16b1ef1e7e9827dd3495ad812d..8e14fff40225e36cc05d3ed562f7e07d756a16c1 100644 (file)
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -60,13 +60,7 @@ AudioTrack::~AudioTrack ()
 boost::shared_ptr<Diskstream>
 AudioTrack::create_diskstream ()
 {
-       AudioDiskstream::Flag dflags = AudioDiskstream::Flag (0);
-
-       if (_flags & Auditioner) {
-               dflags = AudioDiskstream::Flag (dflags | AudioDiskstream::Hidden);
-       } else {
-               dflags = AudioDiskstream::Flag (dflags | AudioDiskstream::Recordable);
-       }
+       AudioDiskstream::Flag dflags = AudioDiskstream::Flag (AudioDiskstream::Recordable);
 
        if (_mode == Destructive) {
                dflags = AudioDiskstream::Flag (dflags | AudioDiskstream::Destructive);
@@ -96,7 +90,7 @@ AudioTrack::set_diskstream (boost::shared_ptr<Diskstream> ds)
        }
 
        _diskstream->set_record_enabled (false);
-       _diskstream->request_jack_monitors_input (false);
+       _diskstream->request_input_monitoring (false);
 
        DiskstreamChanged (); /* EMIT SIGNAL */
 }