summaryrefslogtreecommitdiff
path: root/src/events.h
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2019-03-17 11:44:21 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2019-03-17 11:44:21 +0100
commit5dee5069bc10ba3e190723aa68bb880183b1dc4c (patch)
tree9de9f8f3d328c7a1d62540e63ac448d3ed4dd90f /src/events.h
parent5eb47bed81de1326843e1e3bad41addcfed08d4e (diff)
Implemented new directed choke feature.
Diffstat (limited to 'src/events.h')
-rw-r--r--src/events.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/events.h b/src/events.h
index f43fbe2..18f9af3 100644
--- a/src/events.h
+++ b/src/events.h
@@ -65,16 +65,16 @@ class EventSample
{
public:
EventSample(channel_t c, float g, AudioFile* af,
- const std::string& grp, void* instr)
+ const std::string& grp, std::size_t instrument_id)
: Event(c)
, cache_id(CACHE_NOID)
, gain(g)
, t(0)
, file(af)
, group(grp)
- , instrument(instr)
, rampdown_count(-1)
, ramp_length(0)
+ , instrument_id(instrument_id)
{
}
@@ -98,11 +98,11 @@ public:
unsigned int t; //< Internal sample position.
AudioFile* file;
std::string group;
- void* instrument;
int rampdown_count;
int ramp_length;
std::size_t rampdown_offset{0};
float scale{1.0f};
+ std::size_t instrument_id;
};
class EventQueue