diff options
| author | Lubos Dolezel <lubos@dolezel.info> | 2015-06-15 11:53:24 +0200 |
|---|---|---|
| committer | Lubos Dolezel <lubos@dolezel.info> | 2015-06-15 11:53:24 +0200 |
| commit | 0bb7d9b67eb81117d0170bca7db71bb1c4014d53 (patch) | |
| tree | 8bfc6989be16286b7592bbd25f6bedffb8d25a25 /src/gui | |
| parent | cfc875dfa13f74ffcaea66f5665efed7a8753ef3 (diff) | |
| download | twinkle-0bb7d9b67eb81117d0170bca7db71bb1c4014d53.tar twinkle-0bb7d9b67eb81117d0170bca7db71bb1c4014d53.tar.gz twinkle-0bb7d9b67eb81117d0170bca7db71bb1c4014d53.tar.lz twinkle-0bb7d9b67eb81117d0170bca7db71bb1c4014d53.tar.xz twinkle-0bb7d9b67eb81117d0170bca7db71bb1c4014d53.zip | |
Further work on G.729A integration (issue #15)
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/userprofileform.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/userprofileform.cpp b/src/gui/userprofileform.cpp index 6a9e39b..d7f39a0 100644 --- a/src/gui/userprofileform.cpp +++ b/src/gui/userprofileform.cpp @@ -81,6 +81,7 @@ #define labelCodecG726_24 "G.726 24 kbps" #define labelCodecG726_32 "G.726 32 kbps" #define labelCodecG726_40 "G.726 40 kbps" +#define labelCodecG729A "G.729A" // Indices of iLBC modes #define idxIlbcMode20 0 @@ -252,6 +253,8 @@ t_audio_codec UserProfileForm::label2codec(const QString &label) { return CODEC_G726_32; } else if (label == labelCodecG726_40) { return CODEC_G726_40; + } else if (label == labelCodecG729A) { + return CODEC_G729A; } return CODEC_NULL; } @@ -281,6 +284,8 @@ QString UserProfileForm::codec2label(t_audio_codec &codec) { return labelCodecG726_32; case CODEC_G726_40: return labelCodecG726_40; + case CODEC_G729A: + return labelCodecG729A; default: return ""; } @@ -418,6 +423,9 @@ void UserProfileForm::populate() allCodecs.append(labelCodecG726_24); allCodecs.append(labelCodecG726_32); allCodecs.append(labelCodecG726_40); +#ifdef HAVE_BCG729 + allCodecs.append(labelCodecG729A); +#endif activeCodecListBox->clear(); list<t_audio_codec> audio_codecs = current_profile->get_codecs(); for (list<t_audio_codec>::iterator i = audio_codecs.begin(); i != audio_codecs.end(); i++) |