Move files to media/audio and media/clip.

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"

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"

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"

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"

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"

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"

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"

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 {

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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 <AL/al.h>
 #include <AL/alc.h>

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"
 

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 <libavcodec/avcodec.h>

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)

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 {

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;

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 <AL/al.h>

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"
 

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;

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 {

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 {

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 {

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 {

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<internal::FFMpegReaderImplementation>(_location.get(), &_data, _audioMsgId);
-//		_implementation = new QtGifReaderImplementation(_location, &_data);
 
 		auto implementationMode = [this]() {
 			using ImplementationMode = internal::ReaderImplementation::Mode;

Telegram/SourceFiles/media/media_clip_qtgif.cpp

@@ -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<QImageReader>(_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

Telegram/SourceFiles/media/media_clip_qtgif.h

@@ -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<QImageReader> _reader;
-	int _framesLeft = 0;
-	TimeMs _frameRealTime = 0;
-	TimeMs _frameTime = 0;
-	int _frameDelay = 0;
-	QImage _frame;
-
-};
-
-} // namespace internal
-} // namespace Clip
-} // namespace Media

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"

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"

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"

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"

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"

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"

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 {

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 {

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"

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"

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"

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 <mmdeviceapi.h>
 #include <audioclient.h>

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 {
 

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 {
 

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"

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 {

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"

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"

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