allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

use ArdourCanvas::Color not uint32_t for push2 color decls

Browse Source
This commit is contained in:
Paul Davis
2016-09-21 23:05:01 -05:00
parent 87ab1625ff
commit 13295cf060
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/surfaces/push2/push2.h
View File

@@ -37,6 +37,8 @@
#include "control_protocol/control_protocol.h"
#include "control_protocol/types.h"
#include "canvas/colors.h"
#include "midi_byte_array.h"
#include "mode.h"
@@ -355,8 +357,8 @@ class Push2 : public ARDOUR::ControlProtocol
void write (const MidiByteArray&);
uint8_t get_color_index (uint32_t rgb);
uint32_t get_color (ColorName);
uint8_t get_color_index (ArdourCanvas::Color rgba);
ArdourCanvas::Color get_color (ColorName);
PressureMode pressure_mode () const { return _pressure_mode; }
void set_pressure_mode (PressureMode);
@@ -567,7 +569,7 @@ class Push2 : public ARDOUR::ControlProtocol
/* color map (device side) */
typedef std::map<uint32_t,uint8_t> ColorMap;
typedef std::map<ArdourCanvas::Color,uint8_t> ColorMap;
typedef std::stack<uint8_t> ColorMapFreeList;
ColorMap color_map;
ColorMapFreeList color_map_free_list;
@@ -575,12 +577,15 @@ class Push2 : public ARDOUR::ControlProtocol
/* our own colors */
typedef std::map<ColorName,uint32_t> Colors;
typedef std::map<ColorName,ArdourCanvas::Color> Colors;
Colors colors;
void fill_color_table ();
void reset_pad_colors ();
PressureMode _pressure_mode;
void request_pressure_mode ();
uint8_t selection_color;
};
} /* namespace */