[vlc-commits] acoustid: rename mb structure

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed May 29 12:16:02 2019 +0200| [6065ecc4217102d73af6d2266d25b27811647dd8] | committer: Francois Cartegnie

acoustid: rename mb structure

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6065ecc4217102d73af6d2266d25b27811647dd8
---

 modules/misc/fingerprinter.c        | 2 +-
 modules/misc/webservices/acoustid.c | 6 +++---
 modules/misc/webservices/acoustid.h | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/misc/fingerprinter.c b/modules/misc/fingerprinter.c
index 1ba89f31b3..8300a692ec 100644
--- a/modules/misc/fingerprinter.c
+++ b/modules/misc/fingerprinter.c
@@ -300,7 +300,7 @@ static void fill_metas_with_results( fingerprint_request_t *p_r, acoustid_finger
         acoustid_result_t *p_result = & p_f->results.p_results[ i ];
         for ( unsigned int j=0 ; j < p_result->recordings.count; j++ )
         {
-            musicbrainz_recording_t *p_record = & p_result->recordings.p_recordings[ j ];
+            acoustid_mb_result_t *p_record = & p_result->recordings.p_recordings[ j ];
             vlc_meta_t *p_meta = vlc_meta_New();
             if ( p_meta )
             {
diff --git a/modules/misc/webservices/acoustid.c b/modules/misc/webservices/acoustid.c
index be7cb8dfab..c816269ce4 100644
--- a/modules/misc/webservices/acoustid.c
+++ b/modules/misc/webservices/acoustid.c
@@ -52,7 +52,7 @@ static json_value * jsongetbyname( json_value *object, const char *psz_name )
     return NULL;
 }
 
-static void parse_artists( json_value *node, musicbrainz_recording_t *record )
+static void parse_artists( json_value *node, acoustid_mb_result_t *record )
 {
     /* take only main */
     if ( !node || node->type != json_array || node->u.array.length < 1 ) return;
@@ -65,13 +65,13 @@ static void parse_artists( json_value *node, musicbrainz_recording_t *record )
 static void parse_recordings( vlc_object_t *p_obj, json_value *node, acoustid_result_t *p_result )
 {
     if ( !node || node->type != json_array ) return;
-    p_result->recordings.p_recordings = calloc( node->u.array.length, sizeof(musicbrainz_recording_t) );
+    p_result->recordings.p_recordings = calloc( node->u.array.length, sizeof(acoustid_mb_result_t) );
     if ( ! p_result->recordings.p_recordings ) return;
     p_result->recordings.count = node->u.array.length;
 
     for( unsigned int i=0; i<node->u.array.length; i++ )
     {
-        musicbrainz_recording_t *record = & p_result->recordings.p_recordings[ i ];
+        acoustid_mb_result_t *record = & p_result->recordings.p_recordings[ i ];
         json_value *recordnode = node->u.array.values[ i ];
         if ( !recordnode || recordnode->type != json_object ) break;
         json_value *value = jsongetbyname( recordnode, "title" );
diff --git a/modules/misc/webservices/acoustid.h b/modules/misc/webservices/acoustid.h
index d7d54c975e..f2d2f79578 100644
--- a/modules/misc/webservices/acoustid.h
+++ b/modules/misc/webservices/acoustid.h
@@ -20,13 +20,13 @@
 
 #define MB_ID_SIZE 36
 
-struct musicbrainz_recording_t
+struct acoustid_mb_result_t
 {
     char *psz_artist;
     char *psz_title;
     char s_musicbrainz_id[MB_ID_SIZE];
 };
-typedef struct musicbrainz_recording_t musicbrainz_recording_t;
+typedef struct acoustid_mb_result_t acoustid_mb_result_t;
 
 struct acoustid_result_t
 {
@@ -35,7 +35,7 @@ struct acoustid_result_t
     struct
     {
         unsigned int count;
-        musicbrainz_recording_t *p_recordings;
+        acoustid_mb_result_t *p_recordings;
     } recordings;
 };
 typedef struct acoustid_result_t acoustid_result_t;