From 0c92e04b80d1127090a3ca12344b51a959a45f19 Mon Sep 17 00:00:00 2001 From: "rafael@riseup.net" Date: Tue, 14 May 2013 17:32:59 +0000 Subject: [PATCH] added opus support and fixed a longstanding bug --- darkice-gui/trunk/config_files.c | 8 +++++--- darkice-gui/trunk/darksnow.c | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/darkice-gui/trunk/config_files.c b/darkice-gui/trunk/config_files.c index fbac4af..31c80cd 100644 --- a/darkice-gui/trunk/config_files.c +++ b/darkice-gui/trunk/config_files.c @@ -256,13 +256,13 @@ gboolean darksnow2darkice_cfg() { /* write bitratemode */ fprintf(f_darkice_cfg, "\nbitrateMode = "); - if (!strcmp( gettext("Constant"), bitratemode)) + if (!strcmp("Constant", bitratemode)) fprintf(f_darkice_cfg, "cbr"); /* Constant bitrate mode */ else - if (!strcmp( gettext("Average"), bitratemode)) + if (!strcmp("Average", bitratemode)) fprintf(f_darkice_cfg, "abr"); /* average bitrate mode */ else - if (!strcmp( gettext("Variable"), bitratemode)) + if (!strcmp("Variable", bitratemode)) fprintf(f_darkice_cfg, "vbr"); /* variable bitrate mode */ @@ -273,6 +273,8 @@ gboolean darksnow2darkice_cfg() { fprintf(f_darkice_cfg, "mp3"); else if (!strcmp( gettext("ogg/vorbis"), format)) fprintf(f_darkice_cfg, "vorbis"); + else if (!strcmp( gettext("ogg/opus"), format)) + fprintf(f_darkice_cfg, "opus"); else if (!strcmp( gettext("aac"), format)) fprintf(f_darkice_cfg, "aac"); else if (!strcmp( gettext("mp2"), format)) diff --git a/darkice-gui/trunk/darksnow.c b/darkice-gui/trunk/darksnow.c index de555d0..b0eb3f7 100644 --- a/darkice-gui/trunk/darksnow.c +++ b/darkice-gui/trunk/darksnow.c @@ -296,6 +296,7 @@ int main( int argc, char *argv[], char *envp[]) { gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_format), gettext("aac")); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_format), gettext("mp2")); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_format), gettext("aacp")); + gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_format), gettext("ogg/opus")); gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combo_format))),"ogg/vorbis"); label_bitratemode = gtk_label_new ( gettext("BitRateMode: "));