diff options
| author | David Robillard <d@drobilla.net> | 2007-05-31 21:37:20 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-05-31 21:37:20 +0000 |
| commit | 0f2f4d8efc7f3e1144c6f51fd17c1ab309056c3e (patch) | |
| tree | 5f3b9c752aafcd9874ae55197d678d4b17bbc442 /gtk2_ardour/streamview.h | |
| parent | 52a8242a1158426caeed4757bbc3f7f71091e351 (diff) | |
Rewrote MidiRingBuffer to more efficiently pack data (flat pack stamps, sizes, and event data into a single buffer).
Eliminate a double-copy on MIDI playback (MidiRingBuffer -> MidiBuffer).
Various MIDI diskstream/source/SMF fixes (only write when appropriate, handle transport locates, etc).
Fix MIDI rec region size/offset problems.
Code cleanups.
git-svn-id: svn://localhost/ardour2/trunk@1934 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/streamview.h')
| -rw-r--r-- | gtk2_ardour/streamview.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h index 365f2d4edf..f83b35191d 100644 --- a/gtk2_ardour/streamview.h +++ b/gtk2_ardour/streamview.h @@ -20,7 +20,6 @@ #define __ardour_streamview_h__ #include <list> -#include <map> #include <cmath> #include <ardour/location.h> @@ -107,9 +106,9 @@ protected: void sess_rec_enable_changed(); virtual void setup_rec_box () = 0; void update_rec_box (); - virtual void update_rec_regions () = 0; + //virtual void update_rec_regions () = 0; - virtual void add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves) = 0; + virtual RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves) = 0; virtual void remove_region_view (boost::weak_ptr<ARDOUR::Region> ); //void remove_rec_region (boost::shared_ptr<ARDOUR::Region>); (unused) @@ -137,7 +136,7 @@ protected: sigc::connection screen_update_connection; vector<RecBoxInfo> rec_rects; - list<boost::shared_ptr<ARDOUR::Region> > rec_regions; + list< std::pair<boost::shared_ptr<ARDOUR::Region>,RegionView* > > rec_regions; bool rec_updating; bool rec_active; bool use_rec_regions; @@ -151,10 +150,9 @@ protected: int layers; double height; LayerDisplay layer_display; - - list<sigc::connection> rec_data_ready_connections; - jack_nframes_t last_rec_data_frame; - map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map; + + list<sigc::connection> rec_data_ready_connections; + jack_nframes_t last_rec_data_frame; }; #endif /* __ardour_streamview_h__ */ |