diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 6242d483e6eb5cfaf673ef577dd30acca9dab40c..0c078dba10360565aea0d6db9bb9b062799c6eef 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -61,8 +61,6 @@ libqt_plugin_la_SOURCES = \
gui/qt/dialogs/errors.cpp gui/qt/dialogs/errors.hpp \
gui/qt/dialogs/plugins/plugins.cpp gui/qt/dialogs/plugins/plugins.hpp \
gui/qt/dialogs/plugins/addons_manager.cpp gui/qt/dialogs/plugins/addons_manager.hpp \
- gui/qt/dialogs/sout.cpp gui/qt/dialogs/sout.hpp \
- gui/qt/dialogs/convert.cpp gui/qt/dialogs/convert.hpp \
gui/qt/dialogs/help/help.cpp gui/qt/dialogs/help/help.hpp \
gui/qt/dialogs/gototime.cpp gui/qt/dialogs/gototime.hpp \
gui/qt/dialogs/toolbar.cpp gui/qt/dialogs/toolbar.hpp \
@@ -179,11 +177,13 @@ libqt_plugin_la_SOURCES = \
gui/qt/playlist/playlist_model.cpp \
gui/qt/playlist/playlist_model.hpp \
gui/qt/playlist/playlist_model_p.hpp \
- gui/qt/components/sout/profile_selector.cpp \
- gui/qt/components/sout/profile_selector.hpp \
- gui/qt/components/sout/sout_widgets.cpp \
- gui/qt/components/sout/sout_widgets.hpp \
- gui/qt/components/sout/profiles.hpp \
+ gui/qt/dialogs/sout/convert.cpp gui/qt/dialogs/sout/convert.hpp \
+ gui/qt/dialogs/sout/sout.cpp gui/qt/dialogs/sout/sout.hpp \
+ gui/qt/dialogs/sout/profile_selector.cpp \
+ gui/qt/dialogs/sout/profile_selector.hpp \
+ gui/qt/dialogs/sout/sout_widgets.cpp \
+ gui/qt/dialogs/sout/sout_widgets.hpp \
+ gui/qt/dialogs/sout/profiles.hpp \
gui/qt/util/animators.cpp gui/qt/util/animators.hpp \
gui/qt/util/input_slider.cpp gui/qt/util/input_slider.hpp \
gui/qt/player/input_models.cpp gui/qt/player/input_models.hpp \
@@ -243,8 +243,6 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/dialogs/errors.moc.cpp \
gui/qt/dialogs/plugins/addons_manager.moc.cpp \
gui/qt/dialogs/plugins/plugins.moc.cpp \
- gui/qt/dialogs/sout.moc.cpp \
- gui/qt/dialogs/convert.moc.cpp \
gui/qt/dialogs/help/help.moc.cpp \
gui/qt/dialogs/gototime.moc.cpp \
gui/qt/dialogs/toolbar.moc.cpp \
@@ -310,8 +308,10 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/playlist/playlist_item.moc.cpp \
gui/qt/playlist/playlist_model.moc.cpp \
gui/qt/playlist/playlist_controller.moc.cpp \
- gui/qt/components/sout/profile_selector.moc.cpp \
- gui/qt/components/sout/sout_widgets.moc.cpp \
+ gui/qt/dialogs/sout/convert.moc.cpp \
+ gui/qt/dialogs/sout/sout.moc.cpp \
+ gui/qt/dialogs/sout/profile_selector.moc.cpp \
+ gui/qt/dialogs/sout/sout_widgets.moc.cpp \
gui/qt/util/animators.moc.cpp \
gui/qt/util/input_slider.moc.cpp \
gui/qt/player/input_models.moc.cpp \
@@ -341,7 +341,7 @@ nodist_libqt_plugin_la_SOURCES += \
gui/qt/ui/ui_open.h \
gui/qt/ui/ui_vlm.h \
gui/qt/ui/ui_podcast_configuration.h \
- gui/qt/ui/ui_profiles.h \
+ gui/qt/dialogs/sout/ui_profiles.h \
gui/qt/dialogs/preferences/ui_sprefs_audio.h \
gui/qt/dialogs/preferences/ui_sprefs_input.h \
gui/qt/dialogs/preferences/ui_sprefs_interface.h \
@@ -352,7 +352,7 @@ nodist_libqt_plugin_la_SOURCES += \
gui/qt/dialogs/help/ui_about.h \
gui/qt/dialogs/help/ui_update.h \
gui/qt/dialogs/fingerprint/ui_fingerprintdialog.h \
- gui/qt/ui/ui_sout.h
+ gui/qt/dialogs/sout/ui_sout.h
# User interface compilation
@@ -380,7 +380,7 @@ libqt_plugin_la_UI = \
gui/qt/ui/open_capture.ui \
gui/qt/ui/open.ui \
gui/qt/ui/podcast_configuration.ui \
- gui/qt/ui/profiles.ui \
+ gui/qt/dialogs/sout/profiles.ui \
gui/qt/dialogs/preferences/sprefs_audio.ui \
gui/qt/dialogs/preferences/sprefs_input.ui \
gui/qt/dialogs/preferences/sprefs_interface.ui \
@@ -390,7 +390,7 @@ libqt_plugin_la_UI = \
gui/qt/ui/messages_panel.ui \
gui/qt/dialogs/help/about.ui \
gui/qt/dialogs/help/update.ui \
- gui/qt/ui/sout.ui \
+ gui/qt/dialogs/sout/sout.ui \
gui/qt/ui/vlm.ui \
gui/qt/dialogs/fingerprint/fingerprintdialog.ui
EXTRA_DIST += $(libqt_plugin_la_UI)
diff --git a/modules/gui/qt/dialogs/convert.cpp b/modules/gui/qt/dialogs/sout/convert.cpp
similarity index 98%
rename from modules/gui/qt/dialogs/convert.cpp
rename to modules/gui/qt/dialogs/sout/convert.cpp
index f8ff83d095390e5d12327cea04c04089f1f81108..ec1e579819576416e41344d34aaf12b358b1b216 100644
--- a/modules/gui/qt/dialogs/convert.cpp
+++ b/modules/gui/qt/dialogs/sout/convert.cpp
@@ -24,9 +24,9 @@
# include "config.h"
#endif
-#include "dialogs/sout.hpp"
-#include "dialogs/convert.hpp"
-#include "components/sout/sout_widgets.hpp"
+#include "dialogs/sout/sout.hpp"
+#include "dialogs/sout/convert.hpp"
+#include "dialogs/sout/sout_widgets.hpp"
#include "util/qt_dirs.hpp"
diff --git a/modules/gui/qt/dialogs/convert.hpp b/modules/gui/qt/dialogs/sout/convert.hpp
similarity index 100%
rename from modules/gui/qt/dialogs/convert.hpp
rename to modules/gui/qt/dialogs/sout/convert.hpp
diff --git a/modules/gui/qt/components/sout/profile_selector.cpp b/modules/gui/qt/dialogs/sout/profile_selector.cpp
similarity index 99%
rename from modules/gui/qt/components/sout/profile_selector.cpp
rename to modules/gui/qt/dialogs/sout/profile_selector.cpp
index a625926c54b8de2c417164291c1a2bc483c55abf..6e3d553876fafa38ea5234a5d620a23c64af574b 100644
--- a/modules/gui/qt/components/sout/profile_selector.cpp
+++ b/modules/gui/qt/dialogs/sout/profile_selector.cpp
@@ -20,10 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-
-#include "components/sout/profile_selector.hpp"
-#include "components/sout/profiles.hpp"
-#include "dialogs/sout.hpp"
+#include "dialogs/sout/profile_selector.hpp"
+#include "dialogs/sout/profiles.hpp"
+#include "dialogs/sout/sout.hpp"
#include "util/soutchain.hpp"
#include <QHBoxLayout>
diff --git a/modules/gui/qt/components/sout/profile_selector.hpp b/modules/gui/qt/dialogs/sout/profile_selector.hpp
similarity index 98%
rename from modules/gui/qt/components/sout/profile_selector.hpp
rename to modules/gui/qt/dialogs/sout/profile_selector.hpp
index 1a3322511b9de86bcccdf2fa5cb1188d7dfe3aa8..d9953656b9685097a5c1109107c2438530208a78 100644
--- a/modules/gui/qt/components/sout/profile_selector.hpp
+++ b/modules/gui/qt/dialogs/sout/profile_selector.hpp
@@ -31,7 +31,7 @@
#include "util/qvlcframe.hpp"
#include "util/soutchain.hpp"
-#include "ui_profiles.h"
+#include "dialogs/sout/ui_profiles.h"
class QComboBox;
diff --git a/modules/gui/qt/components/sout/profiles.hpp b/modules/gui/qt/dialogs/sout/profiles.hpp
similarity index 100%
rename from modules/gui/qt/components/sout/profiles.hpp
rename to modules/gui/qt/dialogs/sout/profiles.hpp
diff --git a/modules/gui/qt/ui/profiles.ui b/modules/gui/qt/dialogs/sout/profiles.ui
similarity index 100%
rename from modules/gui/qt/ui/profiles.ui
rename to modules/gui/qt/dialogs/sout/profiles.ui
diff --git a/modules/gui/qt/dialogs/sout.cpp b/modules/gui/qt/dialogs/sout/sout.cpp
similarity index 98%
rename from modules/gui/qt/dialogs/sout.cpp
rename to modules/gui/qt/dialogs/sout/sout.cpp
index ac0980517871e0b494aaaaac632965681afadc0b..1b00279efe6489d77557d8a8aadeaa2ec75c2a98 100644
--- a/modules/gui/qt/dialogs/sout.cpp
+++ b/modules/gui/qt/dialogs/sout/sout.cpp
@@ -26,9 +26,9 @@
# include "config.h"
#endif
-#include "dialogs/sout.hpp"
+#include "dialogs/sout/sout.hpp"
#include "util/qt_dirs.hpp"
-#include "components/sout/sout_widgets.hpp"
+#include "dialogs/sout/sout_widgets.hpp"
#include <QString>
#include <QFileDialog>
@@ -235,4 +235,3 @@ void SoutDialog::updateChain()
ui.mrlEdit->setPlainText( chain );
}
-
diff --git a/modules/gui/qt/dialogs/sout.hpp b/modules/gui/qt/dialogs/sout/sout.hpp
similarity index 98%
rename from modules/gui/qt/dialogs/sout.hpp
rename to modules/gui/qt/dialogs/sout/sout.hpp
index b0c38c2e25efe0a07079115bb84662ecb950ffcb..128ce10f29cfdbf84ea1b9aea551362348097a6d 100644
--- a/modules/gui/qt/dialogs/sout.hpp
+++ b/modules/gui/qt/dialogs/sout/sout.hpp
@@ -29,7 +29,7 @@
#include <vlc_common.h> /* Gettext functions */
-#include "ui_sout.h"
+#include "dialogs/sout/ui_sout.h"
#include "util/qvlcframe.hpp"
#include "util/soutchain.hpp"
diff --git a/modules/gui/qt/ui/sout.ui b/modules/gui/qt/dialogs/sout/sout.ui
similarity index 98%
rename from modules/gui/qt/ui/sout.ui
rename to modules/gui/qt/dialogs/sout/sout.ui
index 4adaf37caeed6cc02be6a1ae4e7dbb31298e63a8..885eb47342b093b2122e2a0455df94e670c02741 100644
--- a/modules/gui/qt/ui/sout.ui
+++ b/modules/gui/qt/dialogs/sout/sout.ui
@@ -194,13 +194,13 @@
<customwidget>
<class>VLCProfileSelector</class>
<extends>QWidget</extends>
- <header>components/sout/profile_selector.hpp</header>
+ <header>dialogs/sout/profile_selector.hpp</header>
<container>1</container>
</customwidget>
<customwidget>
<class>SoutInputBox</class>
<extends>QGroupBox</extends>
- <header>components/sout/sout_widgets.hpp</header>
+ <header>dialogs/sout/sout_widgets.hpp</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/modules/gui/qt/components/sout/sout_widgets.cpp b/modules/gui/qt/dialogs/sout/sout_widgets.cpp
similarity index 99%
rename from modules/gui/qt/components/sout/sout_widgets.cpp
rename to modules/gui/qt/dialogs/sout/sout_widgets.cpp
index 50e096c81fbf2f35d1ad3ee627bdd45291941b76..b59d49c4ac89123926101792ec12950bd8035189 100644
--- a/modules/gui/qt/components/sout/sout_widgets.cpp
+++ b/modules/gui/qt/dialogs/sout/sout_widgets.cpp
@@ -23,8 +23,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "components/sout/sout_widgets.hpp"
-#include "dialogs/sout.hpp"
+#include "dialogs/sout/sout_widgets.hpp"
+#include "dialogs/sout/sout.hpp"
#include "util/soutchain.hpp"
#include "util/qt_dirs.hpp"
#include <vlc_intf_strings.h>
@@ -584,4 +584,3 @@ QString ICEDestBox::getMRL( const QString& )
m.end();
return m.to_string();
}
-
diff --git a/modules/gui/qt/components/sout/sout_widgets.hpp b/modules/gui/qt/dialogs/sout/sout_widgets.hpp
similarity index 100%
rename from modules/gui/qt/components/sout/sout_widgets.hpp
rename to modules/gui/qt/dialogs/sout/sout_widgets.hpp
diff --git a/modules/gui/qt/dialogs/toolbareditor.hpp b/modules/gui/qt/dialogs/toolbareditor.hpp
index 58e38449c1f5e0c3f01351af7a916a134613bc8c..ae81e6185193bd1605928c8f782c534529afdab1 100644
--- a/modules/gui/qt/dialogs/toolbareditor.hpp
+++ b/modules/gui/qt/dialogs/toolbareditor.hpp
@@ -21,7 +21,7 @@
#include "util/qvlcframe.hpp" /* QVLCDialog */
#include "components/qml_main_context.hpp"
-#include "components/sout/profile_selector.hpp"
+#include "dialogs/sout/profile_selector.hpp"
#include <QAbstractListModel>
#include <QVector>
diff --git a/modules/gui/qt/dialogs/vlm.cpp b/modules/gui/qt/dialogs/vlm.cpp
index bd9742782f87322a32362e9d4c639fe5ad169dfb..d9e1ab6262d5a85320782b2800b39ad28f75bbae 100644
--- a/modules/gui/qt/dialogs/vlm.cpp
+++ b/modules/gui/qt/dialogs/vlm.cpp
@@ -29,7 +29,7 @@
#ifdef ENABLE_VLM
#include "dialogs/vlm.hpp"
#include "dialogs/open.hpp"
-#include "dialogs/sout.hpp"
+#include "dialogs/sout/sout.hpp"
#include "util/qt_dirs.hpp"
#include <QString>
diff --git a/modules/gui/qt/dialogs_provider.cpp b/modules/gui/qt/dialogs_provider.cpp
index 43006e85830f7f76a821173419e5f8a4d5bf4184..a3f9a9262ef30337bfdbefcf8902edeb860d066c 100644
--- a/modules/gui/qt/dialogs_provider.cpp
+++ b/modules/gui/qt/dialogs_provider.cpp
@@ -44,8 +44,8 @@
#include "dialogs/messages.hpp"
#include "dialogs/extended.hpp"
#include "dialogs/vlm.hpp"
-#include "dialogs/sout.hpp"
-#include "dialogs/convert.hpp"
+#include "dialogs/sout/sout.hpp"
+#include "dialogs/sout/convert.hpp"
#include "dialogs/open.hpp"
#include "dialogs/openurl.hpp"
#include "dialogs/help/help.hpp"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a8e55715a790dd58bfe099e3862b668897aed473..e6430e8dde041507eebbd33fd2aa3701cb2bf5b9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -706,15 +706,15 @@ modules/gui/qt/dialogs/preferences/preferences_widgets.cpp
modules/gui/qt/dialogs/preferences/preferences_widgets.hpp
modules/gui/qt/dialogs/preferences/simple_preferences.cpp
modules/gui/qt/dialogs/preferences/simple_preferences.hpp
-modules/gui/qt/components/sout/profile_selector.cpp
-modules/gui/qt/components/sout/profile_selector.hpp
-modules/gui/qt/components/sout/profiles.hpp
-modules/gui/qt/components/sout/sout_widgets.cpp
-modules/gui/qt/components/sout/sout_widgets.hpp
+modules/gui/qt/dialogs/sout/profile_selector.cpp
+modules/gui/qt/dialogs/sout/profile_selector.hpp
+modules/gui/qt/dialogs/sout/profiles.hpp
+modules/gui/qt/dialogs/sout/sout_widgets.cpp
+modules/gui/qt/dialogs/sout/sout_widgets.hpp
modules/gui/qt/dialogs/bookmarks.cpp
modules/gui/qt/dialogs/bookmarks.hpp
-modules/gui/qt/dialogs/convert.cpp
-modules/gui/qt/dialogs/convert.hpp
+modules/gui/qt/dialogs/sout/convert.cpp
+modules/gui/qt/dialogs/sout/convert.hpp
modules/gui/qt/dialogs/epg/epg.cpp
modules/gui/qt/dialogs/epg/epg.hpp
modules/gui/qt/dialogs/errors.cpp
@@ -745,8 +745,8 @@ modules/gui/qt/dialogs/podcast_configuration.cpp
modules/gui/qt/dialogs/podcast_configuration.hpp
modules/gui/qt/dialogs/preferences/preferences.cpp
modules/gui/qt/dialogs/preferences/preferences.hpp
-modules/gui/qt/dialogs/sout.cpp
-modules/gui/qt/dialogs/sout.hpp
+modules/gui/qt/dialogs/sout/sout.cpp
+modules/gui/qt/dialogs/sout/sout.hpp
modules/gui/qt/dialogs/toolbar.cpp
modules/gui/qt/dialogs/toolbar.hpp
modules/gui/qt/dialogs/vlm.cpp
@@ -1284,8 +1284,8 @@ share/lua/http/mobile_view.html
#modules/gui/qt/ui/ui_open_file.h
#modules/gui/qt/ui/ui_open_net.h
#modules/gui/qt/ui/ui_podcast_configuration.h
-#modules/gui/qt/ui/ui_profiles.h
-#modules/gui/qt/ui/ui_sout.h
+#modules/gui/qt/dialogs/sout/ui_profiles.h
+#modules/gui/qt/dialogs/sout/ui_sout.h
#modules/gui/qt/dialogs/preferences/ui_sprefs_audio.h
#modules/gui/qt/dialogs/preferences/ui_sprefs_input.h
#modules/gui/qt/dialogs/preferences/ui_sprefs_interface.h