add support for multi-track files

Author: cboxdoerfer

waveform.c

@@ -604,6 +604,24 @@ make_cache_dir (char *path, int size)
     return sz;
 }
 
+static char *
+waveform_format_uri (DB_playItem_t *it, const char *uri)
+{
+    if (!it || !uri) {
+        return NULL;
+    }
+    int key_len = strlen (uri) + 10;
+    char *key = malloc (key_len);
+    if (deadbeef->pl_get_item_flags (it) & DDB_IS_SUBTRACK) {
+        int subtrack = deadbeef->pl_find_meta_int (it, ":TRACKNUM", 0);
+        snprintf (key, key_len, "%d%s", subtrack, uri);
+    }
+    else {
+        snprintf (key, key_len, "%s", uri);
+    }
+    return key;
+}
+
 /* copied from ardour3 */
 static inline float
 _log_meter (float power, double lower_db, double upper_db, double non_linearity)
@@ -1188,15 +1206,22 @@ waveform_scale (void *user_data, cairo_t *cr, int x, int y, int width, int heigh
 }
 
 void
-waveform_db_cache (gpointer user_data, const char *uri)
+waveform_db_cache (gpointer user_data, DB_playItem_t *it, const char *uri)
 {
     w_waveform_t *w = user_data;
+    char *key = waveform_format_uri (it, uri);
+    if (!key) {
+        return;
+    }
     deadbeef->mutex_lock (w->mutex);
     waveform_db_open (cache_path, cache_path_size);
-    waveform_db_init (uri);
-    waveform_db_write (uri, w->buffer, w->buffer_len * sizeof (short), w->channels, 0);
+    waveform_db_init (key);
+    waveform_db_write (key, w->buffer, w->buffer_len * sizeof (short), w->channels, 0);
     waveform_db_close ();
     deadbeef->mutex_unlock (w->mutex);
+    if (key) {
+        free (key);
+    }
 }
 
 int
@@ -1332,7 +1357,7 @@ waveform_generate_wavedata (gpointer user_data, DB_playItem_t *it, const char *u
             }
             w->buffer_len = counter;
             if (CONFIG_CACHE_ENABLED) {
-                waveform_db_cache (w, uri);
+                waveform_db_cache (w, it, uri);
             }
             deadbeef->mutex_unlock (w->mutex);
             if (data) {
@@ -1353,33 +1378,54 @@ waveform_generate_wavedata (gpointer user_data, DB_playItem_t *it, const char *u
 }
 
 int
-waveform_delete (const char *uri)
+waveform_delete (DB_playItem_t *it, const char *uri)
 {
+    char *key = waveform_format_uri (it, uri);
+    if (!key) {
+        return 0;
+    }
     waveform_db_open (cache_path, cache_path_size);
     waveform_db_init (NULL);
-    int result = waveform_db_delete (uri);
+    int result = waveform_db_delete (key);
     waveform_db_close ();
+    if (key) {
+        free (key);
+    }
     return result;
 }
 
 int
-waveform_cached (const char *uri)
+waveform_cached (DB_playItem_t *it, const char *uri)
 {
+    char *key = waveform_format_uri (it, uri);
+    if (!key) {
+        return 0;
+    }
     waveform_db_open (cache_path, cache_path_size);
     waveform_db_init (NULL);
-    int result = waveform_db_cached (uri);
+    int result = waveform_db_cached (key);
     waveform_db_close ();
+    if (key) {
+        free (key);
+    }
     return result;
 }
 
 void
-waveform_get_from_cache (gpointer user_data, const char *uri)
+waveform_get_from_cache (gpointer user_data, DB_playItem_t *it, const char *uri)
 {
     w_waveform_t *w = user_data;
+    char *key = waveform_format_uri (it, uri);
+    if (!key) {
+        return;
+    }
     deadbeef->mutex_lock (w->mutex);
     waveform_db_open (cache_path, cache_path_size);
-    w->buffer_len = waveform_db_read (uri, w->buffer, w->max_buffer_len, &w->channels);
+    w->buffer_len = waveform_db_read (key, w->buffer, w->max_buffer_len, &w->channels);
     waveform_db_close ();
+    if (key) {
+        free (key);
+    }
     deadbeef->mutex_unlock (w->mutex);
 }
 
@@ -1392,8 +1438,8 @@ waveform_get_wavedata (gpointer user_data)
     if (it) {
         char *uri = strdup (deadbeef->pl_find_meta_raw (it, ":URI"));
         if (uri && waveform_valid_track (it, uri)) {
-            if (CONFIG_CACHE_ENABLED && waveform_cached (uri)) {
-                waveform_get_from_cache (w, uri);
+            if (CONFIG_CACHE_ENABLED && waveform_cached (it, uri)) {
+                waveform_get_from_cache (w, it, uri);
             }
             else {
                 waveform_generate_wavedata (w, it, uri);
@@ -1688,8 +1734,8 @@ waveform_action_lookup (DB_plugin_action_t *action, int ctx)
             while (it) {
                 if (deadbeef->pl_is_selected (it)) {
                     const char *uri = deadbeef->pl_find_meta_raw (it, ":URI");
-                    if (waveform_cached (uri)) {
-                        waveform_delete (uri);
+                    if (waveform_cached (it, uri)) {
+                        waveform_delete (it, uri);
                     }
                 }
                 DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
@@ -1721,7 +1767,7 @@ waveform_get_actions (DB_playItem_t *it)
     lookup_action.flags |= DB_ACTION_DISABLED;
     DB_playItem_t *current = deadbeef->pl_get_first (PL_MAIN);
     while (current) {
-        if (deadbeef->pl_is_selected (current) && waveform_cached (deadbeef->pl_find_meta_raw (current, ":URI"))) {
+        if (deadbeef->pl_is_selected (current) && waveform_cached (current, deadbeef->pl_find_meta_raw (current, ":URI"))) {
             lookup_action.flags &= ~DB_ACTION_DISABLED;
             deadbeef->pl_item_unref (current);
             break;