summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorGravatar Alexey Yakovenko <waker@users.sourceforge.net>2014-06-22 22:05:56 +0200
committerGravatar Alexey Yakovenko <waker@users.sourceforge.net>2014-06-22 22:05:56 +0200
commit49c60ccb1ca920bed6284fd2045d95f60668a8cf (patch)
treec78d9c2c6a99c2b968ad60fe2283ae2ac1b891df /plugins
parent601216ea9bad02f1be55ceecd4f20285510e1661 (diff)
converter: fixed loading of custom encoder presets
Diffstat (limited to 'plugins')
-rw-r--r--plugins/converter/converter.c51
1 files changed, 1 insertions, 50 deletions
diff --git a/plugins/converter/converter.c b/plugins/converter/converter.c
index 46307116..a0e7a218 100644
--- a/plugins/converter/converter.c
+++ b/plugins/converter/converter.c
@@ -455,55 +455,6 @@ copy_file (const char *in, const char *out) {
return 0;
}
-static int
-encoder_preset_compare (ddb_encoder_preset_t *a, ddb_encoder_preset_t *b) {
- if (!strcmp (a->title, b->title)) {
- return 0;
- }
-
- if (!strcmp (a->ext, b->ext)) {
- return 0;
- }
-
- if (!strcmp (a->encoder, b->encoder)) {
- return 0;
- }
-
- if (a->method == b->method) {
- return 0;
- }
-
- if (a->tag_id3v2 == b->tag_id3v2) {
- return 0;
- }
-
- if (a->tag_id3v1 == b->tag_id3v1) {
- return 0;
- }
-
- if (a->tag_apev2 == b->tag_apev2) {
- return 0;
- }
-
- if (a->tag_flac == b->tag_flac) {
- return 0;
- }
-
- if (a->tag_oggvorbis == b->tag_oggvorbis) {
- return 0;
- }
-
- if (a->tag_mp3xing == b->tag_mp3xing) {
- return 0;
- }
-
- if (a->id3v2_version == b->id3v2_version) {
- return 0;
- }
-
- return 1;
-}
-
int
load_encoder_presets (void) {
// check if we need to install presets
@@ -545,7 +496,7 @@ load_encoder_presets (void) {
else {
// check if the same RO preset exists
for (ddb_encoder_preset_t *pr = encoder_presets; pr; pr = pr->next) {
- if (pr->readonly && !encoder_preset_compare (pr, p)) {
+ if (pr->readonly && !strcmp (pr->title, p->title)) {
encoder_preset_free (p);
p = NULL;
break;