remove getter for Amp::_apply_automation_gain; reset member to false after use, and...

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

diff --git a/libs/ardour/ardour/graph.h b/libs/ardour/ardour/graph.h
index 239f9ad1abec406c2976e2d1dc48d83cdad47221..0dc8e164c4e44d664f7353a7a7851e022ac6a269 100644 (file)
--- a/libs/ardour/ardour/graph.h
+++ b/libs/ardour/ardour/graph.h
@@ -57,26 +57,18 @@ class LIBARDOUR_API Graph : public SessionHandleRef
 public:
        Graph (Session & session);
 
-       void prep();
        void trigger (GraphNode * n);
        void rechain (boost::shared_ptr<RouteList>, GraphEdges const &);
 
        void dump (int chain);
-       void process();
        void dec_ref();
-       void restart_cycle();
 
-       bool run_one();
        void helper_thread();
-       void main_thread();
-
-       int silent_process_routes (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
-                                  bool& need_butler);
 
-       int process_routes (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick,
+       int process_routes (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, int declick,
                            bool& need_butler);
 
-       int routes_no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
+       int routes_no_roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample,
                            bool non_rt_pending, int declick);
 
        void process_one_route (Route * route);
@@ -93,6 +85,10 @@ private:
 
        void reset_thread_list ();
        void drop_threads ();
+       void restart_cycle();
+       bool run_one();
+       void main_thread();
+       void prep();
 
        node_list_t _nodes_rt[2];
 
@@ -106,7 +102,6 @@ private:
        /** Signalled to start a run of the graph for a process callback */
        PBD::Semaphore _callback_start_sem;
        PBD::Semaphore _callback_done_sem;
-       PBD::Semaphore _cleanup_sem;
 
        /** The number of processing threads that are asleep */
        volatile gint _execution_tokens;
@@ -126,13 +121,12 @@ private:
 
        // parameter caches.
        pframes_t  _process_nframes;
-       framepos_t _process_start_frame;
-       framepos_t _process_end_frame;
+       samplepos_t _process_start_sample;
+       samplepos_t _process_end_sample;
        bool       _process_can_record;
        bool       _process_non_rt_pending;
        int        _process_declick;
 
-       bool _process_silent;
        bool _process_noroll;
        int  _process_retval;
        bool _process_need_butler;