From 032694ad9ec798889759c5b939c49f74b0767de4 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 13 Feb 2019 15:36:59 +0300 Subject: [PATCH] Move files to media/audio and media/clip. --- Telegram/SourceFiles/app.cpp | 2 +- .../SourceFiles/boxes/edit_caption_box.cpp | 2 +- Telegram/SourceFiles/boxes/send_files_box.cpp | 2 +- Telegram/SourceFiles/calls/calls_call.cpp | 2 +- Telegram/SourceFiles/calls/calls_instance.cpp | 2 +- Telegram/SourceFiles/core/application.cpp | 4 +- Telegram/SourceFiles/data/data_document.cpp | 2 +- .../data/data_document_good_thumbnail.cpp | 2 +- Telegram/SourceFiles/facades.cpp | 2 +- Telegram/SourceFiles/history/history_item.cpp | 4 +- .../history/history_item_components.cpp | 2 +- .../SourceFiles/history/history_widget.cpp | 4 +- .../history/media/history_media_document.cpp | 2 +- .../history/media/history_media_gif.cpp | 4 +- .../inline_bot_layout_internal.cpp | 4 +- Telegram/SourceFiles/layout.cpp | 2 +- Telegram/SourceFiles/mainwidget.cpp | 2 +- .../media/{ => audio}/media_audio.cpp | 10 +- .../media/{ => audio}/media_audio.h | 0 .../media/{ => audio}/media_audio_capture.cpp | 4 +- .../media/{ => audio}/media_audio_capture.h | 0 .../{ => audio}/media_audio_ffmpeg_loader.cpp | 2 +- .../{ => audio}/media_audio_ffmpeg_loader.h | 4 +- .../media/{ => audio}/media_audio_loader.cpp | 2 +- .../media/{ => audio}/media_audio_loader.h | 0 .../media/{ => audio}/media_audio_loaders.cpp | 8 +- .../media/{ => audio}/media_audio_loaders.h | 5 +- .../media/{ => audio}/media_audio_track.cpp | 6 +- .../media/{ => audio}/media_audio_track.h | 0 .../{ => audio}/media_child_ffmpeg_loader.cpp | 2 +- .../{ => audio}/media_child_ffmpeg_loader.h | 2 +- .../{ => clip}/media_clip_check_streaming.cpp | 2 +- .../{ => clip}/media_clip_check_streaming.h | 0 .../media/{ => clip}/media_clip_ffmpeg.cpp | 6 +- .../media/{ => clip}/media_clip_ffmpeg.h | 4 +- .../{ => clip}/media_clip_implementation.cpp | 2 +- .../{ => clip}/media_clip_implementation.h | 0 .../media/{ => clip}/media_clip_reader.cpp | 8 +- .../media/{ => clip}/media_clip_reader.h | 0 .../SourceFiles/media/media_clip_qtgif.cpp | 122 ------------------ Telegram/SourceFiles/media/media_clip_qtgif.h | 54 -------- .../media/player/media_player_cover.cpp | 2 +- .../media/player/media_player_float.cpp | 4 +- .../media/player/media_player_instance.cpp | 4 +- .../player/media_player_round_controller.cpp | 4 +- .../player/media_player_volume_controller.cpp | 2 +- .../media/player/media_player_widget.cpp | 2 +- .../media/view/media_clip_controller.cpp | 4 +- .../media/view/media_clip_playback.cpp | 2 +- .../media/view/media_view_overlay_widget.cpp | 4 +- .../SourceFiles/overview/overview_layout.cpp | 2 +- .../platform/mac/specific_mac_p.mm | 2 +- .../SourceFiles/platform/win/audio_win.cpp | 2 +- .../SourceFiles/settings/settings_codes.cpp | 2 +- .../SourceFiles/storage/localimageloader.cpp | 10 +- Telegram/SourceFiles/storage/localstorage.cpp | 2 +- Telegram/SourceFiles/ui/animation.cpp | 2 +- Telegram/SourceFiles/window/layer_widget.cpp | 2 +- .../window/notifications_manager.cpp | 4 +- Telegram/gyp/telegram_sources.txt | 46 ++++--- 60 files changed, 104 insertions(+), 285 deletions(-) rename Telegram/SourceFiles/media/{ => audio}/media_audio.cpp (99%) rename Telegram/SourceFiles/media/{ => audio}/media_audio.h (100%) rename Telegram/SourceFiles/media/{ => audio}/media_audio_capture.cpp (99%) rename Telegram/SourceFiles/media/{ => audio}/media_audio_capture.h (100%) rename Telegram/SourceFiles/media/{ => audio}/media_audio_ffmpeg_loader.cpp (99%) rename Telegram/SourceFiles/media/{ => audio}/media_audio_ffmpeg_loader.h (97%) rename Telegram/SourceFiles/media/{ => audio}/media_audio_loader.cpp (97%) rename Telegram/SourceFiles/media/{ => audio}/media_audio_loader.h (100%) rename Telegram/SourceFiles/media/{ => audio}/media_audio_loaders.cpp (98%) rename Telegram/SourceFiles/media/{ => audio}/media_audio_loaders.h (93%) rename Telegram/SourceFiles/media/{ => audio}/media_audio_track.cpp (98%) rename Telegram/SourceFiles/media/{ => audio}/media_audio_track.h (100%) rename Telegram/SourceFiles/media/{ => audio}/media_child_ffmpeg_loader.cpp (98%) rename Telegram/SourceFiles/media/{ => audio}/media_child_ffmpeg_loader.h (97%) rename Telegram/SourceFiles/media/{ => clip}/media_clip_check_streaming.cpp (97%) rename Telegram/SourceFiles/media/{ => clip}/media_clip_check_streaming.h (100%) rename Telegram/SourceFiles/media/{ => clip}/media_clip_ffmpeg.cpp (99%) rename Telegram/SourceFiles/media/{ => clip}/media_clip_ffmpeg.h (96%) rename Telegram/SourceFiles/media/{ => clip}/media_clip_implementation.cpp (93%) rename Telegram/SourceFiles/media/{ => clip}/media_clip_implementation.h (100%) rename Telegram/SourceFiles/media/{ => clip}/media_clip_reader.cpp (99%) rename Telegram/SourceFiles/media/{ => clip}/media_clip_reader.h (100%) delete mode 100644 Telegram/SourceFiles/media/media_clip_qtgif.cpp delete mode 100644 Telegram/SourceFiles/media/media_clip_qtgif.h diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp index 073e46fc10..2983ab9f7a 100644 --- a/Telegram/SourceFiles/app.cpp +++ b/Telegram/SourceFiles/app.cpp @@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/history_location_manager.h" #include "history/history_item_components.h" #include "history/view/history_view_service_message.h" -#include "media/media_audio.h" +#include "media/audio/media_audio.h" #include "ui/image/image.h" #include "inline_bots/inline_bot_layout_item.h" #include "core/crash_reports.h" diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp index 6f025648e6..c301910ee1 100644 --- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp @@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/image/image.h" #include "ui/text_options.h" #include "ui/special_buttons.h" -#include "media/media_clip_reader.h" +#include "media/clip/media_clip_reader.h" #include "history/history.h" #include "history/history_item.h" #include "data/data_media_types.h" diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp index 72712713d7..c0bc1b2326 100644 --- a/Telegram/SourceFiles/boxes/send_files_box.cpp +++ b/Telegram/SourceFiles/boxes/send_files_box.cpp @@ -27,7 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/text_options.h" #include "ui/special_buttons.h" #include "data/data_document.h" -#include "media/media_clip_reader.h" +#include "media/clip/media_clip_reader.h" #include "window/window_controller.h" #include "layout.h" #include "styles/style_history.h" diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp index 968c885f25..99ec5b809c 100644 --- a/Telegram/SourceFiles/calls/calls_call.cpp +++ b/Telegram/SourceFiles/calls/calls_call.cpp @@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "calls/calls_instance.h" #include "base/openssl_help.h" #include "mtproto/connection.h" -#include "media/media_audio_track.h" +#include "media/audio/media_audio_track.h" #include "calls/calls_panel.h" #include "data/data_user.h" #include "data/data_session.h" diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp index e1f6525c8d..966637848a 100644 --- a/Telegram/SourceFiles/calls/calls_instance.cpp +++ b/Telegram/SourceFiles/calls/calls_instance.cpp @@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "calls/calls_panel.h" #include "data/data_user.h" #include "data/data_session.h" -#include "media/media_audio_track.h" +#include "media/audio/media_audio_track.h" #include "platform/platform_specific.h" #include "mainwidget.h" #include "boxes/rate_call_box.h" diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp index 60fb19926c..4adc8158a0 100644 --- a/Telegram/SourceFiles/core/application.cpp +++ b/Telegram/SourceFiles/core/application.cpp @@ -35,9 +35,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "media/view/media_view_overlay_widget.h" #include "mtproto/dc_options.h" #include "mtproto/mtp_instance.h" +#include "media/audio/media_audio.h" +#include "media/audio/media_audio_track.h" #include "media/player/media_player_instance.h" -#include "media/media_audio.h" -#include "media/media_audio_track.h" #include "window/notifications_manager.h" #include "window/themes/window_theme.h" #include "window/window_lock_widgets.h" diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp index f27402f26d..8607885617 100644 --- a/Telegram/SourceFiles/data/data_document.cpp +++ b/Telegram/SourceFiles/data/data_document.cpp @@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/file_utilities.h" #include "core/media_active_cache.h" #include "core/mime_type.h" -#include "media/media_audio.h" +#include "media/audio/media_audio.h" #include "storage/localstorage.h" #include "platform/platform_specific.h" #include "history/history.h" diff --git a/Telegram/SourceFiles/data/data_document_good_thumbnail.cpp b/Telegram/SourceFiles/data/data_document_good_thumbnail.cpp index e41b09cdc4..efab7f27b8 100644 --- a/Telegram/SourceFiles/data/data_document_good_thumbnail.cpp +++ b/Telegram/SourceFiles/data/data_document_good_thumbnail.cpp @@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_session.h" #include "data/data_document.h" #include "data/data_file_origin.h" -#include "media/media_clip_reader.h" +#include "media/clip/media_clip_reader.h" #include "auth_session.h" namespace Data { diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp index cc940360d5..ea46b6461b 100644 --- a/Telegram/SourceFiles/facades.cpp +++ b/Telegram/SourceFiles/facades.cpp @@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "info/info_memento.h" #include "core/click_handler_types.h" #include "core/application.h" -#include "media/media_clip_reader.h" +#include "media/clip/media_clip_reader.h" #include "window/window_controller.h" #include "history/history_item_components.h" #include "data/data_peer.h" diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp index 60f1b4d968..f4c9d33d28 100644 --- a/Telegram/SourceFiles/history/history_item.cpp +++ b/Telegram/SourceFiles/history/history_item.cpp @@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/history_service.h" #include "history/history_message.h" #include "history/history.h" -#include "media/media_clip_reader.h" +#include "media/clip/media_clip_reader.h" #include "ui/effects/ripple_animation.h" #include "ui/text_options.h" #include "storage/file_upload.h" @@ -26,7 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "storage/storage_feed_messages.h" #include "auth_session.h" #include "apiwrap.h" -#include "media/media_audio.h" +#include "media/audio/media_audio.h" #include "core/application.h" #include "mainwindow.h" #include "window/window_controller.h" diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp index 74fbdcaa75..7a4702729d 100644 --- a/Telegram/SourceFiles/history/history_item_components.cpp +++ b/Telegram/SourceFiles/history/history_item_components.cpp @@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/history_message.h" #include "history/view/history_view_service_message.h" #include "history/media/history_media_document.h" -#include "media/media_audio.h" +#include "media/audio/media_audio.h" #include "media/player/media_player_instance.h" #include "data/data_media_types.h" #include "data/data_session.h" diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index 5f3b9cccd5..1160f89122 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -58,8 +58,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "storage/localstorage.h" #include "storage/file_upload.h" #include "storage/storage_media_prepare.h" -#include "media/media_audio.h" -#include "media/media_audio_capture.h" +#include "media/audio/media_audio.h" +#include "media/audio/media_audio_capture.h" #include "media/player/media_player_instance.h" #include "core/application.h" #include "apiwrap.h" diff --git a/Telegram/SourceFiles/history/media/history_media_document.cpp b/Telegram/SourceFiles/history/media/history_media_document.cpp index 0f71859b55..45501d037d 100644 --- a/Telegram/SourceFiles/history/media/history_media_document.cpp +++ b/Telegram/SourceFiles/history/media/history_media_document.cpp @@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "lang/lang_keys.h" #include "layout.h" #include "storage/localstorage.h" -#include "media/media_audio.h" +#include "media/audio/media_audio.h" #include "media/player/media_player_instance.h" #include "history/history_item_components.h" #include "history/history.h" diff --git a/Telegram/SourceFiles/history/media/history_media_gif.cpp b/Telegram/SourceFiles/history/media/history_media_gif.cpp index 3515e1ce1b..fbb58893ba 100644 --- a/Telegram/SourceFiles/history/media/history_media_gif.cpp +++ b/Telegram/SourceFiles/history/media/history_media_gif.cpp @@ -10,8 +10,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "lang/lang_keys.h" #include "layout.h" #include "mainwindow.h" -#include "media/media_audio.h" -#include "media/media_clip_reader.h" +#include "media/audio/media_audio.h" +#include "media/clip/media_clip_reader.h" #include "media/player/media_player_round_controller.h" #include "media/view/media_clip_playback.h" #include "boxes/confirm_box.h" diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp index 718318807c..94b7920cfb 100644 --- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp @@ -15,8 +15,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_chat_helpers.h" #include "styles/style_widgets.h" #include "inline_bots/inline_bot_result.h" -#include "media/media_audio.h" -#include "media/media_clip_reader.h" +#include "media/audio/media_audio.h" +#include "media/clip/media_clip_reader.h" #include "media/player/media_player_instance.h" #include "history/history_location_manager.h" #include "history/view/history_view_cursor_state.h" diff --git a/Telegram/SourceFiles/layout.cpp b/Telegram/SourceFiles/layout.cpp index ef9bafd7e8..4e065af95b 100644 --- a/Telegram/SourceFiles/layout.cpp +++ b/Telegram/SourceFiles/layout.cpp @@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/file_utilities.h" #include "boxes/add_contact_box.h" #include "boxes/confirm_box.h" -#include "media/media_audio.h" +#include "media/audio/media_audio.h" #include "storage/localstorage.h" #include "history/view/history_view_cursor_state.h" diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 63f6575b65..01b79d23fc 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -63,7 +63,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/download_path_box.h" #include "boxes/connection_box.h" #include "storage/localstorage.h" -#include "media/media_audio.h" +#include "media/audio/media_audio.h" #include "media/player/media_player_panel.h" #include "media/player/media_player_widget.h" #include "media/player/media_player_volume_controller.h" diff --git a/Telegram/SourceFiles/media/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp similarity index 99% rename from Telegram/SourceFiles/media/media_audio.cpp rename to Telegram/SourceFiles/media/audio/media_audio.cpp index b9843c296b..f8a2467035 100644 --- a/Telegram/SourceFiles/media/media_audio.cpp +++ b/Telegram/SourceFiles/media/audio/media_audio.cpp @@ -5,14 +5,14 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "media/media_audio.h" +#include "media/audio/media_audio.h" +#include "media/audio/media_audio_ffmpeg_loader.h" +#include "media/audio/media_child_ffmpeg_loader.h" +#include "media/audio/media_audio_loaders.h" +#include "media/audio/media_audio_track.h" #include "data/data_document.h" #include "data/data_file_origin.h" -#include "media/media_audio_ffmpeg_loader.h" -#include "media/media_child_ffmpeg_loader.h" -#include "media/media_audio_loaders.h" -#include "media/media_audio_track.h" #include "platform/platform_audio.h" #include "core/application.h" #include "facades.h" diff --git a/Telegram/SourceFiles/media/media_audio.h b/Telegram/SourceFiles/media/audio/media_audio.h similarity index 100% rename from Telegram/SourceFiles/media/media_audio.h rename to Telegram/SourceFiles/media/audio/media_audio.h diff --git a/Telegram/SourceFiles/media/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp similarity index 99% rename from Telegram/SourceFiles/media/media_audio_capture.cpp rename to Telegram/SourceFiles/media/audio/media_audio_capture.cpp index 2f8159d5c5..5f984c48de 100644 --- a/Telegram/SourceFiles/media/media_audio_capture.cpp +++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp @@ -5,9 +5,9 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "media/media_audio_capture.h" +#include "media/audio/media_audio_capture.h" -#include "media/media_audio_ffmpeg_loader.h" +#include "media/audio/media_audio_ffmpeg_loader.h" #include #include diff --git a/Telegram/SourceFiles/media/media_audio_capture.h b/Telegram/SourceFiles/media/audio/media_audio_capture.h similarity index 100% rename from Telegram/SourceFiles/media/media_audio_capture.h rename to Telegram/SourceFiles/media/audio/media_audio_capture.h diff --git a/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.cpp b/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.cpp similarity index 99% rename from Telegram/SourceFiles/media/media_audio_ffmpeg_loader.cpp rename to Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.cpp index 85b284b20b..bf6329f62f 100644 --- a/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.cpp +++ b/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.cpp @@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "media/media_audio_ffmpeg_loader.h" +#include "media/audio/media_audio_ffmpeg_loader.h" #include "base/bytes.h" diff --git a/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.h b/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.h similarity index 97% rename from Telegram/SourceFiles/media/media_audio_ffmpeg_loader.h rename to Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.h index 6986642e80..d784d8df1e 100644 --- a/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.h +++ b/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.h @@ -7,8 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include "media/media_audio.h" -#include "media/media_audio_loader.h" +#include "media/audio/media_audio.h" +#include "media/audio/media_audio_loader.h" extern "C" { #include diff --git a/Telegram/SourceFiles/media/media_audio_loader.cpp b/Telegram/SourceFiles/media/audio/media_audio_loader.cpp similarity index 97% rename from Telegram/SourceFiles/media/media_audio_loader.cpp rename to Telegram/SourceFiles/media/audio/media_audio_loader.cpp index c988901673..93a11bdb12 100644 --- a/Telegram/SourceFiles/media/media_audio_loader.cpp +++ b/Telegram/SourceFiles/media/audio/media_audio_loader.cpp @@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "media/media_audio_loader.h" +#include "media/audio/media_audio_loader.h" AudioPlayerLoader::AudioPlayerLoader(const FileLocation &file, const QByteArray &data, bytes::vector &&buffer) : _file(file) diff --git a/Telegram/SourceFiles/media/media_audio_loader.h b/Telegram/SourceFiles/media/audio/media_audio_loader.h similarity index 100% rename from Telegram/SourceFiles/media/media_audio_loader.h rename to Telegram/SourceFiles/media/audio/media_audio_loader.h diff --git a/Telegram/SourceFiles/media/media_audio_loaders.cpp b/Telegram/SourceFiles/media/audio/media_audio_loaders.cpp similarity index 98% rename from Telegram/SourceFiles/media/media_audio_loaders.cpp rename to Telegram/SourceFiles/media/audio/media_audio_loaders.cpp index f41850b1ca..d1ba9c1d52 100644 --- a/Telegram/SourceFiles/media/media_audio_loaders.cpp +++ b/Telegram/SourceFiles/media/audio/media_audio_loaders.cpp @@ -5,11 +5,11 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "media/media_audio_loaders.h" +#include "media/audio/media_audio_loaders.h" -#include "media/media_audio.h" -#include "media/media_audio_ffmpeg_loader.h" -#include "media/media_child_ffmpeg_loader.h" +#include "media/audio/media_audio.h" +#include "media/audio/media_audio_ffmpeg_loader.h" +#include "media/audio/media_child_ffmpeg_loader.h" namespace Media { namespace Player { diff --git a/Telegram/SourceFiles/media/media_audio_loaders.h b/Telegram/SourceFiles/media/audio/media_audio_loaders.h similarity index 93% rename from Telegram/SourceFiles/media/media_audio_loaders.h rename to Telegram/SourceFiles/media/audio/media_audio_loaders.h index e16eec7b4e..6480a80c34 100644 --- a/Telegram/SourceFiles/media/media_audio_loaders.h +++ b/Telegram/SourceFiles/media/audio/media_audio_loaders.h @@ -7,9 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include "media/media_child_ffmpeg_loader.h" -#include "media/media_audio.h" -#include "media/media_child_ffmpeg_loader.h" +#include "media/audio/media_audio.h" +#include "media/audio/media_child_ffmpeg_loader.h" class AudioPlayerLoader; class ChildFFMpegLoader; diff --git a/Telegram/SourceFiles/media/media_audio_track.cpp b/Telegram/SourceFiles/media/audio/media_audio_track.cpp similarity index 98% rename from Telegram/SourceFiles/media/media_audio_track.cpp rename to Telegram/SourceFiles/media/audio/media_audio_track.cpp index 19d9e4fabb..d71576b5ea 100644 --- a/Telegram/SourceFiles/media/media_audio_track.cpp +++ b/Telegram/SourceFiles/media/audio/media_audio_track.cpp @@ -5,10 +5,10 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "media/media_audio_track.h" +#include "media/audio/media_audio_track.h" -#include "media/media_audio_ffmpeg_loader.h" -#include "media/media_audio.h" +#include "media/audio/media_audio_ffmpeg_loader.h" +#include "media/audio/media_audio.h" #include "core/application.h" #include diff --git a/Telegram/SourceFiles/media/media_audio_track.h b/Telegram/SourceFiles/media/audio/media_audio_track.h similarity index 100% rename from Telegram/SourceFiles/media/media_audio_track.h rename to Telegram/SourceFiles/media/audio/media_audio_track.h diff --git a/Telegram/SourceFiles/media/media_child_ffmpeg_loader.cpp b/Telegram/SourceFiles/media/audio/media_child_ffmpeg_loader.cpp similarity index 98% rename from Telegram/SourceFiles/media/media_child_ffmpeg_loader.cpp rename to Telegram/SourceFiles/media/audio/media_child_ffmpeg_loader.cpp index 16c8241478..ec05b0de7c 100644 --- a/Telegram/SourceFiles/media/media_child_ffmpeg_loader.cpp +++ b/Telegram/SourceFiles/media/audio/media_child_ffmpeg_loader.cpp @@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "media/media_child_ffmpeg_loader.h" +#include "media/audio/media_child_ffmpeg_loader.h" #include "core/crash_reports.h" diff --git a/Telegram/SourceFiles/media/media_child_ffmpeg_loader.h b/Telegram/SourceFiles/media/audio/media_child_ffmpeg_loader.h similarity index 97% rename from Telegram/SourceFiles/media/media_child_ffmpeg_loader.h rename to Telegram/SourceFiles/media/audio/media_child_ffmpeg_loader.h index aeee4529dc..b708345d4f 100644 --- a/Telegram/SourceFiles/media/media_child_ffmpeg_loader.h +++ b/Telegram/SourceFiles/media/audio/media_child_ffmpeg_loader.h @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include "media/media_audio_ffmpeg_loader.h" +#include "media/audio/media_audio_ffmpeg_loader.h" struct VideoSoundData { AVCodecContext *context = nullptr; diff --git a/Telegram/SourceFiles/media/media_clip_check_streaming.cpp b/Telegram/SourceFiles/media/clip/media_clip_check_streaming.cpp similarity index 97% rename from Telegram/SourceFiles/media/media_clip_check_streaming.cpp rename to Telegram/SourceFiles/media/clip/media_clip_check_streaming.cpp index 91228639cb..fac1a594ce 100644 --- a/Telegram/SourceFiles/media/media_clip_check_streaming.cpp +++ b/Telegram/SourceFiles/media/clip/media_clip_check_streaming.cpp @@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "media/media_clip_check_streaming.h" +#include "media/clip/media_clip_check_streaming.h" namespace Media { diff --git a/Telegram/SourceFiles/media/media_clip_check_streaming.h b/Telegram/SourceFiles/media/clip/media_clip_check_streaming.h similarity index 100% rename from Telegram/SourceFiles/media/media_clip_check_streaming.h rename to Telegram/SourceFiles/media/clip/media_clip_check_streaming.h diff --git a/Telegram/SourceFiles/media/media_clip_ffmpeg.cpp b/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp similarity index 99% rename from Telegram/SourceFiles/media/media_clip_ffmpeg.cpp rename to Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp index 6789f568c5..cdd6b16047 100644 --- a/Telegram/SourceFiles/media/media_clip_ffmpeg.cpp +++ b/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp @@ -5,10 +5,10 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "media/media_clip_ffmpeg.h" +#include "media/clip/media_clip_ffmpeg.h" -#include "media/media_audio.h" -#include "media/media_child_ffmpeg_loader.h" +#include "media/audio/media_audio.h" +#include "media/audio/media_child_ffmpeg_loader.h" #include "storage/file_download.h" namespace Media { diff --git a/Telegram/SourceFiles/media/media_clip_ffmpeg.h b/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.h similarity index 96% rename from Telegram/SourceFiles/media/media_clip_ffmpeg.h rename to Telegram/SourceFiles/media/clip/media_clip_ffmpeg.h index eed0fa9b93..0381a934da 100644 --- a/Telegram/SourceFiles/media/media_clip_ffmpeg.h +++ b/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.h @@ -13,8 +13,8 @@ extern "C" { } // extern "C" -#include "media/media_clip_implementation.h" -#include "media/media_child_ffmpeg_loader.h" +#include "media/clip/media_clip_implementation.h" +#include "media/audio/media_child_ffmpeg_loader.h" namespace Media { namespace Clip { diff --git a/Telegram/SourceFiles/media/media_clip_implementation.cpp b/Telegram/SourceFiles/media/clip/media_clip_implementation.cpp similarity index 93% rename from Telegram/SourceFiles/media/media_clip_implementation.cpp rename to Telegram/SourceFiles/media/clip/media_clip_implementation.cpp index 7092f337b4..d8999bfed8 100644 --- a/Telegram/SourceFiles/media/media_clip_implementation.cpp +++ b/Telegram/SourceFiles/media/clip/media_clip_implementation.cpp @@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "media/media_clip_implementation.h" +#include "media/clip/media_clip_implementation.h" namespace Media { namespace Clip { diff --git a/Telegram/SourceFiles/media/media_clip_implementation.h b/Telegram/SourceFiles/media/clip/media_clip_implementation.h similarity index 100% rename from Telegram/SourceFiles/media/media_clip_implementation.h rename to Telegram/SourceFiles/media/clip/media_clip_implementation.h diff --git a/Telegram/SourceFiles/media/media_clip_reader.cpp b/Telegram/SourceFiles/media/clip/media_clip_reader.cpp similarity index 99% rename from Telegram/SourceFiles/media/media_clip_reader.cpp rename to Telegram/SourceFiles/media/clip/media_clip_reader.cpp index 0324827fa3..2f4b6134b1 100644 --- a/Telegram/SourceFiles/media/media_clip_reader.cpp +++ b/Telegram/SourceFiles/media/clip/media_clip_reader.cpp @@ -5,13 +5,12 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "media/media_clip_reader.h" +#include "media/clip/media_clip_reader.h" #include "data/data_document.h" #include "storage/file_download.h" -#include "media/media_clip_ffmpeg.h" -#include "media/media_clip_qtgif.h" -#include "media/media_clip_check_streaming.h" +#include "media/clip/media_clip_ffmpeg.h" +#include "media/clip/media_clip_check_streaming.h" #include "mainwidget.h" #include "mainwindow.h" @@ -485,7 +484,6 @@ public: } _implementation = std::make_unique(_location.get(), &_data, _audioMsgId); -// _implementation = new QtGifReaderImplementation(_location, &_data); auto implementationMode = [this]() { using ImplementationMode = internal::ReaderImplementation::Mode; diff --git a/Telegram/SourceFiles/media/media_clip_reader.h b/Telegram/SourceFiles/media/clip/media_clip_reader.h similarity index 100% rename from Telegram/SourceFiles/media/media_clip_reader.h rename to Telegram/SourceFiles/media/clip/media_clip_reader.h diff --git a/Telegram/SourceFiles/media/media_clip_qtgif.cpp b/Telegram/SourceFiles/media/media_clip_qtgif.cpp deleted file mode 100644 index c85abfffc8..0000000000 --- a/Telegram/SourceFiles/media/media_clip_qtgif.cpp +++ /dev/null @@ -1,122 +0,0 @@ -/* -This file is part of Telegram Desktop, -the official desktop application for the Telegram messaging service. - -For license and copyright information please follow this link: -https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL -*/ -#include "media/media_clip_qtgif.h" - -namespace Media { -namespace Clip { -namespace internal { - -QtGifReaderImplementation::QtGifReaderImplementation(FileLocation *location, QByteArray *data) : ReaderImplementation(location, data) { -} - -ReaderImplementation::ReadResult QtGifReaderImplementation::readFramesTill(TimeMs frameMs, TimeMs systemMs) { - if (!_frame.isNull() && _frameTime > frameMs) { - return ReadResult::Success; - } - auto readResult = readNextFrame(); - if (readResult != ReadResult::Success || _frameTime > frameMs) { - return readResult; - } - readResult = readNextFrame(); - if (_frameTime <= frameMs) { - _frameTime = frameMs + 5; // keep up - } - return readResult; -} - -TimeMs QtGifReaderImplementation::frameRealTime() const { - return _frameRealTime; -} - -TimeMs QtGifReaderImplementation::framePresentationTime() const { - return qMax(_frameTime, 0LL); -} - -ReaderImplementation::ReadResult QtGifReaderImplementation::readNextFrame() { - if (_reader) _frameDelay = _reader->nextImageDelay(); - if (_framesLeft < 1) { - if (_mode == Mode::Normal) { - return ReadResult::EndOfFile; - } else if (!jumpToStart()) { - return ReadResult::Error; - } - } - - _frame = QImage(); // QGifHandler always reads first to internal QImage and returns it - if (!_reader->read(&_frame) || _frame.isNull()) { - return ReadResult::Error; - } - --_framesLeft; - _frameTime += _frameDelay; - _frameRealTime += _frameDelay; - return ReadResult::Success; -} - -bool QtGifReaderImplementation::renderFrame(QImage &to, bool &hasAlpha, const QSize &size) { - Assert(!_frame.isNull()); - if (size.isEmpty() || size == _frame.size()) { - int32 w = _frame.width(), h = _frame.height(); - if (to.width() == w && to.height() == h && to.format() == _frame.format()) { - if (to.byteCount() != _frame.byteCount()) { - int bpl = qMin(to.bytesPerLine(), _frame.bytesPerLine()); - for (int i = 0; i < h; ++i) { - memcpy(to.scanLine(i), _frame.constScanLine(i), bpl); - } - } else { - memcpy(to.bits(), _frame.constBits(), _frame.byteCount()); - } - } else { - to = _frame.copy(); - } - } else { - to = _frame.scaled(size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); - } - hasAlpha = _frame.hasAlphaChannel(); - _frame = QImage(); - return true; -} - -TimeMs QtGifReaderImplementation::durationMs() const { - return 0; // not supported -} - -bool QtGifReaderImplementation::start(Mode mode, TimeMs &positionMs) { - if (mode == Mode::Inspecting) { - return false; - } - _mode = mode; - return jumpToStart(); -} - -QtGifReaderImplementation::~QtGifReaderImplementation() = default; - -bool QtGifReaderImplementation::jumpToStart() { - if (_reader && _reader->jumpToImage(0)) { - _framesLeft = _reader->imageCount(); - return true; - } - - _reader = nullptr; - initDevice(); - _reader = std::make_unique(_device); -#ifndef OS_MAC_OLD - _reader->setAutoTransform(true); -#endif // OS_MAC_OLD - if (!_reader->canRead() || !_reader->supportsAnimation()) { - return false; - } - _framesLeft = _reader->imageCount(); - if (_framesLeft < 1) { - return false; - } - return true; -} - -} // namespace internal -} // namespace Clip -} // namespace Media diff --git a/Telegram/SourceFiles/media/media_clip_qtgif.h b/Telegram/SourceFiles/media/media_clip_qtgif.h deleted file mode 100644 index 5a3064b748..0000000000 --- a/Telegram/SourceFiles/media/media_clip_qtgif.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -This file is part of Telegram Desktop, -the official desktop application for the Telegram messaging service. - -For license and copyright information please follow this link: -https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL -*/ -#pragma once - -#include "media/media_clip_implementation.h" - -namespace Media { -namespace Clip { -namespace internal { - -class QtGifReaderImplementation : public ReaderImplementation { -public: - - QtGifReaderImplementation(FileLocation *location, QByteArray *data); - - ReadResult readFramesTill(TimeMs frameMs, TimeMs systemMs) override; - - TimeMs frameRealTime() const override; - TimeMs framePresentationTime() const override; - - bool renderFrame(QImage &to, bool &hasAlpha, const QSize &size) override; - - TimeMs durationMs() const override; - bool hasAudio() const override { - return false; - } - - bool start(Mode mode, TimeMs &positionMs) override; - - ~QtGifReaderImplementation(); - -private: - bool jumpToStart(); - ReadResult readNextFrame(); - - Mode _mode = Mode::Normal; - - std::unique_ptr _reader; - int _framesLeft = 0; - TimeMs _frameRealTime = 0; - TimeMs _frameTime = 0; - int _frameDelay = 0; - QImage _frame; - -}; - -} // namespace internal -} // namespace Clip -} // namespace Media diff --git a/Telegram/SourceFiles/media/player/media_player_cover.cpp b/Telegram/SourceFiles/media/player/media_player_cover.cpp index 209e454453..e8e8fe93f6 100644 --- a/Telegram/SourceFiles/media/player/media_player_cover.cpp +++ b/Telegram/SourceFiles/media/player/media_player_cover.cpp @@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/labels.h" #include "ui/widgets/continuous_sliders.h" #include "ui/widgets/buttons.h" -#include "media/media_audio.h" +#include "media/audio/media_audio.h" #include "media/view/media_clip_playback.h" #include "media/player/media_player_button.h" #include "media/player/media_player_instance.h" diff --git a/Telegram/SourceFiles/media/player/media_player_float.cpp b/Telegram/SourceFiles/media/player/media_player_float.cpp index d232909c2a..9c9935259a 100644 --- a/Telegram/SourceFiles/media/player/media_player_float.cpp +++ b/Telegram/SourceFiles/media/player/media_player_float.cpp @@ -14,8 +14,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/media/history_media.h" #include "history/history_item.h" #include "history/view/history_view_element.h" -#include "media/media_clip_reader.h" -#include "media/media_audio.h" +#include "media/audio/media_audio.h" +#include "media/clip/media_clip_reader.h" #include "media/view/media_clip_playback.h" #include "media/player/media_player_instance.h" #include "media/player/media_player_round_controller.h" diff --git a/Telegram/SourceFiles/media/player/media_player_instance.cpp b/Telegram/SourceFiles/media/player/media_player_instance.cpp index 115ea42d67..bd212e5ef8 100644 --- a/Telegram/SourceFiles/media/player/media_player_instance.cpp +++ b/Telegram/SourceFiles/media/player/media_player_instance.cpp @@ -9,8 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_document.h" #include "data/data_session.h" -#include "media/media_audio.h" -#include "media/media_audio_capture.h" +#include "media/audio/media_audio.h" +#include "media/audio/media_audio_capture.h" #include "calls/calls_instance.h" #include "history/history.h" #include "history/history_item.h" diff --git a/Telegram/SourceFiles/media/player/media_player_round_controller.cpp b/Telegram/SourceFiles/media/player/media_player_round_controller.cpp index 4d4abdbaf7..14447732f3 100644 --- a/Telegram/SourceFiles/media/player/media_player_round_controller.cpp +++ b/Telegram/SourceFiles/media/player/media_player_round_controller.cpp @@ -7,8 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "media/player/media_player_round_controller.h" -#include "media/media_clip_reader.h" -#include "media/media_audio.h" +#include "media/audio/media_audio.h" +#include "media/clip/media_clip_reader.h" #include "media/player/media_player_instance.h" #include "media/view/media_clip_playback.h" #include "history/history_item.h" diff --git a/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp b/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp index d863af9d07..0e0a4bd5cd 100644 --- a/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp +++ b/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "media/player/media_player_volume_controller.h" -#include "media/media_audio.h" +#include "media/audio/media_audio.h" #include "ui/widgets/buttons.h" #include "ui/widgets/shadow.h" #include "ui/widgets/continuous_sliders.h" diff --git a/Telegram/SourceFiles/media/player/media_player_widget.cpp b/Telegram/SourceFiles/media/player/media_player_widget.cpp index df1ad01b87..209b024219 100644 --- a/Telegram/SourceFiles/media/player/media_player_widget.cpp +++ b/Telegram/SourceFiles/media/player/media_player_widget.cpp @@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/buttons.h" #include "ui/effects/ripple_animation.h" #include "lang/lang_keys.h" -#include "media/media_audio.h" +#include "media/audio/media_audio.h" #include "media/view/media_clip_playback.h" #include "media/player/media_player_button.h" #include "media/player/media_player_instance.h" diff --git a/Telegram/SourceFiles/media/view/media_clip_controller.cpp b/Telegram/SourceFiles/media/view/media_clip_controller.cpp index 3b8ae69de6..c38d11fb66 100644 --- a/Telegram/SourceFiles/media/view/media_clip_controller.cpp +++ b/Telegram/SourceFiles/media/view/media_clip_controller.cpp @@ -7,14 +7,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "media/view/media_clip_controller.h" +#include "media/audio/media_audio.h" #include "media/view/media_clip_playback.h" -#include "styles/style_mediaview.h" #include "ui/widgets/labels.h" #include "ui/widgets/continuous_sliders.h" #include "ui/effects/fade_animation.h" #include "ui/widgets/buttons.h" -#include "media/media_audio.h" #include "layout.h" +#include "styles/style_mediaview.h" namespace Media { namespace Clip { diff --git a/Telegram/SourceFiles/media/view/media_clip_playback.cpp b/Telegram/SourceFiles/media/view/media_clip_playback.cpp index 7fbcdb5570..82067c55e0 100644 --- a/Telegram/SourceFiles/media/view/media_clip_playback.cpp +++ b/Telegram/SourceFiles/media/view/media_clip_playback.cpp @@ -7,8 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "media/view/media_clip_playback.h" +#include "media/audio/media_audio.h" #include "styles/style_mediaview.h" -#include "media/media_audio.h" namespace Media { namespace Clip { diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp index 1e717760f2..66477619c4 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -17,10 +17,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/buttons.h" #include "ui/image/image.h" #include "ui/text_options.h" -#include "media/media_clip_reader.h" +#include "media/audio/media_audio.h" +#include "media/clip/media_clip_reader.h" #include "media/view/media_clip_controller.h" #include "media/view/media_view_group_thumbs.h" -#include "media/media_audio.h" #include "history/history.h" #include "history/history_message.h" #include "data/data_media_types.h" diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp index 14dbc5f41d..7caf9bb1e1 100644 --- a/Telegram/SourceFiles/overview/overview_layout.cpp +++ b/Telegram/SourceFiles/overview/overview_layout.cpp @@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "mainwidget.h" #include "storage/file_upload.h" #include "mainwindow.h" -#include "media/media_audio.h" +#include "media/audio/media_audio.h" #include "media/player/media_player_instance.h" #include "storage/localstorage.h" #include "history/history_item.h" diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm index 5e487fd9cc..455b5defdf 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm +++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm @@ -13,8 +13,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/sandbox.h" #include "core/crash_reports.h" #include "storage/localstorage.h" +#include "media/audio/media_audio.h" #include "media/player/media_player_instance.h" -#include "media/media_audio.h" #include "platform/mac/mac_utilities.h" #include "lang/lang_keys.h" #include "base/timer.h" diff --git a/Telegram/SourceFiles/platform/win/audio_win.cpp b/Telegram/SourceFiles/platform/win/audio_win.cpp index 125ff4f036..9207d54860 100644 --- a/Telegram/SourceFiles/platform/win/audio_win.cpp +++ b/Telegram/SourceFiles/platform/win/audio_win.cpp @@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "platform/win/audio_win.h" #include "platform/win/windows_dlls.h" -#include "media/media_audio.h" +#include "media/audio/media_audio.h" #include #include diff --git a/Telegram/SourceFiles/settings/settings_codes.cpp b/Telegram/SourceFiles/settings/settings_codes.cpp index ae2aa92696..49df1059f3 100644 --- a/Telegram/SourceFiles/settings/settings_codes.cpp +++ b/Telegram/SourceFiles/settings/settings_codes.cpp @@ -22,7 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/update_checker.h" #include "window/themes/window_theme.h" #include "window/themes/window_theme_editor.h" -#include "media/media_audio_track.h" +#include "media/audio/media_audio_track.h" namespace Settings { diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp index afb362fc8b..0ac7a1f740 100644 --- a/Telegram/SourceFiles/storage/localimageloader.cpp +++ b/Telegram/SourceFiles/storage/localimageloader.cpp @@ -10,16 +10,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_document.h" #include "core/file_utilities.h" #include "core/mime_type.h" -#include "media/media_audio.h" +#include "media/audio/media_audio.h" +#include "media/clip/media_clip_reader.h" #include "history/history_item.h" #include "boxes/send_files_box.h" -#include "media/media_clip_reader.h" -#include "mainwidget.h" -#include "mainwindow.h" -#include "lang/lang_keys.h" #include "boxes/confirm_box.h" +#include "lang/lang_keys.h" #include "storage/file_download.h" #include "storage/storage_media_prepare.h" +#include "mainwidget.h" +#include "mainwindow.h" namespace { diff --git a/Telegram/SourceFiles/storage/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp index cd95d848e7..44ff457e78 100644 --- a/Telegram/SourceFiles/storage/localstorage.cpp +++ b/Telegram/SourceFiles/storage/localstorage.cpp @@ -26,7 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "mainwindow.h" #include "lang/lang_keys.h" #include "lang/lang_cloud_manager.h" -#include "media/media_audio.h" +#include "media/audio/media_audio.h" #include "mtproto/dc_options.h" #include "core/application.h" #include "apiwrap.h" diff --git a/Telegram/SourceFiles/ui/animation.cpp b/Telegram/SourceFiles/ui/animation.cpp index 5f196fa750..ae16183ce1 100644 --- a/Telegram/SourceFiles/ui/animation.cpp +++ b/Telegram/SourceFiles/ui/animation.cpp @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "animation.h" -#include "media/media_clip_reader.h" +#include "media/clip/media_clip_reader.h" namespace Media { namespace Clip { diff --git a/Telegram/SourceFiles/window/layer_widget.cpp b/Telegram/SourceFiles/window/layer_widget.cpp index 9ee3cfa69d..02fac22987 100644 --- a/Telegram/SourceFiles/window/layer_widget.cpp +++ b/Telegram/SourceFiles/window/layer_widget.cpp @@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "lang/lang_keys.h" #include "data/data_photo.h" #include "data/data_document.h" -#include "media/media_clip_reader.h" +#include "media/clip/media_clip_reader.h" #include "boxes/abstract_box.h" #include "mainwindow.h" #include "mainwidget.h" diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp index da9cf910ce..4c5984e8c6 100644 --- a/Telegram/SourceFiles/window/notifications_manager.cpp +++ b/Telegram/SourceFiles/window/notifications_manager.cpp @@ -9,8 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "platform/platform_notifications_manager.h" #include "window/notifications_manager_default.h" -#include "media/media_audio_track.h" -#include "media/media_audio.h" +#include "media/audio/media_audio_track.h" +#include "media/audio/media_audio.h" #include "history/history.h" #include "history/history_item_components.h" #include "history/feed/history_feed_section.h" diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt index 57519d64fb..0198e10a70 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt @@ -416,6 +416,28 @@ <(src_loc)/lang/lang_tag.h <(src_loc)/lang/lang_translator.cpp <(src_loc)/lang/lang_translator.h +<(src_loc)/media/audio/media_audio.cpp +<(src_loc)/media/audio/media_audio.h +<(src_loc)/media/audio/media_audio_capture.cpp +<(src_loc)/media/audio/media_audio_capture.h +<(src_loc)/media/audio/media_audio_ffmpeg_loader.cpp +<(src_loc)/media/audio/media_audio_ffmpeg_loader.h +<(src_loc)/media/audio/media_audio_loader.cpp +<(src_loc)/media/audio/media_audio_loader.h +<(src_loc)/media/audio/media_audio_loaders.cpp +<(src_loc)/media/audio/media_audio_loaders.h +<(src_loc)/media/audio/media_audio_track.cpp +<(src_loc)/media/audio/media_audio_track.h +<(src_loc)/media/audio/media_child_ffmpeg_loader.cpp +<(src_loc)/media/audio/media_child_ffmpeg_loader.h +<(src_loc)/media/clip/media_clip_check_streaming.cpp +<(src_loc)/media/clip/media_clip_check_streaming.h +<(src_loc)/media/clip/media_clip_ffmpeg.cpp +<(src_loc)/media/clip/media_clip_ffmpeg.h +<(src_loc)/media/clip/media_clip_implementation.cpp +<(src_loc)/media/clip/media_clip_implementation.h +<(src_loc)/media/clip/media_clip_reader.cpp +<(src_loc)/media/clip/media_clip_reader.h <(src_loc)/media/player/media_player_button.cpp <(src_loc)/media/player/media_player_button.h <(src_loc)/media/player/media_player_cover.cpp @@ -440,30 +462,6 @@ <(src_loc)/media/view/media_view_group_thumbs.h <(src_loc)/media/view/media_view_overlay_widget.cpp <(src_loc)/media/view/media_view_overlay_widget.h -<(src_loc)/media/media_audio.cpp -<(src_loc)/media/media_audio.h -<(src_loc)/media/media_audio_capture.cpp -<(src_loc)/media/media_audio_capture.h -<(src_loc)/media/media_audio_ffmpeg_loader.cpp -<(src_loc)/media/media_audio_ffmpeg_loader.h -<(src_loc)/media/media_audio_loader.cpp -<(src_loc)/media/media_audio_loader.h -<(src_loc)/media/media_audio_loaders.cpp -<(src_loc)/media/media_audio_loaders.h -<(src_loc)/media/media_audio_track.cpp -<(src_loc)/media/media_audio_track.h -<(src_loc)/media/media_child_ffmpeg_loader.cpp -<(src_loc)/media/media_child_ffmpeg_loader.h -<(src_loc)/media/media_clip_check_streaming.cpp -<(src_loc)/media/media_clip_check_streaming.h -<(src_loc)/media/media_clip_ffmpeg.cpp -<(src_loc)/media/media_clip_ffmpeg.h -<(src_loc)/media/media_clip_implementation.cpp -<(src_loc)/media/media_clip_implementation.h -<(src_loc)/media/media_clip_qtgif.cpp -<(src_loc)/media/media_clip_qtgif.h -<(src_loc)/media/media_clip_reader.cpp -<(src_loc)/media/media_clip_reader.h <(src_loc)/mtproto/auth_key.cpp <(src_loc)/mtproto/auth_key.h <(src_loc)/mtproto/concurrent_sender.cpp