* skins: Reparent the embedded vout window when switching to the wx intf

[vlc] / modules / gui / skins2 / Modules.am

diff --git a/modules/gui/skins2/Modules.am b/modules/gui/skins2/Modules.am
index e3060c2f67b74a8ae6a3b9f2ecdfa3995d5a60bc..fb0ce3bf9b053a2bedc044ccb2909b49e385d533 100644 (file)
--- a/modules/gui/skins2/Modules.am
+++ b/modules/gui/skins2/Modules.am
@@ -14,17 +14,19 @@ SOURCES_skins2 = \
        commands/cmd_input.hpp \
        commands/cmd_layout.cpp \
        commands/cmd_layout.hpp \
-       commands/cmd_notify_playlist.cpp \
-       commands/cmd_notify_playlist.hpp \
        commands/cmd_on_top.cpp \
        commands/cmd_on_top.hpp \
        commands/cmd_playlist.cpp \
        commands/cmd_playlist.hpp \
+       commands/cmd_minimize.cpp \
+       commands/cmd_minimize.hpp \
        commands/cmd_quit.cpp \
        commands/cmd_quit.hpp \
        commands/cmd_resize.cpp \
        commands/cmd_resize.hpp \
        commands/cmd_show_window.hpp \
+       commands/cmd_vars.cpp \
+       commands/cmd_vars.hpp \
        \
        controls/ctrl_button.cpp \
        controls/ctrl_button.hpp \
@@ -47,6 +49,8 @@ SOURCES_skins2 = \
        controls/ctrl_radialslider.hpp \
        controls/ctrl_text.hpp \
        controls/ctrl_text.cpp \
+       controls/ctrl_video.cpp \
+       controls/ctrl_video.hpp \
        \
        events/evt_enter.hpp \
        events/evt_generic.hpp \
@@ -68,6 +72,8 @@ SOURCES_skins2 = \
        parser/builder.cpp \
        parser/builder.hpp \
        parser/builder_data.hpp \
+       parser/expr_evaluator.cpp \
+       parser/expr_evaluator.hpp \
        parser/interpreter.cpp \
        parser/interpreter.hpp \
        parser/skin_parser.cpp \
@@ -77,12 +83,15 @@ SOURCES_skins2 = \
        \
        src/anchor.cpp \
        src/anchor.hpp \
+       src/bitmap_font.cpp \
+       src/bitmap_font.hpp \
        src/dialogs.cpp \
        src/dialogs.hpp \
        src/ft2_bitmap.cpp \
        src/ft2_bitmap.hpp \
        src/ft2_font.cpp \
        src/ft2_font.hpp \
+       src/generic_bitmap.cpp \
        src/generic_bitmap.hpp \
        src/generic_font.hpp \
        src/generic_layout.cpp \
@@ -108,12 +117,18 @@ SOURCES_skins2 = \
        src/theme.hpp \
        src/theme_loader.cpp \
        src/theme_loader.hpp \
+       src/theme_repository.cpp \
+       src/theme_repository.hpp \
        src/tooltip.cpp \
        src/tooltip.hpp \
+       src/top_window.cpp \
+       src/top_window.hpp \
        src/var_manager.cpp \
        src/var_manager.hpp \
        src/vlcproc.cpp \
        src/vlcproc.hpp \
+       src/vout_window.cpp \
+       src/vout_window.hpp \
        src/window_manager.cpp \
        src/window_manager.hpp \
        \
@@ -136,14 +151,14 @@ SOURCES_skins2 = \
        utils/var_percent.hpp \
        utils/var_text.cpp \
        utils/var_text.hpp \
-\
+       \
        vars/playlist.cpp \
        vars/playlist.hpp \
        vars/time.cpp \
        vars/time.hpp \
        vars/volume.cpp \
        vars/volume.hpp \
-\
+       \
        win32/win32_dragdrop.cpp \
        win32/win32_dragdrop.hpp \
        win32/win32_factory.cpp \