unused variable warning

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

diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index d5ecd3713bdd63e9d0cb4b78785959e8a59afa29..7a0b0a81b1bdc255a253fa06dd0fbd1f3cc533c5 100644 (file)
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -31,7 +31,6 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-
 #include <glibmm/thread.h>
 
 #include "pbd/error.h"
@@ -40,22 +39,12 @@
 #include "pbd/xml++.h"
 #include "pbd/stacktrace.h"
 
-#include "ardour/ardour.h"
-#include "ardour/audioengine.h"
 #include "ardour/debug.h"
 #include "ardour/diskstream.h"
-#include "ardour/utils.h"
-#include "ardour/configuration.h"
-#include "ardour/audiofilesource.h"
-#include "ardour/send.h"
+#include "ardour/io.h"
 #include "ardour/pannable.h"
-#include "ardour/panner_shell.h"
 #include "ardour/playlist.h"
-#include "ardour/cycle_timer.h"
-#include "ardour/region.h"
-#include "ardour/panner.h"
 #include "ardour/session.h"
-#include "ardour/io.h"
 #include "ardour/track.h"
 
 #include "i18n.h"
@@ -504,16 +493,8 @@ Diskstream::set_state (const XMLNode& node, int /*version*/)
                return -1;
        }
 
-       {
-               bool had_playlist = (_playlist != 0);
-
-               if (find_and_use_playlist (prop->value())) {
-                       return -1;
-               }
-
-               if (!had_playlist) {
-                       _playlist->set_orig_diskstream_id (id());
-               }
+       if (find_and_use_playlist (prop->value())) {
+               return -1;
        }
 
        if ((prop = node.property ("speed")) != 0) {
@@ -693,15 +674,15 @@ Diskstream::route_going_away ()
 }
 
 void
-Diskstream::calculate_record_range(OverlapType ot, framepos_t transport_frame, framecnt_t nframes,
-                                  framecnt_t & rec_nframes, framecnt_t & rec_offset)
+Diskstream::calculate_record_range (Evoral::OverlapType ot, framepos_t transport_frame, framecnt_t nframes,
+                                   framecnt_t & rec_nframes, framecnt_t & rec_offset)
 {
        switch (ot) {
-       case OverlapNone:
+       case Evoral::OverlapNone:
                rec_nframes = 0;
                break;
 
-       case OverlapInternal:
+       case Evoral::OverlapInternal:
                /*     ----------    recrange
                         |---|       transrange
                */
@@ -709,7 +690,7 @@ Diskstream::calculate_record_range(OverlapType ot, framepos_t transport_frame, f
                rec_offset = 0;
                break;
 
-       case OverlapStart:
+       case Evoral::OverlapStart:
                /*    |--------|    recrange
                -----|          transrange
                */
@@ -719,7 +700,7 @@ Diskstream::calculate_record_range(OverlapType ot, framepos_t transport_frame, f
                }
                break;
 
-       case OverlapEnd:
+       case Evoral::OverlapEnd:
                /*    |--------|    recrange
                         |--------  transrange
                */
@@ -727,7 +708,7 @@ Diskstream::calculate_record_range(OverlapType ot, framepos_t transport_frame, f
                rec_offset = 0;
                break;
 
-       case OverlapExternal:
+       case Evoral::OverlapExternal:
                /*    |--------|    recrange
                    --------------  transrange
                */