diff options
| author | Michal Kubecek <mkubecek@suse.cz> | 2016-05-20 09:48:18 +0200 |
|---|---|---|
| committer | Michal Kubecek <mkubecek@suse.cz> | 2016-05-20 09:48:18 +0200 |
| commit | 77eeffe564e5a82b2b419ed8129e6d151d139086 (patch) | |
| tree | c6dccee5b5e5902490bb228835bc4c8c862a7911 /src/audio/dtmf_player.cpp | |
| parent | 4627d49d5e2d75030c0200c7770ea258cdb42a69 (diff) | |
| download | twinkle-77eeffe564e5a82b2b419ed8129e6d151d139086.tar twinkle-77eeffe564e5a82b2b419ed8129e6d151d139086.tar.gz twinkle-77eeffe564e5a82b2b419ed8129e6d151d139086.tar.lz twinkle-77eeffe564e5a82b2b419ed8129e6d151d139086.tar.xz twinkle-77eeffe564e5a82b2b419ed8129e6d151d139086.zip | |
DTMF event type cleanup
DTMF event constants handling is a bit messy as three different types
are used in different source files, triggering various compiler
warnings. Introduce t_dtmf_ev type and use it everywhere, also replace
helper macros by inline functions.
Diffstat (limited to 'src/audio/dtmf_player.cpp')
| -rw-r--r-- | src/audio/dtmf_player.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/audio/dtmf_player.cpp b/src/audio/dtmf_player.cpp index d3d5909..54c2580 100644 --- a/src/audio/dtmf_player.cpp +++ b/src/audio/dtmf_player.cpp @@ -30,7 +30,7 @@ ///////////////////////////////////////// t_dtmf_player::t_dtmf_player(t_audio_rx *audio_rx, t_audio_encoder *audio_encoder, - t_user *user_config, uint8 dtmf_tone, uint32 dtmf_timestamp, + t_user *user_config, t_dtmf_ev dtmf_tone, uint32 dtmf_timestamp, uint16 nsamples) : _audio_rx(audio_rx), _user_config(user_config), @@ -57,7 +57,7 @@ bool t_dtmf_player::finished(void) { t_rtp_event_dtmf_player::t_rtp_event_dtmf_player(t_audio_rx *audio_rx, t_audio_encoder *audio_encoder, t_user *user_config, - uint8 dtmf_tone, uint32 dtmf_timestamp, + t_dtmf_ev dtmf_tone, uint32 dtmf_timestamp, uint16 nsamples) : t_dtmf_player(audio_rx, audio_encoder, user_config, dtmf_tone, dtmf_timestamp, nsamples) @@ -125,7 +125,7 @@ uint16 t_rtp_event_dtmf_player::get_payload(uint8 *payload, t_inband_dtmf_player::t_inband_dtmf_player(t_audio_rx *audio_rx, t_audio_encoder *audio_encoder, t_user *user_config, - uint8 dtmf_tone, uint32 dtmf_timestamp, + t_dtmf_ev dtmf_tone, uint32 dtmf_timestamp, uint16 nsamples) : t_dtmf_player(audio_rx, audio_encoder, user_config, dtmf_tone, dtmf_timestamp, nsamples), |