elm - make elm test edje build again - was including default theme stuff

data/elementary/objects/meson.build

@@ -21,7 +21,7 @@ foreach edc_file : edc_files
     input : edc_file,
     output : '@BASENAME@.edj',
     command : edje_cc_exe + [ '-beta', '-fastcomp',
-              '-sd', join_paths(meson.current_source_dir()),
+              '-sd', elm_themes_sound_include,
               '-id', elm_themes_image_include,
               '-id', join_paths(meson.current_source_dir()),
               '-fd', join_paths(meson.current_source_dir()),

data/elementary/objects/test_focus_style.edc

@@ -434,6 +434,8 @@ collections {
       }
    } //group ends
 
+#include "../../../data/elementary/themes/snd.edc"
+#include "../../../data/elementary/themes/ic.edc"
 #include "../../../data/elementary/themes/macros.edc"
 #include "../../../data/elementary/themes/fonts.edc"
 #include "../../../data/elementary/themes/colorclasses.edc"

data/elementary/themes/default.edc

@@ -11,19 +11,7 @@ data.item: "efl_theme_base" "dark";
 
 collections {
 
-sounds {
-   sample { name: "splash"           LOSSY 256; source: "splash.wav"; }
-   sample { name: "wood-tap1"        LOSSY  64; source: "wood-tap.wav"; }
-   sample { name: "wood-tap2"        LOSSY  64; source: "wood-tap2.wav"; }
-   sample { name: "key-tap1"         LOSSY  64; source: "kbd-tap.wav"; }
-   sample { name: "key-tap2"         LOSSY  64; source: "kbd-tap2.wav"; }
-   sample { name: "key-tap3"         LOSSY  64; source: "kbd-tap3.wav"; }
-   sample { name: "key-tap4"         LOSSY  64; source: "kbd-tap4.wav"; }
-   sample { name: "key-tap5"         LOSSY  64; source: "kbd-tap5.wav"; }
-   sample { name: "synth-worble-dn"  LOSSY 128; source: "synth-worble-down.wav"; }
-   sample { name: "synth-worble-up"  LOSSY 128; source: "synth-worble-up.wav"; }
-}
-
+#include "snd.edc"
 #include "ic.edc"
 
 #include "fonts.edc"

data/elementary/themes/meson.build

@@ -5,6 +5,7 @@ edc_files = [
 elm_themes = []
 
 elm_themes_image_include = join_paths(meson.current_source_dir(), 'img')
+elm_themes_sound_include = join_paths(meson.current_source_dir(), 'snd')
 
 foreach edc_file : edc_files
    elm_themes += custom_target('edje_cc_' + edc_file,

data/elementary/themes/snd.edc

@@ -0,0 +1,12 @@
+sounds {
+   sample { name: "splash"           LOSSY 256; source: "splash.wav"; }
+   sample { name: "wood-tap1"        LOSSY  64; source: "wood-tap.wav"; }
+   sample { name: "wood-tap2"        LOSSY  64; source: "wood-tap2.wav"; }
+   sample { name: "key-tap1"         LOSSY  64; source: "kbd-tap.wav"; }
+   sample { name: "key-tap2"         LOSSY  64; source: "kbd-tap2.wav"; }
+   sample { name: "key-tap3"         LOSSY  64; source: "kbd-tap3.wav"; }
+   sample { name: "key-tap4"         LOSSY  64; source: "kbd-tap4.wav"; }
+   sample { name: "key-tap5"         LOSSY  64; source: "kbd-tap5.wav"; }
+   sample { name: "synth-worble-dn"  LOSSY 128; source: "synth-worble-down.wav"; }
+   sample { name: "synth-worble-up"  LOSSY 128; source: "synth-worble-up.wav"; }
+}