Fix uninitialised variable and remove bind of shared_ptr to a slot.

[ardour.git] / libs / ardour / ardour / session.h

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 6ac36f98b61badf8944a1b222931a905c7954cbe..1717d21969dc41d62c818f48eb7c6ac57a325776 100644 (file)
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -145,7 +145,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
                        RangeStop,
                        RangeLocate,
                        Overwrite,
-                       SetSlaveSource,
+                       SetSyncSource,
                        Audition,
                        InputConfigurationChange,
                        SetPlayAudioRange,
@@ -173,7 +173,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
                void*        ptr;
                bool         yes_or_no;
                nframes64_t  target2_frame;
-               SlaveSource  slave;
+               SyncSource   sync_source;
                Route*       route;
            };
 
@@ -576,8 +576,9 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        static sigc::signal<void> EndTimeChanged;
        static sigc::signal<void> TimecodeOffsetChanged;
 
-       void   request_slave_source (SlaveSource);
-       bool   synced_to_jack() const { return Config->get_slave_source() == JACK; }
+        std::vector<SyncSource> get_available_sync_options() const;
+       void   request_sync_source (SyncSource);
+        bool   synced_to_jack() const { return config.get_external_sync() && config.get_sync_source() == JACK; }
 
        double transport_speed() const { return _transport_speed; }
        bool   transport_stopped() const { return _transport_speed == 0.0f; }
@@ -1074,9 +1075,10 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
                               nframes_t this_delta, bool starting);
        void follow_slave_silently(nframes_t nframes, float slave_speed);
 
-       void set_slave_source (SlaveSource);
+        void use_sync_source (SyncSource);
+        void drop_sync_source ();
 
-       SlaveSource post_export_slave;
+        bool post_export_sync;
        nframes_t post_export_position;
 
        bool _exporting;
@@ -1475,7 +1477,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        boost::shared_ptr<Playlist> XMLPlaylistFactory (const XMLNode&);
 
        void playlist_length_changed ();
-       void diskstream_playlist_changed (boost::shared_ptr<Diskstream>);
+       void diskstream_playlist_changed (boost::weak_ptr<Diskstream>);
 
        /* NAMED SELECTIONS */