diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-23 13:41:20 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-23 13:41:20 -0500 |
| commit | 7000afdc66c9e0ae8dcf9ec080517dabba1e7f34 (patch) | |
| tree | 19574ed8a1fbafa6bed222d8cf817ee1c8098314 /libs/ardour/audio_track.cc | |
| parent | 065e1e63342633f72725a5309926f71c87804293 (diff) | |
| parent | 40d8c5ae01f25e02457c554170a53d537246a7d4 (diff) | |
fix merge conflict with master
Diffstat (limited to 'libs/ardour/audio_track.cc')
| -rw-r--r-- | libs/ardour/audio_track.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index a82c109cba..8e14fff402 100644 --- 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); |