#ifndef __gtk_ardour_midi_region_view_h__
#define __gtk_ardour_midi_region_view_h__
+#include <string>
#include <vector>
#include <libgnomecanvasmm.h>
#include <libgnomecanvasmm/polygon.h>
-#include <ardour/midi_track.h>
-#include <ardour/midi_region.h>
-#include <ardour/midi_model.h>
-#include <ardour/diskstream.h>
-#include <ardour/types.h>
+#include "ardour/midi_track.h"
+#include "ardour/midi_region.h"
+#include "ardour/midi_model.h"
+#include "ardour/diskstream.h"
+#include "ardour/types.h"
#include "region_view.h"
#include "midi_time_axis.h"
#include "canvas-note.h"
#include "canvas-note-event.h"
#include "canvas-program-change.h"
+#include "canvas-sysex.h"
namespace ARDOUR {
class MidiRegion;
RouteTimeAxisView&,
boost::shared_ptr<ARDOUR::MidiRegion>,
double initial_samples_per_unit,
- Gdk::Color& basic_color);
+ Gdk::Color const & basic_color);
MidiRegionView (const MidiRegionView& other);
MidiRegionView (const MidiRegionView& other, boost::shared_ptr<ARDOUR::MidiRegion>);
~MidiRegionView ();
- virtual void init (Gdk::Color& basic_color, bool wfd);
+ virtual void init (Gdk::Color const & basic_color, bool wfd);
inline const boost::shared_ptr<ARDOUR::MidiRegion> midi_region() const
{ return boost::dynamic_pointer_cast<ARDOUR::MidiRegion>(_region); }
void add_note(const boost::shared_ptr<NoteType> note);
void resolve_note(uint8_t note_num, double end_time);
- struct ControlEvent
- {
- nframes_t time;
- uint8_t value;
- uint8_t channel;
-
- ControlEvent(nframes_t a_time, uint8_t a_value, uint8_t a_channel)
+ struct PCEvent {
+ PCEvent(double a_time, uint8_t a_value, uint8_t a_channel)
: time(a_time), value(a_value), channel(a_channel) {}
-
- ControlEvent& operator=(const ControlEvent& other) {
- time = other.time;
- value = other.value;
- channel = other.channel;
- return *this;
- }
+
+ double time;
+ uint8_t value;
+ uint8_t channel;
};
/** Add a new program change flag to the canvas.
- * @param program the MidiRegionView::ControlEvent to add
+ * @param program the MidiRegionView::PCEvent to add
* @param the text to display in the flag
*/
- void add_pgm_change(ControlEvent& program, string displaytext);
+ void add_pgm_change(PCEvent& program, const std::string& displaytext);
/** Look up the given time and channel in the 'automation' and set keys accordingly.
* @param time the time of the program change event
void get_patch_key_at(double time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key);
/** Change the 'automation' data of old_program to new values which correspond to new_patch.
- * @param old_program identifies the program change event which is to be altered
- * @param new_patch defines the new lsb, msb and program number which are to be set in the automation list data
+ * @param old_program the program change event which is to be altered
+ * @param new_patch the new lsb, msb and program number which are to be set
*/
- void alter_program_change(ControlEvent& old_program, const MIDI::Name::PatchPrimaryKey& new_patch);
+ void alter_program_change(PCEvent& old_program, const MIDI::Name::PatchPrimaryKey& new_patch);
/** Alter a given program to the new given one.
* (Called on context menu select on CanvasProgramChange)
*/
void next_program(ArdourCanvas::CanvasProgramChange& program);
- /** Displays all program changed events in the region as flags on the canvas.
+ /** Displays all program change events in the region as flags on the canvas.
+ */
+ void display_program_changes();
+
+ /** Displays all system exclusive events in the region as flags on the canvas.
*/
- void display_program_change_flags();
+ void display_sysexes();
void begin_write();
void end_write();
void display_model(boost::shared_ptr<ARDOUR::MidiModel> model);
- void start_delta_command(string name = "midi edit");
- void command_add_note(const boost::shared_ptr<NoteType> note, bool selected);
+ void start_delta_command(std::string name = "midi edit");
+ void command_add_note(const boost::shared_ptr<NoteType> note, bool selected, bool show_velocity=false);
void command_remove_note(ArdourCanvas::CanvasNoteEvent* ev);
void apply_command();
size_t selection_size() { return _selection.size(); }
void move_selection(double dx, double dy);
- void note_dropped(ArdourCanvas::CanvasNoteEvent* ev, double d_frames, uint8_t d_note);
+ void note_dropped(ArdourCanvas::CanvasNoteEvent* ev, double d_pixels, uint8_t d_note);
/** Return true iff the note is within the currently visible range */
bool note_in_visible_range(const boost::shared_ptr<NoteType> note) const;
Pressed,
SelectTouchDragging,
SelectRectDragging,
- AddDragging,
- EraseTouchDragging
+ AddDragging
};
MouseState mouse_state() const { return _mouse_state; }
};
/** Snap a region relative pixel coordinate to pixel units.
- * for pixel units (double) instead of nframes64_t
* @param x a pixel coordinate relative to region start
* @return the snapped pixel coordinate relative to region start
*/
* @param x a pixel coordinate relative to region start
* @return the snapped nframes64_t coordinate relative to region start
*/
- nframes64_t snap_to_frame(double x);
+ nframes64_t snap_pixel_to_frame(double x);
/** Snap a region relative frame coordinate to frame units.
* @param x a pixel coordinate relative to region start
* @return the snapped nframes64_t coordinate relative to region start
*/
- nframes64_t snap_to_frame(nframes64_t x);
+ nframes64_t snap_frame_to_frame(nframes64_t x);
/** Convert a timestamp in beats to frames (both relative to region start) */
nframes64_t beats_to_frames(double beats) const;
uint8_t _current_range_max;
/// MIDNAM information of the current track: Model name of MIDNAM file
- string _model_name;
+ std::string _model_name;
/// MIDNAM information of the current track: CustomDeviceMode
- string _custom_device_mode;
+ std::string _custom_device_mode;
typedef std::vector<ArdourCanvas::CanvasNoteEvent*> Events;
typedef std::vector< boost::shared_ptr<ArdourCanvas::CanvasProgramChange> > PgmChanges;
+ typedef std::vector< boost::shared_ptr<ArdourCanvas::CanvasSysEx> > SysExes;
boost::shared_ptr<ARDOUR::MidiModel> _model;
Events _events;
PgmChanges _pgm_changes;
+ SysExes _sys_exes;
ArdourCanvas::CanvasNote** _active_notes;
ArdourCanvas::Group* _note_group;
ARDOUR::MidiModel::DeltaCommand* _delta_command;
/** New notes (created in the current command) which should be selected
* when they appear after the command is applied. */
std::set< boost::shared_ptr<NoteType> > _marked_for_selection;
+
+ /** New notes (created in the current command) which should have visible velocity
+ * when they appear after the command is applied. */
+ std::set< boost::shared_ptr<NoteType> > _marked_for_velocity;
std::vector<NoteResizeData *> _resize_data;
};
projects / ardour.git / blobdiff