diff options
Diffstat (limited to '')
| -rw-r--r-- | modules/chibi/cp_sample.h | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/modules/chibi/cp_sample.h b/modules/chibi/cp_sample.h index c02b220c8..65c6abee9 100644 --- a/modules/chibi/cp_sample.h +++ b/modules/chibi/cp_sample.h @@ -29,7 +29,6 @@ #ifndef CPSAMPLE_H #define CPSAMPLE_H - #include "cp_config.h" #include "cp_sample_manager.h" class CPSample { @@ -44,16 +43,15 @@ public: }; private: - - enum { NAME_MAX_LEN=26 }; - + enum { NAME_MAX_LEN = 26 }; + char name[NAME_MAX_LEN]; uint8_t default_volume; /* 0.. 64 */ uint8_t global_volume; /* 0.. 64 */ bool pan_enabled; - uint8_t pan; /* 0.. 64 */ + uint8_t pan; /* 0.. 64 */ VibratoType vibrato_type; uint8_t vibrato_speed; /* 0.. 64 */ @@ -61,32 +59,31 @@ private: uint8_t vibrato_rate; /* 0.. 64 */ CPSample_ID id; - + void copy_from(const CPSample &p_sample); -public: - +public: void operator=(const CPSample &p_sample); - - const char * get_name() const; + + const char *get_name() const; void set_name(const char *p_name); void set_default_volume(uint8_t p_vol); uint8_t get_default_volume() const; - + void set_global_volume(uint8_t p_vol); uint8_t get_global_volume() const; - + void set_pan_enabled(bool p_vol); bool is_pan_enabled() const; - + void set_pan(uint8_t p_pan); uint8_t get_pan() const; void set_vibrato_type(VibratoType p_vibrato_type); VibratoType get_vibrato_type() const; - void set_vibrato_speed(uint8_t p_vibrato_speed) ; + void set_vibrato_speed(uint8_t p_vibrato_speed); uint8_t get_vibrato_speed() const; void set_vibrato_depth(uint8_t p_vibrato_depth); @@ -97,16 +94,12 @@ public: void set_sample_data(CPSample_ID); CPSample_ID get_sample_data() const; - + void reset(); - - CPSample(const CPSample&p_from); + + CPSample(const CPSample &p_from); CPSample(); ~CPSample(); - }; - - - #endif |