missign return value

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

diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index 6aee3a75729f9ad2ed10641471a37aa3b93a9c31..f9f4424c483ee33bfcb173d66c0f152f381f8d4b 100644 (file)
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -61,7 +61,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-/* XXX This goes uninitialized when there is no ~/.ardour3 directory.
+/* XXX This goes uninitialized when there is no ~/.config/ardour3 directory.
  * I can't figure out why, so this will do for now (just stole the
  * default from configuration_vars.h).  0 is not a good value for
  * allocating buffer sizes..
@@ -73,57 +73,97 @@ PBD::Signal0<void>                Diskstream::DiskUnderrun;
 
 Diskstream::Diskstream (Session &sess, const string &name, Flag flag)
        : SessionObject(sess, name)
+        , i_am_the_modifier (0)
+        , _route (0)
+        , _record_enabled (0)
+        , _visible_speed (1.0f)
+        , _actual_speed (1.0f)
+        , _buffer_reallocation_required (false)
+        , _seek_required (false)
+        , force_refill (false)
+        , capture_start_frame (0)
+        , capture_captured (0)
+        , was_recording (false)
+        , adjust_capture_position (0)
+        , _capture_offset (0)
+        , _roll_delay (0)
+        , first_recordable_frame (max_frames)
+        , last_recordable_frame (max_frames)
+        , last_possibly_recording (0)
+        , _alignment_style (ExistingMaterial)
+        , _scrubbing (false)
+        , _slaved (false)
+        , loop_location (0)
+        , overwrite_frame (0)
+        , overwrite_offset (0)
+        , pending_overwrite (false)
+        , overwrite_queued (false)
+        , input_change_pending (NoChange)
+        , wrap_buffer_size (0)
+        , speed_buffer_size (0)
+        , _speed (1.0)
+        , _target_speed (_speed)
+        , file_frame (0)
+        , playback_sample (0)
+        , playback_distance (0)
+        , _read_data_count (0)
+        , _write_data_count (0)
+        , in_set_state (false)
+        , _persistent_alignment_style (ExistingMaterial)
+        , first_input_change (true)
+        , scrub_start (0)
+        , scrub_buffer_size (0)
+        , scrub_offset (0)
+        , _flags (flag)
+
 {
-       init (flag);
 }
 
 Diskstream::Diskstream (Session& sess, const XMLNode& /*node*/)
        : SessionObject(sess, "unnamed diskstream")
+        , i_am_the_modifier (0)
+        , _route (0)
+        , _record_enabled (0)
+        , _visible_speed (1.0f)
+        , _actual_speed (1.0f)
+        , _buffer_reallocation_required (false)
+        , _seek_required (false)
+        , force_refill (false)
+        , capture_start_frame (0)
+        , capture_captured (0)
+        , was_recording (false)
+        , adjust_capture_position (0)
+        , _capture_offset (0)
+        , _roll_delay (0)
+        , first_recordable_frame (max_frames)
+        , last_recordable_frame (max_frames)
+        , last_possibly_recording (0)
+        , _alignment_style (ExistingMaterial)
+        , _scrubbing (false)
+        , _slaved (false)
+        , loop_location (0)
+        , overwrite_frame (0)
+        , overwrite_offset (0)
+        , pending_overwrite (false)
+        , overwrite_queued (false)
+        , input_change_pending (NoChange)
+        , wrap_buffer_size (0)
+        , speed_buffer_size (0)
+        , _speed (1.0)
+        , _target_speed (_speed)
+        , file_frame (0)
+        , playback_sample (0)
+        , playback_distance (0)
+        , _read_data_count (0)
+        , _write_data_count (0)
+        , in_set_state (false)
+        , _persistent_alignment_style (ExistingMaterial)
+        , first_input_change (true)
+        , scrub_start (0)
+        , scrub_buffer_size (0)
+        , scrub_offset (0)
+        , _flags (Recordable)
 {
-       init (Recordable);
-}
-
-void
-Diskstream::init (Flag f)
-{
-       _flags = f;
-       _route = 0;
-       _alignment_style = ExistingMaterial;
-       _persistent_alignment_style = ExistingMaterial;
-       first_input_change = true;
-       i_am_the_modifier = 0;
-       g_atomic_int_set (&_record_enabled, 0);
-       was_recording = false;
-       capture_start_frame = 0;
-       capture_captured = 0;
-       _visible_speed = 1.0f;
-       _actual_speed = 1.0f;
-       _buffer_reallocation_required = false;
-       _seek_required = false;
-       first_recordable_frame = max_frames;
-       last_recordable_frame = max_frames;
-       _roll_delay = 0;
-       _capture_offset = 0;
-       _processed = false;
-       _slaved = false;
-       adjust_capture_position = 0;
-       last_possibly_recording = 0;
-       loop_location = 0;
-       wrap_buffer_size = 0;
-       speed_buffer_size = 0;
-       _speed = 1.0;
-       _target_speed = _speed;
-       file_frame = 0;
-       playback_sample = 0;
-       playback_distance = 0;
-       _read_data_count = 0;
-       _write_data_count = 0;
-       commit_should_unlock = false;
-
-       pending_overwrite = false;
-       overwrite_frame = 0;
-       overwrite_queued = false;
-       input_change_pending = NoChange;
 }
 
 Diskstream::~Diskstream ()
@@ -219,22 +259,6 @@ Diskstream::realtime_set_speed (double sp, bool global)
        return _buffer_reallocation_required || _seek_required;
 }
 
-void
-Diskstream::prepare ()
-{
-       _processed = false;
-       playback_distance = 0;
-}
-
-void
-Diskstream::recover ()
-{
-       if (commit_should_unlock) {
-               state_lock.unlock();
-       }
-       _processed = false;
-}
-
 void
 Diskstream::set_capture_offset ()
 {
@@ -319,6 +343,12 @@ Diskstream::set_speed (double sp)
 int
 Diskstream::use_playlist (boost::shared_ptr<Playlist> playlist)
 {
+        if (!playlist) {
+                return 0;
+        }
+
+        bool no_prior_playlist = true;
+
        {
                Glib::Mutex::Lock lm (state_lock);
 
@@ -330,6 +360,7 @@ Diskstream::use_playlist (boost::shared_ptr<Playlist> playlist)
 
                if (_playlist) {
                        _playlist->release();
+                        no_prior_playlist = false;
                }
 
                _playlist = playlist;
@@ -349,7 +380,7 @@ Diskstream::use_playlist (boost::shared_ptr<Playlist> playlist)
           take care of the buffer refill.
        */
 
-       if (!overwrite_queued && !(_session.state_of_the_state() & Session::CannotSave)) {
+       if (!overwrite_queued && no_prior_playlist) {
                _session.request_overwrite_buffer (this);
                overwrite_queued = true;
        }
@@ -361,7 +392,7 @@ Diskstream::use_playlist (boost::shared_ptr<Playlist> playlist)
 }
 
 void
-Diskstream::playlist_changed (PropertyChange)
+Diskstream::playlist_changed (const PropertyChange&)
 {
        playlist_modified ();
 }