[Bf-blender-cvs] [58cc5c85734] master: Refactor: Move speaker foreach_id to new IDTypeInfo structure.

[Bastien Montagne]

Commit: 58cc5c857347f1ba8eb271e543f898605d50d56d
Author: Bastien Montagne
Date:   Wed May 13 19:30:04 2020 +0200
Branches: master
https://developer.blender.org/rB58cc5c857347f1ba8eb271e543f898605d50d56d

Refactor: Move speaker foreach_id to new IDTypeInfo structure.

===================================================================

M	source/blender/blenkernel/intern/lib_query.c
M	source/blender/blenkernel/intern/speaker.c

===================================================================

diff --git a/source/blender/blenkernel/intern/lib_query.c b/source/blender/blenkernel/intern/lib_query.c
index 8100c42f261..df4f4009aeb 100644
--- a/source/blender/blenkernel/intern/lib_query.c
+++ b/source/blender/blenkernel/intern/lib_query.c
@@ -943,8 +943,7 @@ static void library_foreach_ID_link(Main *bmain,
       }
 
       case ID_SPK: {
-        Speaker *speaker = (Speaker *)id;
-        CALLBACK_INVOKE(speaker->sound, IDWALK_CB_USER);
+        BLI_assert(0);
         break;
       }
 
diff --git a/source/blender/blenkernel/intern/speaker.c b/source/blender/blenkernel/intern/speaker.c
index 980cc2a59fd..1f778f5fcd6 100644
--- a/source/blender/blenkernel/intern/speaker.c
+++ b/source/blender/blenkernel/intern/speaker.c
@@ -30,6 +30,7 @@
 
 #include "BKE_idtype.h"
 #include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_main.h"
 #include "BKE_speaker.h"
 
@@ -42,6 +43,13 @@ static void speaker_init_data(ID *id)
   MEMCPY_STRUCT_AFTER(speaker, DNA_struct_default_get(Speaker), id);
 }
 
+static void speaker_foreach_id(ID *id, LibraryForeachIDData *data)
+{
+  Speaker *speaker = (Speaker *)id;
+
+  BKE_LIB_FOREACHID_PROCESS(data, speaker->sound, IDWALK_CB_USER);
+}
+
 IDTypeInfo IDType_ID_SPK = {
     .id_code = ID_SPK,
     .id_filter = FILTER_ID_SPK,
@@ -56,6 +64,7 @@ IDTypeInfo IDType_ID_SPK = {
     .copy_data = NULL,
     .free_data = NULL,
     .make_local = NULL,
+    .foreach_id = speaker_foreach_id,
 };
 
 void *BKE_speaker_add(Main *bmain, const char *name)