a) fix special button press handling for solo+mute buttons

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

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index d0da2fef26861288adfdc4da4d393d03a59eacfa..1e25c5f38bdf66d0f3c1cfc4de7892eb6bd68670 100644 (file)
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -253,8 +253,9 @@ class Session : public sigc::trackable, public Stateful
        static string template_dir ();
        static void get_template_list (list<string>&);
        
+       static string change_audio_path_by_name (string oldpath, string oldname, string newname, bool destructive);
        static string peak_path_from_audio_path (string);
-       static string old_peak_path_from_audio_path (string);
+       string audio_path_from_name (string, uint32_t nchans, uint32_t chan, bool destructive);
 
        void process (jack_nframes_t nframes);
 
@@ -319,7 +320,7 @@ class Session : public sigc::trackable, public Stateful
 
        bool record_enabling_legal () const;
        void maybe_enable_record ();
-       void disable_record (bool force = false);
+       void disable_record (bool rt_context, bool force = false);
        void step_back_from_record ();
        
        sigc::signal<void> going_away;
@@ -639,13 +640,17 @@ class Session : public sigc::trackable, public Stateful
        /* source management */
 
        struct import_status : public InterThreadInfo {
-               string doing_what;
-
-               /* control info */
-               bool multichan;
-               bool sample_convert;
-               volatile bool freeze;
-               string pathname;
+           string doing_what;
+           
+           /* control info */
+           bool multichan;
+           bool sample_convert;
+           volatile bool freeze;
+           string pathname;
+           
+           /* result */
+           std::vector<AudioRegion*> new_regions;
+           
        };
 
        int import_audiofile (import_status&);
@@ -1498,6 +1503,7 @@ class Session : public sigc::trackable, public Stateful
        RouteList       routes;
        mutable PBD::NonBlockingRWLock route_lock;
        void   add_route (Route*);
+       uint32_t destructive_index;
 
        int load_routes (const XMLNode&);
        Route* XMLRouteFactory (const XMLNode&);