summaryrefslogtreecommitdiff
path: root/servers/audio/sample_manager_sw.h
diff options
context:
space:
mode:
Diffstat (limited to 'servers/audio/sample_manager_sw.h')
-rw-r--r--servers/audio/sample_manager_sw.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/servers/audio/sample_manager_sw.h b/servers/audio/sample_manager_sw.h
index bd7a11a3d2..93cad96f1a 100644
--- a/servers/audio/sample_manager_sw.h
+++ b/servers/audio/sample_manager_sw.h
@@ -5,7 +5,7 @@
/* GODOT ENGINE */
/* http://www.godotengine.org */
/*************************************************************************/
-/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
@@ -45,8 +45,8 @@ public:
virtual bool sample_is_stereo(RID p_sample) const=0;
virtual int sample_get_length(RID p_sample) const=0;
- virtual void sample_set_data(RID p_sample, const DVector<uint8_t>& p_buffer)=0;
- virtual const DVector<uint8_t> sample_get_data(RID p_sample) const=0;
+ virtual void sample_set_data(RID p_sample, const PoolVector<uint8_t>& p_buffer)=0;
+ virtual const PoolVector<uint8_t> sample_get_data(RID p_sample) const=0;
virtual void *sample_get_data_ptr(RID p_sample) const=0;
@@ -74,7 +74,7 @@ public:
class SampleManagerMallocSW : public SampleManagerSW {
- struct Sample {
+ struct Sample : public RID_Data {
void *data;
int length;
@@ -102,8 +102,8 @@ public:
virtual bool sample_is_stereo(RID p_sample) const;
virtual int sample_get_length(RID p_sample) const;
- virtual void sample_set_data(RID p_sample, const DVector<uint8_t>& p_buffer);
- virtual const DVector<uint8_t> sample_get_data(RID p_sample) const;
+ virtual void sample_set_data(RID p_sample, const PoolVector<uint8_t>& p_buffer);
+ virtual const PoolVector<uint8_t> sample_get_data(RID p_sample) const;
virtual void *sample_get_data_ptr(RID p_sample) const;