projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modify Mackie surface code to use crossthreadchannel on all platforms
[ardour.git]
/
gtk2_ardour
/
midi_streamview.h
diff --git
a/gtk2_ardour/midi_streamview.h
b/gtk2_ardour/midi_streamview.h
index e6d325c0c501606d4bb12465fb9a2381e31dc978..9dbfbae5ead073f08b1dec59bbaf4adad4e9bc86 100644
(file)
--- a/
gtk2_ardour/midi_streamview.h
+++ b/
gtk2_ardour/midi_streamview.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2001, 2006 Paul Davis
+ Copyright (C) 2001, 2006 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-22,25
+22,27
@@
#include <list>
#include <cmath>
#include <list>
#include <cmath>
-#include
<ardour/location.h>
+#include
"ardour/location.h"
#include "enums.h"
#include "streamview.h"
#include "time_axis_view_item.h"
#include "route_time_axis.h"
#include "enums.h"
#include "streamview.h"
#include "time_axis_view_item.h"
#include "route_time_axis.h"
-#include "canvas.h"
namespace Gdk {
class Color;
}
namespace ARDOUR {
namespace Gdk {
class Color;
}
namespace ARDOUR {
- class Route;
- class Diskstream;
class Crossfade;
class Crossfade;
- class
PeakData
;
+ class
MidiModel
;
class MidiRegion;
class MidiRegion;
+ class Route;
class Source;
class Source;
- class MidiModel;
+ struct PeakData;
+}
+
+namespace ArdourCanvas {
+ class LineSet;
}
class PublicEditor;
}
class PublicEditor;
@@
-58,8
+60,7
@@
class MidiStreamView : public StreamView
~MidiStreamView ();
void set_selected_regionviews (RegionSelection&);
~MidiStreamView ();
void set_selected_regionviews (RegionSelection&);
- void get_selectables (jack_nframes_t start, jack_nframes_t end, list<Selectable* >&);
- void get_inverted_selectables (Selection&, list<Selectable* >& results);
+ void get_inverted_selectables (Selection&, std::list<Selectable* >& results);
enum VisibleNoteRange {
FullRange,
enum VisibleNoteRange {
FullRange,
@@
-67,66
+68,65
@@
class MidiStreamView : public StreamView
};
Gtk::Adjustment note_range_adjustment;
};
Gtk::Adjustment note_range_adjustment;
- ArdourCanvas::
Group
* midi_underlay_group;
+ ArdourCanvas::
Container
* midi_underlay_group;
void set_note_range(VisibleNoteRange r);
inline uint8_t lowest_note() const { return _lowest_note; }
inline uint8_t highest_note() const { return _highest_note; }
void set_note_range(VisibleNoteRange r);
inline uint8_t lowest_note() const { return _lowest_note; }
inline uint8_t highest_note() const { return _highest_note; }
-
+
void update_note_range(uint8_t note_num);
void update_note_range(uint8_t note_num);
-
- void redisplay_diskstream ();
+
+ void redisplay_track ();
+
+ void leave_internal_edit_mode ();
inline double contents_height() const
inline double contents_height() const
- { return (
_trackview.current
_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2); }
-
+ { return (
child
_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2); }
+
inline double note_to_y(uint8_t note) const
{ return contents_height()
- (note + 1 - lowest_note()) * note_height() + 1; }
inline double note_to_y(uint8_t note) const
{ return contents_height()
- (note + 1 - lowest_note()) * note_height() + 1; }
-
- inline uint8_t y_to_note(double y) const
- { return (uint8_t)((contents_height() - y - 1)
- / contents_height() * (double)contents_note_range())
- + lowest_note(); }
-
+
+ uint8_t y_to_note(double y) const;
+
inline double note_height() const
{ return contents_height() / (double)contents_note_range(); }
inline double note_height() const
{ return contents_height() / (double)contents_note_range(); }
-
+
inline uint8_t contents_note_range() const
{ return highest_note() - lowest_note() + 1; }
inline uint8_t contents_note_range() const
{ return highest_note() - lowest_note() + 1; }
-
+
sigc::signal<void> NoteRangeChanged;
sigc::signal<void> NoteRangeChanged;
+ RegionView* create_region_view (boost::shared_ptr<ARDOUR::Region>, bool, bool);
+
+ void apply_note_range(uint8_t lowest, uint8_t highest, bool to_region_views);
+
+ void suspend_updates ();
+ void resume_updates ();
+
private:
void setup_rec_box ();
private:
void setup_rec_box ();
+ void update_rec_box ();
- void rec_data_range_ready (
- jack_nframes_t start,
- jack_nframes_t dur,
- boost::weak_ptr<ARDOUR::Source> src);
-
- void update_rec_regions (
- boost::shared_ptr<ARDOUR::MidiModel> data,
- jack_nframes_t start,
- jack_nframes_t dur);
-
RegionView* add_region_view_internal (
RegionView* add_region_view_internal (
-
boost::shared_ptr<ARDOUR::Region>,
-
bool wait_for_waves,
-
bool recording = false);
+ boost::shared_ptr<ARDOUR::Region>,
+ bool wait_for_waves,
+ bool recording = false);
void display_region(MidiRegionView* region_view, bool load_model);
void display_region(MidiRegionView* region_view, bool load_model);
- void display_
diskstream (boost::shared_ptr<ARDOUR::Diskstream> ds
);
-
+ void display_
track (boost::shared_ptr<ARDOUR::Track> tr
);
+
void update_contents_height ();
void update_contents_height ();
+
void draw_note_lines();
void draw_note_lines();
- void apply_note_range(uint8_t lowest, uint8_t highest);
bool update_data_note_range(uint8_t min, uint8_t max);
bool update_data_note_range(uint8_t min, uint8_t max);
+ void update_contents_metrics(boost::shared_ptr<ARDOUR::Region> r);
void color_handler ();
void note_range_adjustment_changed();
void color_handler ();
void note_range_adjustment_changed();
+ void apply_note_range_to_regions ();
bool _range_dirty;
double _range_sum_cache;
bool _range_dirty;
double _range_sum_cache;
@@
-134,7
+134,9
@@
class MidiStreamView : public StreamView
uint8_t _highest_note; ///< currently visible
uint8_t _data_note_min; ///< in data
uint8_t _data_note_max; ///< in data
uint8_t _highest_note; ///< currently visible
uint8_t _data_note_min; ///< in data
uint8_t _data_note_max; ///< in data
- ArdourCanvas::Lineset* _note_lines;
+ ArdourCanvas::LineSet* _note_lines;
+ /** true if updates to the note lines and regions are currently suspended */
+ bool _updates_suspended;
};
#endif /* __ardour_midi_streamview_h__ */
};
#endif /* __ardour_midi_streamview_h__ */