From 49f6431fca455f96b0f416be82915cd1a04dcd9d Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 19 Jul 2016 15:31:48 +0300 Subject: [PATCH] Video play in MediaView support done in Xcode/QtCreator projects. --- Telegram/Resources/all_files.style | 2 + .../SourceFiles/media/media_clip_ffmpeg.cpp | 3 +- .../media/view/media_clip_controller.cpp | 3 + .../media/view/media_clip_controller.h | 2 + Telegram/SourceFiles/mediaview.cpp | 14 +- Telegram/Telegram.pro | 51 +++++- Telegram/Telegram.xcodeproj/project.pbxproj | 162 +++++++++++++++++- Telegram/Telegram.xcodeproj/qt_preprocess.mak | 24 +++ 8 files changed, 250 insertions(+), 11 deletions(-) diff --git a/Telegram/Resources/all_files.style b/Telegram/Resources/all_files.style index b91a1ca4f4..f6a7ca6d6d 100644 --- a/Telegram/Resources/all_files.style +++ b/Telegram/Resources/all_files.style @@ -27,3 +27,5 @@ using "dialogs/dialogs.style"; using "history/history.style"; using "overview/overview.style"; using "profile/profile.style"; +using "media/view/mediaview.style"; +using "ui/widgets/widgets.style"; diff --git a/Telegram/SourceFiles/media/media_clip_ffmpeg.cpp b/Telegram/SourceFiles/media/media_clip_ffmpeg.cpp index 44bff89475..ab29e69753 100644 --- a/Telegram/SourceFiles/media/media_clip_ffmpeg.cpp +++ b/Telegram/SourceFiles/media/media_clip_ffmpeg.cpp @@ -468,7 +468,8 @@ void FFMpegReaderImplementation::finishPacket() { _packetQueue.head().size = _packetStartedSize; _packetQueue.head().data = _packetStartedData; _packetStarted = false; - av_packet_unref(&_packetQueue.dequeue()); + av_packet_unref(&_packetQueue.head()); + _packetQueue.dequeue(); } } diff --git a/Telegram/SourceFiles/media/view/media_clip_controller.cpp b/Telegram/SourceFiles/media/view/media_clip_controller.cpp index 133e933300..904b5bae12 100644 --- a/Telegram/SourceFiles/media/view/media_clip_controller.cpp +++ b/Telegram/SourceFiles/media/view/media_clip_controller.cpp @@ -210,5 +210,8 @@ void Controller::mousePressEvent(QMouseEvent *e) { e->accept(); // Don't pass event to the MediaView. } +Controller::~Controller() { +} + } // namespace Clip } // namespace Media diff --git a/Telegram/SourceFiles/media/view/media_clip_controller.h b/Telegram/SourceFiles/media/view/media_clip_controller.h index 25ebfd7200..4d27737faf 100644 --- a/Telegram/SourceFiles/media/view/media_clip_controller.h +++ b/Telegram/SourceFiles/media/view/media_clip_controller.h @@ -49,6 +49,8 @@ public: void grabStart() override; void grabFinish() override; + ~Controller(); + signals: void playPressed(); void pausePressed(); diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp index 98d4883d48..c43285bea7 100644 --- a/Telegram/SourceFiles/mediaview.cpp +++ b/Telegram/SourceFiles/mediaview.cpp @@ -1266,8 +1266,13 @@ void MediaView::initAnimation() { } else if (location.accessEnable()) { createClipReader(); location.accessDisable(); + } else if (_doc->dimensions.width() && _doc->dimensions.height()) { + int w = _doc->dimensions.width(); + int h = _doc->dimensions.height(); + _current = _doc->thumb->pixNoCache(w, h, ImagePixSmooth | ImagePixBlurred, w / cIntRetinaFactor(), h / cIntRetinaFactor()); + if (cRetina()) _current.setDevicePixelRatio(cRetinaFactor()); } else { - _current = _doc->thumb->pixNoCache(_doc->dimensions.width(), _doc->dimensions.height(), ImagePixSmooth | ImagePixBlurred, _doc->dimensions.width(), _doc->dimensions.height()); + _current = _doc->thumb->pixNoCache(_doc->thumb->width(), _doc->thumb->height(), ImagePixSmooth | ImagePixBlurred, st::mvDocIconSize, st::mvDocIconSize); } } @@ -1278,7 +1283,12 @@ void MediaView::createClipReader() { t_assert(_doc->isAnimation() || _doc->isVideo()); if (_doc->dimensions.width() && _doc->dimensions.height()) { - _current = _doc->thumb->pixNoCache(_doc->dimensions.width(), _doc->dimensions.height(), ImagePixSmooth | ImagePixBlurred, _doc->dimensions.width(), _doc->dimensions.height()); + int w = _doc->dimensions.width(); + int h = _doc->dimensions.height(); + _current = _doc->thumb->pixNoCache(w, h, ImagePixSmooth | ImagePixBlurred, w / cIntRetinaFactor(), h / cIntRetinaFactor()); + if (cRetina()) _current.setDevicePixelRatio(cRetinaFactor()); + } else { + _current = _doc->thumb->pixNoCache(_doc->thumb->width(), _doc->thumb->height(), ImagePixSmooth | ImagePixBlurred, st::mvDocIconSize, st::mvDocIconSize); } auto mode = _doc->isVideo() ? Media::Clip::Reader::Mode::Video : Media::Clip::Reader::Mode::Gif; _gif = std_::make_unique(_doc->location(), _doc->data(), func(this, &MediaView::clipCallback), mode); diff --git a/Telegram/Telegram.pro b/Telegram/Telegram.pro index 56057e9f5e..7e1fbb32fb 100644 --- a/Telegram/Telegram.pro +++ b/Telegram/Telegram.pro @@ -63,18 +63,23 @@ file_style_basic.target = GeneratedFiles/styles/style_basic.cpp file_style_basic.depends = style_target file_style_basic_types.target = GeneratedFiles/styles/style_basic_types.cpp file_style_basic_types.depends = style_target -file_style_overview.target = GeneratedFiles/styles/style_overview.cpp -file_style_overview.depends = style_target file_style_dialogs.target = GeneratedFiles/styles/style_dialogs.cpp file_style_dialogs.depends = style_target file_style_history.target = GeneratedFiles/styles/style_history.cpp file_style_history.depends = style_target +file_style_mediaview.target = GeneratedFiles/styles/style_mediaview.cpp +file_style_mediaview.depends = style_target +file_style_overview.target = GeneratedFiles/styles/style_overview.cpp +file_style_overview.depends = style_target file_style_profile.target = GeneratedFiles/styles/style_profile.cpp file_style_profile.depends = style_target +file_style_widgets.target = GeneratedFiles/styles/style_widgets.cpp +file_style_widgets.depends = style_target QMAKE_EXTRA_TARGETS += codegen_style codegen_numbers codegen_lang \ - file_style_basic file_style_basic_types file_style_overview \ - file_style_dialogs file_style_history file_style_profile + file_style_basic file_style_basic_types file_style_dialogs \ + file_style_history file_style_mediaview file_style_overview \ + file_style_profile file_style_widgets PRE_TARGETDEPS += style_target numbers_target lang_target @@ -97,8 +102,10 @@ SOURCES += \ ./GeneratedFiles/styles/style_basic_types.cpp \ ./GeneratedFiles/styles/style_dialogs.cpp \ ./GeneratedFiles/styles/style_history.cpp \ + ./GeneratedFiles/styles/style_mediaview.cpp \ ./GeneratedFiles/styles/style_overview.cpp \ ./GeneratedFiles/styles/style_profile.cpp \ + ./GeneratedFiles/styles/style_widgets.cpp \ ./SourceFiles/main.cpp \ ./SourceFiles/stdafx.cpp \ ./SourceFiles/apiwrap.cpp \ @@ -172,6 +179,18 @@ SOURCES += \ ./SourceFiles/intro/intropwdcheck.cpp \ ./SourceFiles/intro/introsignup.cpp \ ./SourceFiles/intro/introstart.cpp \ + ./SourceFiles/media/view/media_clip_controller.cpp \ + ./SourceFiles/media/view/media_clip_playback.cpp \ + ./SourceFiles/media/view/media_clip_volume_controller.cpp \ + ./SourceFiles/media/media_audio.cpp \ + ./SourceFiles/media/media_audio_ffmpeg_loader.cpp \ + ./SourceFiles/media/media_audio_loader.cpp \ + ./SourceFiles/media/media_audio_loaders.cpp \ + ./SourceFiles/media/media_child_ffmpeg_loader.cpp \ + ./SourceFiles/media/media_clip_ffmpeg.cpp \ + ./SourceFiles/media/media_clip_implementation.cpp \ + ./SourceFiles/media/media_clip_qtgif.cpp \ + ./SourceFiles/media/media_clip_reader.cpp \ ./SourceFiles/mtproto/facade.cpp \ ./SourceFiles/mtproto/auth_key.cpp \ ./SourceFiles/mtproto/connection.cpp \ @@ -208,9 +227,11 @@ SOURCES += \ ./SourceFiles/serialize/serialize_common.cpp \ ./SourceFiles/serialize/serialize_document.cpp \ ./SourceFiles/ui/buttons/history_down_button.cpp \ + ./SourceFiles/ui/buttons/icon_button.cpp \ ./SourceFiles/ui/buttons/left_outline_button.cpp \ ./SourceFiles/ui/buttons/peer_avatar_button.cpp \ ./SourceFiles/ui/buttons/round_button.cpp \ + ./SourceFiles/ui/effects/fade_animation.cpp \ ./SourceFiles/ui/style/style_core.cpp \ ./SourceFiles/ui/style/style_core_color.cpp \ ./SourceFiles/ui/style/style_core_font.cpp \ @@ -222,6 +243,7 @@ SOURCES += \ ./SourceFiles/ui/toast/toast.cpp \ ./SourceFiles/ui/toast/toast_manager.cpp \ ./SourceFiles/ui/toast/toast_widget.cpp \ + ./SourceFiles/ui/widgets/label_simple.cpp \ ./SourceFiles/ui/animation.cpp \ ./SourceFiles/ui/boxshadow.cpp \ ./SourceFiles/ui/button.cpp \ @@ -250,8 +272,10 @@ HEADERS += \ ./GeneratedFiles/styles/style_basic_types.h \ ./GeneratedFiles/styles/style_dialogs.h \ ./GeneratedFiles/styles/style_history.h \ + ./GeneratedFiles/styles/style_mediaview.h \ ./GeneratedFiles/styles/style_overview.h \ ./GeneratedFiles/styles/style_profile.h \ + ./GeneratedFiles/styles/style_widgets.h \ ./SourceFiles/stdafx.h \ ./SourceFiles/apiwrap.h \ ./SourceFiles/app.h \ @@ -330,6 +354,18 @@ HEADERS += \ ./SourceFiles/intro/intropwdcheck.h \ ./SourceFiles/intro/introsignup.h \ ./SourceFiles/intro/introstart.h \ + ./SourceFiles/media/view/media_clip_controller.h \ + ./SourceFiles/media/view/media_clip_playback.h \ + ./SourceFiles/media/view/media_clip_volume_controller.h \ + ./SourceFiles/media/media_audio.h \ + ./SourceFiles/media/media_audio_ffmpeg_loader.h \ + ./SourceFiles/media/media_audio_loader.h \ + ./SourceFiles/media/media_audio_loaders.h \ + ./SourceFiles/media/media_child_ffmpeg_loader.h \ + ./SourceFiles/media/media_clip_ffmpeg.h \ + ./SourceFiles/media/media_clip_implementation.h \ + ./SourceFiles/media/media_clip_qtgif.h \ + ./SourceFiles/media/media_clip_reader.h \ ./SourceFiles/mtproto/facade.h \ ./SourceFiles/mtproto/auth_key.h \ ./SourceFiles/mtproto/connection.h \ @@ -369,9 +405,11 @@ HEADERS += \ ./SourceFiles/serialize/serialize_common.h \ ./SourceFiles/serialize/serialize_document.h \ ./SourceFiles/ui/buttons/history_down_button.h \ + ./SourceFiles/ui/buttons/icon_button.h \ ./SourceFiles/ui/buttons/left_outline_button.h \ ./SourceFiles/ui/buttons/peer_avatar_button.h \ ./SourceFiles/ui/buttons/round_button.h \ + ./SourceFiles/ui/effects/fade_animation.h \ ./SourceFiles/ui/style/style_core.h \ ./SourceFiles/ui/style/style_core_color.h \ ./SourceFiles/ui/style/style_core_font.h \ @@ -383,6 +421,7 @@ HEADERS += \ ./SourceFiles/ui/toast/toast.h \ ./SourceFiles/ui/toast/toast_manager.h \ ./SourceFiles/ui/toast/toast_widget.h \ + ./SourceFiles/ui/widgets/label_simple.h \ ./SourceFiles/ui/animation.h \ ./SourceFiles/ui/boxshadow.h \ ./SourceFiles/ui/button.h \ @@ -534,5 +573,7 @@ OTHER_FILES += \ ./Resources/langs/lang_pt_BR.strings \ ./SourceFiles/dialogs/dialogs.style \ ./SourceFiles/history/history.style \ + ./SourceFiles/media/view/mediaview.style \ ./SourceFiles/overview/overview.style \ - ./SourceFiles/profile/profile.style + ./SourceFiles/profile/profile.style \ + ./SourceFiles/ui/widgets/widgets.style diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index a6bdde1c25..a571e4cdf7 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -181,6 +181,29 @@ 07DE92AA1AA4928200A18F6F /* moc_autolockbox.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07DE92A91AA4928200A18F6F /* moc_autolockbox.cpp */; }; 07DE92AD1AA4928B00A18F6F /* moc_passcodebox.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07DE92AB1AA4928B00A18F6F /* moc_passcodebox.cpp */; }; 07DE92AE1AA4928B00A18F6F /* moc_passcodewidget.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07DE92AC1AA4928B00A18F6F /* moc_passcodewidget.cpp */; }; + 07E102CC1D3E4B7F00BD33B1 /* media_audio_ffmpeg_loader.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102BC1D3E4B7F00BD33B1 /* media_audio_ffmpeg_loader.cpp */; }; + 07E102CD1D3E4B7F00BD33B1 /* media_audio_loader.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102BE1D3E4B7F00BD33B1 /* media_audio_loader.cpp */; }; + 07E102CE1D3E4B7F00BD33B1 /* media_audio_loaders.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102C01D3E4B7F00BD33B1 /* media_audio_loaders.cpp */; }; + 07E102CF1D3E4B7F00BD33B1 /* media_child_ffmpeg_loader.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102C21D3E4B7F00BD33B1 /* media_child_ffmpeg_loader.cpp */; }; + 07E102D01D3E4B7F00BD33B1 /* media_clip_ffmpeg.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102C41D3E4B7F00BD33B1 /* media_clip_ffmpeg.cpp */; }; + 07E102D11D3E4B7F00BD33B1 /* media_clip_implementation.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102C61D3E4B7F00BD33B1 /* media_clip_implementation.cpp */; }; + 07E102D21D3E4B7F00BD33B1 /* media_clip_qtgif.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102C81D3E4B7F00BD33B1 /* media_clip_qtgif.cpp */; }; + 07E102D31D3E4B7F00BD33B1 /* media_clip_reader.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102CA1D3E4B7F00BD33B1 /* media_clip_reader.cpp */; }; + 07E102D61D3E4BE800BD33B1 /* style_mediaview.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102D41D3E4BE800BD33B1 /* style_mediaview.cpp */; }; + 07E102D91D3E4CB800BD33B1 /* style_widgets.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102D71D3E4CB800BD33B1 /* style_widgets.cpp */; }; + 07E102DF1D3E4DE800BD33B1 /* moc_media_audio_loaders.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102DA1D3E4DE800BD33B1 /* moc_media_audio_loaders.cpp */; }; + 07E102E01D3E4DE800BD33B1 /* moc_media_clip_controller.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102DB1D3E4DE800BD33B1 /* moc_media_clip_controller.cpp */; }; + 07E102E11D3E4DE800BD33B1 /* moc_media_clip_playback.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102DC1D3E4DE800BD33B1 /* moc_media_clip_playback.cpp */; }; + 07E102E21D3E4DE800BD33B1 /* moc_media_clip_reader.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102DD1D3E4DE800BD33B1 /* moc_media_clip_reader.cpp */; }; + 07E102E31D3E4DE800BD33B1 /* moc_media_clip_volume_controller.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102DE1D3E4DE800BD33B1 /* moc_media_clip_volume_controller.cpp */; }; + 07E102EB1D3E4E3B00BD33B1 /* media_clip_controller.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102E41D3E4E3B00BD33B1 /* media_clip_controller.cpp */; }; + 07E102EC1D3E4E3B00BD33B1 /* media_clip_playback.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102E61D3E4E3B00BD33B1 /* media_clip_playback.cpp */; }; + 07E102ED1D3E4E3B00BD33B1 /* media_clip_volume_controller.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102E81D3E4E3B00BD33B1 /* media_clip_volume_controller.cpp */; }; + 07E102EE1D3E4E3B00BD33B1 /* mediaview.style in Resources */ = {isa = PBXBuildFile; fileRef = 07E102EA1D3E4E3B00BD33B1 /* mediaview.style */; }; + 07E102F31D3E4E7F00BD33B1 /* fade_animation.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102F11D3E4E7F00BD33B1 /* fade_animation.cpp */; }; + 07E102F71D3E4E8C00BD33B1 /* label_simple.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102F41D3E4E8C00BD33B1 /* label_simple.cpp */; }; + 07E102F81D3E4E8C00BD33B1 /* widgets.style in Resources */ = {isa = PBXBuildFile; fileRef = 07E102F61D3E4E8C00BD33B1 /* widgets.style */; }; + 07E102FB1D3E4E9900BD33B1 /* icon_button.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E102F91D3E4E9900BD33B1 /* icon_button.cpp */; }; 07E1B1911D12DB3F00722BC7 /* main_window_mac.mm in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E1B1901D12DB3F00722BC7 /* main_window_mac.mm */; }; 07E1B1931D12DED700722BC7 /* moc_main_window_mac.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E1B1921D12DED700722BC7 /* moc_main_window_mac.cpp */; }; 07E1B1961D12DFD200722BC7 /* main_window.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07E1B1941D12DFD200722BC7 /* main_window.cpp */; }; @@ -635,6 +658,45 @@ 07DE92A91AA4928200A18F6F /* moc_autolockbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_autolockbox.cpp; path = GeneratedFiles/Debug/moc_autolockbox.cpp; sourceTree = SOURCE_ROOT; }; 07DE92AB1AA4928B00A18F6F /* moc_passcodebox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_passcodebox.cpp; path = GeneratedFiles/Debug/moc_passcodebox.cpp; sourceTree = SOURCE_ROOT; }; 07DE92AC1AA4928B00A18F6F /* moc_passcodewidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_passcodewidget.cpp; path = GeneratedFiles/Debug/moc_passcodewidget.cpp; sourceTree = SOURCE_ROOT; }; + 07E102BC1D3E4B7F00BD33B1 /* media_audio_ffmpeg_loader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = media_audio_ffmpeg_loader.cpp; path = SourceFiles/media/media_audio_ffmpeg_loader.cpp; sourceTree = SOURCE_ROOT; }; + 07E102BD1D3E4B7F00BD33B1 /* media_audio_ffmpeg_loader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = media_audio_ffmpeg_loader.h; path = SourceFiles/media/media_audio_ffmpeg_loader.h; sourceTree = SOURCE_ROOT; }; + 07E102BE1D3E4B7F00BD33B1 /* media_audio_loader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = media_audio_loader.cpp; path = SourceFiles/media/media_audio_loader.cpp; sourceTree = SOURCE_ROOT; }; + 07E102BF1D3E4B7F00BD33B1 /* media_audio_loader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = media_audio_loader.h; path = SourceFiles/media/media_audio_loader.h; sourceTree = SOURCE_ROOT; }; + 07E102C01D3E4B7F00BD33B1 /* media_audio_loaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = media_audio_loaders.cpp; path = SourceFiles/media/media_audio_loaders.cpp; sourceTree = SOURCE_ROOT; }; + 07E102C11D3E4B7F00BD33B1 /* media_audio_loaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = media_audio_loaders.h; path = SourceFiles/media/media_audio_loaders.h; sourceTree = SOURCE_ROOT; }; + 07E102C21D3E4B7F00BD33B1 /* media_child_ffmpeg_loader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = media_child_ffmpeg_loader.cpp; path = SourceFiles/media/media_child_ffmpeg_loader.cpp; sourceTree = SOURCE_ROOT; }; + 07E102C31D3E4B7F00BD33B1 /* media_child_ffmpeg_loader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = media_child_ffmpeg_loader.h; path = SourceFiles/media/media_child_ffmpeg_loader.h; sourceTree = SOURCE_ROOT; }; + 07E102C41D3E4B7F00BD33B1 /* media_clip_ffmpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = media_clip_ffmpeg.cpp; path = SourceFiles/media/media_clip_ffmpeg.cpp; sourceTree = SOURCE_ROOT; }; + 07E102C51D3E4B7F00BD33B1 /* media_clip_ffmpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = media_clip_ffmpeg.h; path = SourceFiles/media/media_clip_ffmpeg.h; sourceTree = SOURCE_ROOT; }; + 07E102C61D3E4B7F00BD33B1 /* media_clip_implementation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = media_clip_implementation.cpp; path = SourceFiles/media/media_clip_implementation.cpp; sourceTree = SOURCE_ROOT; }; + 07E102C71D3E4B7F00BD33B1 /* media_clip_implementation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = media_clip_implementation.h; path = SourceFiles/media/media_clip_implementation.h; sourceTree = SOURCE_ROOT; }; + 07E102C81D3E4B7F00BD33B1 /* media_clip_qtgif.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = media_clip_qtgif.cpp; path = SourceFiles/media/media_clip_qtgif.cpp; sourceTree = SOURCE_ROOT; }; + 07E102C91D3E4B7F00BD33B1 /* media_clip_qtgif.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = media_clip_qtgif.h; path = SourceFiles/media/media_clip_qtgif.h; sourceTree = SOURCE_ROOT; }; + 07E102CA1D3E4B7F00BD33B1 /* media_clip_reader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = media_clip_reader.cpp; path = SourceFiles/media/media_clip_reader.cpp; sourceTree = SOURCE_ROOT; }; + 07E102CB1D3E4B7F00BD33B1 /* media_clip_reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = media_clip_reader.h; path = SourceFiles/media/media_clip_reader.h; sourceTree = SOURCE_ROOT; }; + 07E102D41D3E4BE800BD33B1 /* style_mediaview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = style_mediaview.cpp; path = GeneratedFiles/styles/style_mediaview.cpp; sourceTree = SOURCE_ROOT; }; + 07E102D51D3E4BE800BD33B1 /* style_mediaview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = style_mediaview.h; path = GeneratedFiles/styles/style_mediaview.h; sourceTree = SOURCE_ROOT; }; + 07E102D71D3E4CB800BD33B1 /* style_widgets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = style_widgets.cpp; path = GeneratedFiles/styles/style_widgets.cpp; sourceTree = SOURCE_ROOT; }; + 07E102D81D3E4CB800BD33B1 /* style_widgets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = style_widgets.h; path = GeneratedFiles/styles/style_widgets.h; sourceTree = SOURCE_ROOT; }; + 07E102DA1D3E4DE800BD33B1 /* moc_media_audio_loaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_media_audio_loaders.cpp; path = GeneratedFiles/Debug/moc_media_audio_loaders.cpp; sourceTree = SOURCE_ROOT; }; + 07E102DB1D3E4DE800BD33B1 /* moc_media_clip_controller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_media_clip_controller.cpp; path = GeneratedFiles/Debug/moc_media_clip_controller.cpp; sourceTree = SOURCE_ROOT; }; + 07E102DC1D3E4DE800BD33B1 /* moc_media_clip_playback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_media_clip_playback.cpp; path = GeneratedFiles/Debug/moc_media_clip_playback.cpp; sourceTree = SOURCE_ROOT; }; + 07E102DD1D3E4DE800BD33B1 /* moc_media_clip_reader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_media_clip_reader.cpp; path = GeneratedFiles/Debug/moc_media_clip_reader.cpp; sourceTree = SOURCE_ROOT; }; + 07E102DE1D3E4DE800BD33B1 /* moc_media_clip_volume_controller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_media_clip_volume_controller.cpp; path = GeneratedFiles/Debug/moc_media_clip_volume_controller.cpp; sourceTree = SOURCE_ROOT; }; + 07E102E41D3E4E3B00BD33B1 /* media_clip_controller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = media_clip_controller.cpp; path = SourceFiles/media/view/media_clip_controller.cpp; sourceTree = SOURCE_ROOT; }; + 07E102E51D3E4E3B00BD33B1 /* media_clip_controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = media_clip_controller.h; path = SourceFiles/media/view/media_clip_controller.h; sourceTree = SOURCE_ROOT; }; + 07E102E61D3E4E3B00BD33B1 /* media_clip_playback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = media_clip_playback.cpp; path = SourceFiles/media/view/media_clip_playback.cpp; sourceTree = SOURCE_ROOT; }; + 07E102E71D3E4E3B00BD33B1 /* media_clip_playback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = media_clip_playback.h; path = SourceFiles/media/view/media_clip_playback.h; sourceTree = SOURCE_ROOT; }; + 07E102E81D3E4E3B00BD33B1 /* media_clip_volume_controller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = media_clip_volume_controller.cpp; path = SourceFiles/media/view/media_clip_volume_controller.cpp; sourceTree = SOURCE_ROOT; }; + 07E102E91D3E4E3B00BD33B1 /* media_clip_volume_controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = media_clip_volume_controller.h; path = SourceFiles/media/view/media_clip_volume_controller.h; sourceTree = SOURCE_ROOT; }; + 07E102EA1D3E4E3B00BD33B1 /* mediaview.style */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = mediaview.style; path = SourceFiles/media/view/mediaview.style; sourceTree = SOURCE_ROOT; }; + 07E102F11D3E4E7F00BD33B1 /* fade_animation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fade_animation.cpp; path = SourceFiles/ui/effects/fade_animation.cpp; sourceTree = SOURCE_ROOT; }; + 07E102F21D3E4E7F00BD33B1 /* fade_animation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fade_animation.h; path = SourceFiles/ui/effects/fade_animation.h; sourceTree = SOURCE_ROOT; }; + 07E102F41D3E4E8C00BD33B1 /* label_simple.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = label_simple.cpp; path = SourceFiles/ui/widgets/label_simple.cpp; sourceTree = SOURCE_ROOT; }; + 07E102F51D3E4E8C00BD33B1 /* label_simple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = label_simple.h; path = SourceFiles/ui/widgets/label_simple.h; sourceTree = SOURCE_ROOT; }; + 07E102F61D3E4E8C00BD33B1 /* widgets.style */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = widgets.style; path = SourceFiles/ui/widgets/widgets.style; sourceTree = SOURCE_ROOT; }; + 07E102F91D3E4E9900BD33B1 /* icon_button.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = icon_button.cpp; path = SourceFiles/ui/buttons/icon_button.cpp; sourceTree = SOURCE_ROOT; }; + 07E102FA1D3E4E9900BD33B1 /* icon_button.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = icon_button.h; path = SourceFiles/ui/buttons/icon_button.h; sourceTree = SOURCE_ROOT; }; 07E1B1781D12DAF100722BC7 /* platform_main_window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform_main_window.h; path = SourceFiles/platform/platform_main_window.h; sourceTree = SOURCE_ROOT; }; 07E1B1791D12DB0700722BC7 /* main_window_win.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main_window_win.cpp; path = SourceFiles/platform/win/main_window_win.cpp; sourceTree = SOURCE_ROOT; }; 07E1B17A1D12DB0700722BC7 /* main_window_win.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = main_window_win.h; path = SourceFiles/platform/win/main_window_win.h; sourceTree = SOURCE_ROOT; }; @@ -1034,10 +1096,14 @@ 0716C99D1D08251C00797B22 /* style_dialogs.h */, 0716C99E1D08251C00797B22 /* style_history.cpp */, 0716C99F1D08251C00797B22 /* style_history.h */, + 07E102D41D3E4BE800BD33B1 /* style_mediaview.cpp */, + 07E102D51D3E4BE800BD33B1 /* style_mediaview.h */, 078500381CC94D9600168DBB /* style_overview.cpp */, 078500391CC94D9600168DBB /* style_overview.h */, 0716C95E1D058C6600797B22 /* style_profile.cpp */, 0716C95F1D058C6600797B22 /* style_profile.h */, + 07E102D71D3E4CB800BD33B1 /* style_widgets.cpp */, + 07E102D81D3E4CB800BD33B1 /* style_widgets.h */, ); name = styles; sourceTree = ""; @@ -1204,6 +1270,65 @@ name = toast; sourceTree = ""; }; + 07E102B91D3E4B4900BD33B1 /* media */ = { + isa = PBXGroup; + children = ( + 07E102BB1D3E4B5A00BD33B1 /* view */, + 07D7034919B8755A00C4EED2 /* media_audio.cpp */, + 07D7034A19B8755A00C4EED2 /* media_audio.h */, + 07E102BC1D3E4B7F00BD33B1 /* media_audio_ffmpeg_loader.cpp */, + 07E102BD1D3E4B7F00BD33B1 /* media_audio_ffmpeg_loader.h */, + 07E102BE1D3E4B7F00BD33B1 /* media_audio_loader.cpp */, + 07E102BF1D3E4B7F00BD33B1 /* media_audio_loader.h */, + 07E102C01D3E4B7F00BD33B1 /* media_audio_loaders.cpp */, + 07E102C11D3E4B7F00BD33B1 /* media_audio_loaders.h */, + 07E102C21D3E4B7F00BD33B1 /* media_child_ffmpeg_loader.cpp */, + 07E102C31D3E4B7F00BD33B1 /* media_child_ffmpeg_loader.h */, + 07E102C41D3E4B7F00BD33B1 /* media_clip_ffmpeg.cpp */, + 07E102C51D3E4B7F00BD33B1 /* media_clip_ffmpeg.h */, + 07E102C61D3E4B7F00BD33B1 /* media_clip_implementation.cpp */, + 07E102C71D3E4B7F00BD33B1 /* media_clip_implementation.h */, + 07E102C81D3E4B7F00BD33B1 /* media_clip_qtgif.cpp */, + 07E102C91D3E4B7F00BD33B1 /* media_clip_qtgif.h */, + 07E102CA1D3E4B7F00BD33B1 /* media_clip_reader.cpp */, + 07E102CB1D3E4B7F00BD33B1 /* media_clip_reader.h */, + ); + name = media; + sourceTree = ""; + }; + 07E102BB1D3E4B5A00BD33B1 /* view */ = { + isa = PBXGroup; + children = ( + 07E102E41D3E4E3B00BD33B1 /* media_clip_controller.cpp */, + 07E102E51D3E4E3B00BD33B1 /* media_clip_controller.h */, + 07E102E61D3E4E3B00BD33B1 /* media_clip_playback.cpp */, + 07E102E71D3E4E3B00BD33B1 /* media_clip_playback.h */, + 07E102E81D3E4E3B00BD33B1 /* media_clip_volume_controller.cpp */, + 07E102E91D3E4E3B00BD33B1 /* media_clip_volume_controller.h */, + 07E102EA1D3E4E3B00BD33B1 /* mediaview.style */, + ); + name = view; + sourceTree = ""; + }; + 07E102EF1D3E4E5E00BD33B1 /* effects */ = { + isa = PBXGroup; + children = ( + 07E102F11D3E4E7F00BD33B1 /* fade_animation.cpp */, + 07E102F21D3E4E7F00BD33B1 /* fade_animation.h */, + ); + name = effects; + sourceTree = ""; + }; + 07E102F01D3E4E6900BD33B1 /* widgets */ = { + isa = PBXGroup; + children = ( + 07E102F41D3E4E8C00BD33B1 /* label_simple.cpp */, + 07E102F51D3E4E8C00BD33B1 /* label_simple.h */, + 07E102F61D3E4E8C00BD33B1 /* widgets.style */, + ); + name = widgets; + sourceTree = ""; + }; 07E1B1731D12DAC000722BC7 /* platform */ = { isa = PBXGroup; children = ( @@ -1265,6 +1390,8 @@ children = ( 0716C9A81D0825A800797B22 /* history_down_button.cpp */, 0716C9A91D0825A800797B22 /* history_down_button.h */, + 07E102F91D3E4E9900BD33B1 /* icon_button.cpp */, + 07E102FA1D3E4E9900BD33B1 /* icon_button.h */, 0716C9841D0594C000797B22 /* left_outline_button.cpp */, 0716C9851D0594C000797B22 /* left_outline_button.h */, 07E373921CBBC11000934F77 /* peer_avatar_button.cpp */, @@ -1332,9 +1459,11 @@ isa = PBXGroup; children = ( 07E373901CBBBFDE00934F77 /* buttons */, + 07E102EF1D3E4E5E00BD33B1 /* effects */, 0785002B1CC94CF500168DBB /* style */, 076B1C471CBFBEB4002C0BC2 /* text */, 07C8FE071CB80884007A8702 /* toast */, + 07E102F01D3E4E6900BD33B1 /* widgets */, D3FE9C29B6A61D7C3C4B731B /* animation.cpp */, 85FABD67716E36CD8B3CA4FA /* animation.h */, 08A7682548FB7E671FF03822 /* boxshadow.cpp */, @@ -1400,6 +1529,7 @@ 076B1C561CBFC8C9002C0BC2 /* history */, 07C8FDF81CB66D80007A8702 /* inline_bots */, 5E35A03E5F2C51353EBCBF00 /* intro */, + 07E102B91D3E4B4900BD33B1 /* media */, 1A6AA22F4A758C4B5F5138FB /* mtproto */, 076B1C5C1CBFC97D002C0BC2 /* overview */, 07E1B1731D12DAC000722BC7 /* platform */, @@ -1413,8 +1543,6 @@ C19DF71B273A4843553518F2 /* app.h */, C20F9DD8C7B031B8E20D5653 /* application.cpp */, 09FD01F2BD652EB838A296D8 /* application.h */, - 07D7034919B8755A00C4EED2 /* media_audio.cpp */, - 07D7034A19B8755A00C4EED2 /* media_audio.h */, 07C7596D1B1F7E0000662169 /* autoupdater.cpp */, 07C7596E1B1F7E0000662169 /* autoupdater.h */, 206B4F5CBD5354BCE19FF32F /* countries.h */, @@ -1500,7 +1628,6 @@ A1479F94376F9732B57C69DB /* moc_animation.cpp */, 0764D55C1ABAD71B00FBFEED /* moc_apiwrap.cpp */, E181C525E21A16F2D4396CA7 /* moc_application.cpp */, - 07D703BA19B88FB900C4EED2 /* moc_media_audio.cpp */, 07DE92A91AA4928200A18F6F /* moc_autolockbox.cpp */, 07C759711B1F7E2800662169 /* moc_autoupdater.cpp */, 078A2FC91A811C5900CCC7A0 /* moc_backgroundbox.cpp */, @@ -1545,6 +1672,12 @@ 3A220FD1AE5AD9FE3DC073A4 /* moc_mainwidget.cpp */, 6B46A0EE3C3B9D3B5A24946E /* moc_mainwindow.cpp */, 07A6933419927B160099CB9F /* moc_mediaview.cpp */, + 07D703BA19B88FB900C4EED2 /* moc_media_audio.cpp */, + 07E102DA1D3E4DE800BD33B1 /* moc_media_audio_loaders.cpp */, + 07E102DB1D3E4DE800BD33B1 /* moc_media_clip_controller.cpp */, + 07E102DC1D3E4DE800BD33B1 /* moc_media_clip_playback.cpp */, + 07E102DD1D3E4DE800BD33B1 /* moc_media_clip_reader.cpp */, + 07E102DE1D3E4DE800BD33B1 /* moc_media_clip_volume_controller.cpp */, 0732E4AB199E268A00D50FE7 /* moc_overviewwidget.cpp */, 07DE92AB1AA4928B00A18F6F /* moc_passcodebox.cpp */, 07DE92AC1AA4928B00A18F6F /* moc_passcodewidget.cpp */, @@ -1811,9 +1944,11 @@ 0716C92A1D05893900797B22 /* basic.style in Resources */, 0716C9281D05893900797B22 /* all_files.style in Resources */, 0716C9581D0589A700797B22 /* profile.style in Resources */, + 07E102F81D3E4E8C00BD33B1 /* widgets.style in Resources */, 0716C95A1D0589B600797B22 /* overview.style in Resources */, 0716C9291D05893900797B22 /* basic_types.style in Resources */, 07D7EABA1A597DD000838BA2 /* Localizable.strings in Resources */, + 07E102EE1D3E4E3B00BD33B1 /* mediaview.style in Resources */, 0716C9A71D08258A00797B22 /* history.style in Resources */, 0716C99A1D08225000797B22 /* dialogs.style in Resources */, ); @@ -1935,12 +2070,14 @@ 076B1C5F1CBFC98F002C0BC2 /* overview_layout.cpp in Compile Sources */, 0716C9731D058C8600797B22 /* moc_profile_fixed_bar.cpp in Compile Sources */, 0716C9811D058F2400797B22 /* slide_animation.cpp in Compile Sources */, + 07E102D31D3E4B7F00BD33B1 /* media_clip_reader.cpp in Compile Sources */, 6EF5A4ECC0EF19EA016EBA3E /* dropdown.cpp in Compile Sources */, 6E4DB0CBEF415196AFD4149F /* fileuploader.cpp in Compile Sources */, 700925F3B2C6163D38140CEA /* history.cpp in Compile Sources */, 0732E4A9199E262300D50FE7 /* overviewwidget.cpp in Compile Sources */, 0716C9991D08225000797B22 /* dialogs_row.cpp in Compile Sources */, 077A4B041CA41EE2002188D2 /* moc_connection_auto.cpp in Compile Sources */, + 07E102D91D3E4CB800BD33B1 /* style_widgets.cpp in Compile Sources */, 1DF53374E3B6A31661548D08 /* historywidget.cpp in Compile Sources */, 078A2FCD1A811CA600CCC7A0 /* backgroundbox.cpp in Compile Sources */, 37A3C6C782A0E4BC7B09536B /* langloaderplain.cpp in Compile Sources */, @@ -1957,6 +2094,7 @@ 0716C94F1D0589A700797B22 /* profile_info_widget.cpp in Compile Sources */, B99CCE43EEFCD3E18F6D16D1 /* settingswidget.cpp in Compile Sources */, B8DA82DA1B195A933A0805E7 /* sysbuttons.cpp in Compile Sources */, + 07E102FB1D3E4E9900BD33B1 /* icon_button.cpp in Compile Sources */, 5CE57D44510AB2A11886AB52 /* title.cpp in Compile Sources */, 0716C97A1D058C8600797B22 /* moc_report_box.cpp in Compile Sources */, 077A4AF81CA41C38002188D2 /* connection_auto.cpp in Compile Sources */, @@ -1964,15 +2102,18 @@ 07E1B1931D12DED700722BC7 /* moc_main_window_mac.cpp in Compile Sources */, 68FFEB7CA30BF0149161B809 /* mainwindow.cpp in Compile Sources */, 0716C9831D05931400797B22 /* moc_section_widget.cpp in Compile Sources */, + 07E102CC1D3E4B7F00BD33B1 /* media_audio_ffmpeg_loader.cpp in Compile Sources */, 0CB7DE9A54CC9BF86FB7B5CA /* facade.cpp in Compile Sources */, 078500341CC94D1900168DBB /* style_core_color.cpp in Compile Sources */, 076B1C5B1CBFC8F1002C0BC2 /* top_bar_widget.cpp in Compile Sources */, DF259E9677CC63AF8754032B /* connection.cpp in Compile Sources */, 074FCB9119D36E60004C6EB2 /* moc_popupmenu.cpp in Compile Sources */, B6346B66B0A2228A91D8A5D9 /* dcenter.cpp in Compile Sources */, + 07E102CE1D3E4B7F00BD33B1 /* media_audio_loaders.cpp in Compile Sources */, 0755AEDF1AD12A80004D738A /* moc_sessionsbox.cpp in Compile Sources */, 07C8FE031CB66D97007A8702 /* inline_bot_result.cpp in Compile Sources */, 07129D6E1C16D245002DC495 /* facades.cpp in Compile Sources */, + 07E102F31D3E4E7F00BD33B1 /* fade_animation.cpp in Compile Sources */, B8CA3E1E11A7E0E7DF9E1CDE /* file_download.cpp in Compile Sources */, 07C8FE0E1CB80890007A8702 /* toast_manager.cpp in Compile Sources */, 0755AEDD1AD12A80004D738A /* moc_abstractbox.cpp in Compile Sources */, @@ -2007,6 +2148,7 @@ 0716C94B1D0589A700797B22 /* profile_block_widget.cpp in Compile Sources */, 076B1C4D1CBFBF59002C0BC2 /* text_block.cpp in Compile Sources */, 3AA6E7264581F82856FB37F7 /* text.cpp in Compile Sources */, + 07E102D61D3E4BE800BD33B1 /* style_mediaview.cpp in Compile Sources */, 077A4B061CA41EE2002188D2 /* moc_connection_tcp.cpp in Compile Sources */, FCE6518C548DF7BC82228A4A /* twidget.cpp in Compile Sources */, 071AD8D21C5E8E6D008C9E90 /* zip.c in Compile Sources */, @@ -2029,6 +2171,7 @@ F278C423357CA99797EA30AB /* photosendbox.cpp in Compile Sources */, E8D95529CED88F18818C9A8B /* introwidget.cpp in Compile Sources */, 9357E7B12AD6D88B157ACA05 /* introcode.cpp in Compile Sources */, + 07E102E11D3E4DE800BD33B1 /* moc_media_clip_playback.cpp in Compile Sources */, 4BF3F8D0797BC8A0C1FAD13C /* introphone.cpp in Compile Sources */, 4978DE680549639AE9AA9CA6 /* introsignup.cpp in Compile Sources */, 076B1C551CBFC6F2002C0BC2 /* click_handler.cpp in Compile Sources */, @@ -2040,21 +2183,25 @@ C1F9D5CA8AF3AD8EBC9D7310 /* moc_application.cpp in Compile Sources */, 07C8FE011CB66D97007A8702 /* inline_bot_layout_internal.cpp in Compile Sources */, D846C6F212B438DC2FD5FF71 /* moc_dialogswidget.cpp in Compile Sources */, + 07E102ED1D3E4E3B00BD33B1 /* media_clip_volume_controller.cpp in Compile Sources */, 0702E9A51CB8D2A8007A7495 /* serialize_common.cpp in Compile Sources */, 6C79FBC5CFA36AC3EA6ABBD4 /* moc_dropdown.cpp in Compile Sources */, 077A4AFA1CA41C38002188D2 /* connection_tcp.cpp in Compile Sources */, 822C2860FBFAF3EAE42C5A3F /* moc_fileuploader.cpp in Compile Sources */, 352349751855EF76DECA4D60 /* moc_historywidget.cpp in Compile Sources */, + 07E102EB1D3E4E3B00BD33B1 /* media_clip_controller.cpp in Compile Sources */, 4B0036C794BEA27AF9419768 /* moc_layerwidget.cpp in Compile Sources */, 07C8FE101CB80890007A8702 /* toast.cpp in Compile Sources */, 077A4AF71CA41C38002188D2 /* connection_abstract.cpp in Compile Sources */, 071AD8F81C5E99D6008C9E90 /* ioapi.c in Compile Sources */, 074756191A1372C600CA07F7 /* moc_basic_types.cpp in Compile Sources */, + 07E102D01D3E4B7F00BD33B1 /* media_clip_ffmpeg.cpp in Compile Sources */, 98E4F55DB5D8E64AB9F08C83 /* moc_localimageloader.cpp in Compile Sources */, A24E4B5B683764E07683ECEC /* moc_mainwidget.cpp in Compile Sources */, 0710CA051B0B9404001B4272 /* moc_stickersetbox.cpp in Compile Sources */, 0716C9AA1D0825A800797B22 /* history_down_button.cpp in Compile Sources */, 0716C94A1D0589A700797B22 /* profile_actions_widget.cpp in Compile Sources */, + 07E102DF1D3E4DE800BD33B1 /* moc_media_audio_loaders.cpp in Compile Sources */, 0716C9761D058C8600797B22 /* moc_profile_settings_widget.cpp in Compile Sources */, 0716C9A11D08251C00797B22 /* style_history.cpp in Compile Sources */, 0716C94D1D0589A700797B22 /* profile_cover.cpp in Compile Sources */, @@ -2069,6 +2216,7 @@ FD2FE0C564A7389A2E609EC7 /* moc_sysbuttons.cpp in Compile Sources */, E97B3CFAB59B49BACFFC5F7C /* moc_title.cpp in Compile Sources */, 07D8510819F8340A00623D75 /* moc_usernamebox.cpp in Compile Sources */, + 07E102D11D3E4B7F00BD33B1 /* media_clip_implementation.cpp in Compile Sources */, 0716C9711D058C8600797B22 /* moc_profile_block_widget.cpp in Compile Sources */, 9A0D5DDC7816FC2538EB6A96 /* moc_mainwindow.cpp in Compile Sources */, 0716C9501D0589A700797B22 /* profile_inner_widget.cpp in Compile Sources */, @@ -2078,9 +2226,11 @@ 07DE92AA1AA4928200A18F6F /* moc_autolockbox.cpp in Compile Sources */, 0716C9551D0589A700797B22 /* profile_shared_media_widget.cpp in Compile Sources */, 07B604351B46A20900CA29FE /* moc_playerwidget.cpp in Compile Sources */, + 07E102CF1D3E4B7F00BD33B1 /* media_child_ffmpeg_loader.cpp in Compile Sources */, 8F6F5D7F82036331E8C6DAE6 /* moc_connection.cpp in Compile Sources */, 0716C9531D0589A700797B22 /* profile_section_memento.cpp in Compile Sources */, 075CDF6E1D09E2D0009EA100 /* data_abstract_structure.cpp in Compile Sources */, + 07E102CD1D3E4B7F00BD33B1 /* media_audio_loader.cpp in Compile Sources */, B780F9E21269259B90A1F32A /* moc_dcenter.cpp in Compile Sources */, 07080BCF1A43588C00741A51 /* lang_auto.cpp in Compile Sources */, 07539B1D1A1416AF00083EFC /* moc_history.cpp in Compile Sources */, @@ -2098,9 +2248,12 @@ 0716C9801D058F2400797B22 /* section_widget.cpp in Compile Sources */, B2F5B08BFFBBE7E37D3863BB /* moc_button.cpp in Compile Sources */, 0716C9901D05954900797B22 /* observer.cpp in Compile Sources */, + 07E102E21D3E4DE800BD33B1 /* moc_media_clip_reader.cpp in Compile Sources */, 0716C9A01D08251C00797B22 /* style_dialogs.cpp in Compile Sources */, 0716C94E1D0589A700797B22 /* profile_fixed_bar.cpp in Compile Sources */, 6A8BC88AB464B92706EFE6FF /* moc_countryinput.cpp in Compile Sources */, + 07E102D21D3E4B7F00BD33B1 /* media_clip_qtgif.cpp in Compile Sources */, + 07E102F71D3E4E8C00BD33B1 /* label_simple.cpp in Compile Sources */, 0764D55A1ABAD6F900FBFEED /* apiwrap.cpp in Compile Sources */, 07DE92A01AA4923300A18F6F /* passcodewidget.cpp in Compile Sources */, 07E373941CBBC11000934F77 /* peer_avatar_button.cpp in Compile Sources */, @@ -2128,6 +2281,7 @@ 7062978F12EEA525893A5E6F /* moc_aboutbox.cpp in Compile Sources */, E8B28580819B882A5964561A /* moc_addcontactbox.cpp in Compile Sources */, 07B604321B46A0EC00CA29FE /* playerwidget.cpp in Compile Sources */, + 07E102E31D3E4DE800BD33B1 /* moc_media_clip_volume_controller.cpp in Compile Sources */, D6874C00733283846ACA9AB2 /* moc_confirmbox.cpp in Compile Sources */, 075FEBEC1C82336D0003ECA3 /* shortcuts.cpp in Compile Sources */, 07B817091CB9A235006F7869 /* dialogs_indexed_list.cpp in Compile Sources */, @@ -2149,11 +2303,13 @@ 0F7872E39EA570249D420912 /* moc_introwidget.cpp in Compile Sources */, 4F27F5F76AA3F78C8CA27339 /* moc_introcode.cpp in Compile Sources */, 07D8509519F5C97E00623D75 /* scheme_auto.cpp in Compile Sources */, + 07E102EC1D3E4E3B00BD33B1 /* media_clip_playback.cpp in Compile Sources */, 0747FF7F1CC6435100096FC3 /* style_basic.cpp in Compile Sources */, 0250AB6761AC71A2E3155EEA /* moc_introphone.cpp in Compile Sources */, 07E1B1AD1D1847C400722BC7 /* moc_inner_dropdown.cpp in Compile Sources */, 07D8509419F5C97E00623D75 /* core_types.cpp in Compile Sources */, 2EF5D0AC9A18F9FE9B8A1ACA /* moc_introsignup.cpp in Compile Sources */, + 07E102E01D3E4DE800BD33B1 /* moc_media_clip_controller.cpp in Compile Sources */, 07DE92AE1AA4928B00A18F6F /* moc_passcodewidget.cpp in Compile Sources */, FA603B17F803E8D6B55C2F2B /* pspecific_mac_p.mm in Compile Sources */, 07080BD21A436A5000741A51 /* lang.cpp in Compile Sources */, diff --git a/Telegram/Telegram.xcodeproj/qt_preprocess.mak b/Telegram/Telegram.xcodeproj/qt_preprocess.mak index 2cc42ee184..7250e65e8a 100644 --- a/Telegram/Telegram.xcodeproj/qt_preprocess.mak +++ b/Telegram/Telegram.xcodeproj/qt_preprocess.mak @@ -99,7 +99,11 @@ compilers: GeneratedFiles/qrc_telegram.cpp\ GeneratedFiles/Debug/moc_mainwidget.cpp\ GeneratedFiles/Debug/moc_mainwindow.cpp\ GeneratedFiles/Debug/moc_media_audio.cpp\ + GeneratedFiles/Debug/moc_media_audio_loaders.cpp\ + GeneratedFiles/Debug/moc_media_clip_controller.cpp\ + GeneratedFiles/Debug/moc_media_clip_playback.cpp\ GeneratedFiles/Debug/moc_media_clip_reader.cpp\ + GeneratedFiles/Debug/moc_media_clip_volume_controller.cpp\ GeneratedFiles/Debug/moc_mediaview.cpp\ GeneratedFiles/Debug/moc_overviewwidget.cpp\ GeneratedFiles/Debug/moc_passcodebox.cpp\ @@ -238,7 +242,11 @@ compiler_moc_header_make_all: GeneratedFiles/Debug/moc_aboutbox.cpp\ GeneratedFiles/Debug/moc_mainwidget.cpp\ GeneratedFiles/Debug/moc_mainwindow.cpp\ GeneratedFiles/Debug/moc_media_audio.cpp\ + GeneratedFiles/Debug/moc_media_audio_loaders.cpp\ + GeneratedFiles/Debug/moc_media_clip_controller.cpp\ + GeneratedFiles/Debug/moc_media_clip_playback.cpp\ GeneratedFiles/Debug/moc_media_clip_reader.cpp\ + GeneratedFiles/Debug/moc_media_clip_volume_controller.cpp\ GeneratedFiles/Debug/moc_mediaview.cpp\ GeneratedFiles/Debug/moc_overviewwidget.cpp\ GeneratedFiles/Debug/moc_passcodebox.cpp\ @@ -320,7 +328,11 @@ compiler_moc_header_clean: GeneratedFiles/Debug/moc_mainwidget.cpp\ GeneratedFiles/Debug/moc_mainwindow.cpp\ GeneratedFiles/Debug/moc_media_audio.cpp\ + GeneratedFiles/Debug/moc_media_audio_loaders.cpp\ + GeneratedFiles/Debug/moc_media_clip_controller.cpp\ + GeneratedFiles/Debug/moc_media_clip_playback.cpp\ GeneratedFiles/Debug/moc_media_clip_reader.cpp\ + GeneratedFiles/Debug/moc_media_clip_volume_controller.cpp\ GeneratedFiles/Debug/moc_mediaview.cpp\ GeneratedFiles/Debug/moc_overviewwidget.cpp\ GeneratedFiles/Debug/moc_passcodebox.cpp\ @@ -501,9 +513,21 @@ GeneratedFiles/Debug/moc_mainwindow.cpp: SourceFiles/mainwindow.h GeneratedFiles/Debug/moc_media_audio.cpp: SourceFiles/media/media_audio.h $(MOC_FILE) SourceFiles/media/media_audio.h -o GeneratedFiles/Debug/moc_media_audio.cpp +GeneratedFiles/Debug/moc_media_audio_loaders.cpp: SourceFiles/media/media_audio_loaders.h + $(MOC_FILE) SourceFiles/media/media_audio_loaders.h -o GeneratedFiles/Debug/moc_media_audio_loaders.cpp + +GeneratedFiles/Debug/moc_media_clip_controller.cpp: SourceFiles/media/view/media_clip_controller.h + $(MOC_FILE) SourceFiles/media/view/media_clip_controller.h -o GeneratedFiles/Debug/moc_media_clip_controller.cpp + +GeneratedFiles/Debug/moc_media_clip_playback.cpp: SourceFiles/media/view/media_clip_playback.h + $(MOC_FILE) SourceFiles/media/view/media_clip_playback.h -o GeneratedFiles/Debug/moc_media_clip_playback.cpp + GeneratedFiles/Debug/moc_media_clip_reader.cpp: SourceFiles/media/media_clip_reader.h $(MOC_FILE) SourceFiles/media/media_clip_reader.h -o GeneratedFiles/Debug/moc_media_clip_reader.cpp +GeneratedFiles/Debug/moc_media_clip_volume_controller.cpp: SourceFiles/media/view/media_clip_volume_controller.h + $(MOC_FILE) SourceFiles/media/view/media_clip_volume_controller.h -o GeneratedFiles/Debug/moc_media_clip_volume_controller.cpp + GeneratedFiles/Debug/moc_mediaview.cpp: SourceFiles/mediaview.h $(MOC_FILE) SourceFiles/mediaview.h -o GeneratedFiles/Debug/moc_mediaview.cpp