projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More fun with LinuxVSTs & threading
[ardour.git]
/
gtk2_ardour
/
note_base.h
diff --git
a/gtk2_ardour/note_base.h
b/gtk2_ardour/note_base.h
index 150837e193c25ba3031929dea734be38dbdfe10d..54c53ff6d272cbf220349dad55f2de0322ac0481 100644
(file)
--- a/
gtk2_ardour/note_base.h
+++ b/
gtk2_ardour/note_base.h
@@
-23,10
+23,8
@@
#include <boost/shared_ptr.hpp>
#include "canvas/types.h"
#include <boost/shared_ptr.hpp>
#include "canvas/types.h"
-#include "evoral/types.hpp"
#include "rgb_macros.h"
#include "rgb_macros.h"
-#include "ardour_ui.h"
#include "ui_config.h"
class Editor;
#include "ui_config.h"
class Editor;
@@
-34,6
+32,7
@@
class MidiRegionView;
namespace Evoral {
template<typename T> class Note;
namespace Evoral {
template<typename T> class Note;
+ class Beats;
}
namespace ArdourCanvas {
}
namespace ArdourCanvas {
@@
-46,7
+45,7
@@
namespace ArdourCanvas {
* This is not actually a canvas item itself to avoid the dreaded diamond
* inheritance pattern, since various types of canvas items (Note (rect), Hit
* (diamond), etc) need to share this functionality but can't share an
* This is not actually a canvas item itself to avoid the dreaded diamond
* inheritance pattern, since various types of canvas items (Note (rect), Hit
* (diamond), etc) need to share this functionality but can't share an
- * ancestor.
+ * ancestor.
*
* Note: Because of this, derived classes need to manually bounce events to
* on_event, it won't happen automatically.
*
* Note: Because of this, derived classes need to manually bounce events to
* on_event, it won't happen automatically.
@@
-54,15
+53,13
@@
namespace ArdourCanvas {
class NoteBase : public sigc::trackable
{
public:
class NoteBase : public sigc::trackable
{
public:
- typedef Evoral::Note<Evoral::
MusicalTime
> NoteType;
+ typedef Evoral::Note<Evoral::
Beats
> NoteType;
NoteBase (MidiRegionView& region, bool, const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>());
virtual ~NoteBase ();
void set_item (ArdourCanvas::Item *);
NoteBase (MidiRegionView& region, bool, const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>());
virtual ~NoteBase ();
void set_item (ArdourCanvas::Item *);
- ArdourCanvas::Item* item() const { return _item; }
-
- static PBD::Signal1<void, NoteBase*> NoteBaseDeleted;
+ ArdourCanvas::Item* item() const { return _item; }
virtual void show() = 0;
virtual void hide() = 0;
virtual void show() = 0;
virtual void hide() = 0;
@@
-97,22
+94,22
@@
class NoteBase : public sigc::trackable
virtual ArdourCanvas::Coord x1 () const = 0;
virtual ArdourCanvas::Coord y1 () const = 0;
virtual ArdourCanvas::Coord x1 () const = 0;
virtual ArdourCanvas::Coord y1 () const = 0;
-
float mouse_x_fraction() const { return _mouse_x_fraction; }
-
float mouse_y_fraction() const { return _mouse_y_fraction; }
+ float mouse_x_fraction() const { return _mouse_x_fraction; }
+ float mouse_y_fraction() const { return _mouse_y_fraction; }
const boost::shared_ptr<NoteType> note() const { return _note; }
MidiRegionView& region_view() const { return _region; }
const boost::shared_ptr<NoteType> note() const { return _note; }
MidiRegionView& region_view() const { return _region; }
+ static void set_colors ();
+
inline static uint32_t meter_style_fill_color(uint8_t vel, bool selected) {
inline static uint32_t meter_style_fill_color(uint8_t vel, bool selected) {
- if (
vel < 64
) {
- return
UINT_INTERPOLATE(
- ARDOUR_UI::config()->color_mod ("midi note min", "midi note"),
-
ARDOUR_UI::config()->color_mod ("midi note mid", "midi note")
,
+ if (
selected
) {
+ return
_selected_mod_col;
+ } else if (vel < 64) {
+
return UINT_INTERPOLATE(_min_col, _mid_col
,
(vel / (double)63.0));
} else {
(vel / (double)63.0));
} else {
- return UINT_INTERPOLATE(
- ARDOUR_UI::config()->color_mod ("midi note mid", "midi note"),
- ARDOUR_UI::config()->color_mod ("midi note max", " midi note"),
+ return UINT_INTERPOLATE(_mid_col, _max_col,
((vel-64) / (double)63.0));
}
}
((vel-64) / (double)63.0));
}
}
@@
-120,7
+117,7
@@
class NoteBase : public sigc::trackable
/// calculate outline colors from fill colors of notes
inline static uint32_t calculate_outline(uint32_t color, bool selected=false) {
if (selected) {
/// calculate outline colors from fill colors of notes
inline static uint32_t calculate_outline(uint32_t color, bool selected=false) {
if (selected) {
- return
ARDOUR_UI::config()->color ("midi note selected outline")
;
+ return
_selected_outline_col
;
} else {
return UINT_INTERPOLATE(color, 0x000000ff, 0.5);
}
} else {
return UINT_INTERPOLATE(color, 0x000000ff, 0.5);
}
@@
-129,8
+126,8
@@
class NoteBase : public sigc::trackable
/// hue circle divided into 16 equal-looking parts, courtesy Thorsten Wilms
static const uint32_t midi_channel_colors[16];
/// hue circle divided into 16 equal-looking parts, courtesy Thorsten Wilms
static const uint32_t midi_channel_colors[16];
-
bool mouse_near_ends () const;
-
virtual bool big_enough_to_trim () const;
+ bool mouse_near_ends () const;
+ virtual bool big_enough_to_trim () const;
protected:
enum State { None, Pressed, Dragging };
protected:
enum State { None, Pressed, Dragging };
@@
-144,13
+141,21
@@
protected:
bool _own_note;
bool _selected;
bool _valid;
bool _own_note;
bool _selected;
bool _valid;
-
float _mouse_x_fraction;
-
float _mouse_y_fraction;
-
-
void set_mouse_fractions (GdkEvent*);
+ float _mouse_x_fraction;
+ float _mouse_y_fraction;
+
+ void set_mouse_fractions (GdkEvent*);
private:
bool event_handler (GdkEvent *);
private:
bool event_handler (GdkEvent *);
+
+ static uint32_t _selected_mod_col;
+ static uint32_t _selected_outline_col;
+ static uint32_t _selected_col;
+ static uint32_t _min_col;
+ static uint32_t _mid_col;
+ static uint32_t _max_col;
+ static bool _color_init;
};
#endif /* __gtk_ardour_note_h__ */
};
#endif /* __gtk_ardour_note_h__ */