- MIDI "recording" - rec region creation/drawing, actual MIDI region creation/view...

[ardour.git] / gtk2_ardour / editor.h

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 3488c756ac4047c0a777a952791f8d7b0b6c07de..3f2a278f0983013eba0ef973bb5abcaa26c1bcc8 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -77,6 +77,7 @@ namespace ARDOUR {
        class Session;
        class AudioFilter;
        class Crossfade;
+       class ChanCount;
 }
 
 namespace LADSPA {
@@ -831,14 +832,14 @@ class Editor : public PublicEditor
 
        int ensure_cursor (jack_nframes_t* pos);
 
-       void handle_new_audio_region (ARDOUR::AudioRegion *);
-       void handle_audio_region_removed (ARDOUR::AudioRegion *);
-       void add_audio_region_to_region_display (ARDOUR::AudioRegion *);
+       void handle_new_region (ARDOUR::Region *);
+       void handle_region_removed (ARDOUR::Region *);
+       void add_region_to_region_display (ARDOUR::Region *);
        void region_hidden (ARDOUR::Region*);
        void redisplay_regions ();
-       void insert_into_tmp_audio_regionlist(ARDOUR::AudioRegion *);
+       void insert_into_tmp_regionlist(ARDOUR::Region *);
 
-       list<ARDOUR::AudioRegion *> tmp_audio_region_list;
+       list<ARDOUR::Region *> tmp_region_list;
 
        void cut_copy (Editing::CutCopyOp);
        void cut_copy_points (Editing::CutCopyOp);
@@ -1591,7 +1592,7 @@ class Editor : public PublicEditor
        void external_edit_region ();
 
        int write_audio_selection (TimeSelection&);
-       bool write_audio_range (ARDOUR::AudioPlaylist&, uint32_t channels, list<ARDOUR::AudioRange>&);
+       bool write_audio_range (ARDOUR::AudioPlaylist&, const ARDOUR::ChanCount& channels, list<ARDOUR::AudioRange>&);
 
        void write_selection ();
 
@@ -1599,7 +1600,8 @@ class Editor : public PublicEditor
 
        UndoAction get_memento() const;
 
-        XMLNode *before; /* used in *_reversible_command */
+       XMLNode *before; /* used in *_reversible_command */
+
        void begin_reversible_command (string cmd_name);
        void commit_reversible_command ();