apev2 editing;

apev2->id3v2.4 converter;
apev2 writer

3 files changed, 9 insertions, 9 deletions

diff --git a/plugins/ffap/ffap.c b/plugins/ffap/ffap.c
index d8acaff5..d55efff8 100644
--- a/plugins/ffap/ffap.c
+++ b/plugins/ffap/ffap.c
@@ -1706,15 +1706,15 @@ ffap_insert (DB_playItem_t *after, const char *fname) {
     it->filetype = "APE";
     deadbeef->pl_set_item_duration (it, duration);
  
-    /*int v2err = */deadbeef->junk_read_id3v2 (it, fp);
-    int v1err = deadbeef->junk_read_id3v1 (it, fp);
+    /*int v2err = */deadbeef->junk_id3v2_read (it, fp);
+    int v1err = deadbeef->junk_id3v1_read (it, fp);
     if (v1err >= 0) {
         deadbeef->fseek (fp, -128, SEEK_END);
     }
     else {
         deadbeef->fseek (fp, 0, SEEK_END);
     }
-    /*int apeerr = */deadbeef->junk_read_ape (it, fp);
+    /*int apeerr = */deadbeef->junk_apev2_read (it, fp);
 
     deadbeef->fclose (fp);
     ape_free_ctx (&ape_ctx);
diff --git a/plugins/mpgmad/mpgmad.c b/plugins/mpgmad/mpgmad.c
index c697bdf2..982ccdd0 100644
--- a/plugins/mpgmad/mpgmad.c
+++ b/plugins/mpgmad/mpgmad.c
@@ -598,7 +598,7 @@ cmp3_init (DB_playItem_t *it) {
         const char *genre = deadbeef->fget_content_genre (info->buffer.file);
         if (len > 0) {
             deadbeef->pl_delete_all_meta (it);
-            int v2err = deadbeef->junk_read_id3v2 (it, info->buffer.file);
+            int v2err = deadbeef->junk_id3v2_read (it, info->buffer.file);
             deadbeef->pl_add_meta (it, "title", NULL);
             if (v2err != 0) {
                 deadbeef->fseek (info->buffer.file, 0, SEEK_SET);
@@ -1147,9 +1147,9 @@ cmp3_insert (DB_playItem_t *after, const char *fname) {
     it->fname = strdup (fname);
 
     deadbeef->rewind (fp);
-    /*int apeerr = */deadbeef->junk_read_ape (it, fp);
-    /*int v2err = */deadbeef->junk_read_id3v2 (it, fp);
-    /*int v1err = */deadbeef->junk_read_id3v1 (it, fp);
+    /*int apeerr = */deadbeef->junk_apev2_read (it, fp);
+    /*int v2err = */deadbeef->junk_id3v2_read (it, fp);
+    /*int v1err = */deadbeef->junk_id3v1_read (it, fp);
     deadbeef->pl_add_meta (it, "title", NULL);
     deadbeef->pl_set_item_duration (it, buffer.duration);
     it->filetype = ftype;
diff --git a/plugins/wavpack/wavpack.c b/plugins/wavpack/wavpack.c
index e8027786..ace9300a 100644
--- a/plugins/wavpack/wavpack.c
+++ b/plugins/wavpack/wavpack.c
@@ -244,11 +244,11 @@ wv_insert (DB_playItem_t *after, const char *fname) {
 
     trace ("wv: totalsamples=%d, samplerate=%d, duration=%f\n", totalsamples, samplerate, duration);
 
-    int apeerr = deadbeef->junk_read_ape (it, fp);
+    int apeerr = deadbeef->junk_apev2_read (it, fp);
     if (!apeerr) {
         trace ("wv: ape tag found\n");
     }
-    int v1err = deadbeef->junk_read_id3v1 (it, fp);
+    int v1err = deadbeef->junk_id3v1_read (it, fp);
     if (!v1err) {
         trace ("wv: id3v1 tag found\n");
     }