diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-06-02 16:16:20 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-06-02 16:16:20 +0000 |
commit | 66016dfef77df2c5f6bcb0bc44ffd7cb38b83f87 (patch) | |
tree | 6706a94dd3cc046d1de63606e1386f44c137c9bb /libs/ardour/ardour/audioengine.h | |
parent | 4def7ed222bd860e54510d5a5e4d3efcca065052 (diff) |
don't double-call JackStartFreewheeling if we're already freewheeling
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3434 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/audioengine.h')
-rw-r--r-- | libs/ardour/ardour/audioengine.h | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index 31c892a2b7..6ba141248c 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -202,24 +202,25 @@ class AudioEngine : public sigc::trackable std::string make_port_name_non_relative (std::string); private: - ARDOUR::Session *session; - jack_client_t *_jack; - std::string jack_client_name; - Glib::Mutex _process_lock; - Glib::Cond session_removed; - bool session_remove_pending; - bool _running; - bool _has_run; - nframes_t _buffer_size; - nframes_t _frame_rate; - nframes_t monitor_check_interval; - nframes_t last_monitor_check; - nframes_t _processed_frames; - bool _freewheeling; - bool _freewheel_thread_registered; + ARDOUR::Session* session; + jack_client_t* _jack; + std::string jack_client_name; + Glib::Mutex _process_lock; + Glib::Cond session_removed; + bool session_remove_pending; + bool _running; + bool _has_run; + nframes_t _buffer_size; + nframes_t _frame_rate; + nframes_t monitor_check_interval; + nframes_t last_monitor_check; + nframes_t _processed_frames; + bool _freewheeling; + bool _freewheel_pending; + bool _freewheel_thread_registered; sigc::slot<int,nframes_t> freewheel_action; - bool reconnect_on_halt; - int _usecs_per_cycle; + bool reconnect_on_halt; + int _usecs_per_cycle; typedef std::set<Port*> Ports; SerializedRCUManager<Ports> ports; |