void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved SystemMediaControlsManagerto Media namespace.

Browse source
This commit is contained in:
23rd 2021-06-08 21:58:34 +03:00
parent 3ffbb94fdb
commit 69eaecc218
5 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Telegram/CMakeLists.txt
View file

@ -729,6 +729,8 @@ PRIVATE
main/main_session.h main/main_session.h
main/main_session_settings.cpp main/main_session_settings.cpp
main/main_session_settings.h main/main_session_settings.h
media/system_media_controls_manager.h
media/system_media_controls_manager.cpp
media/audio/media_audio.cpp media/audio/media_audio.cpp
media/audio/media_audio.h media/audio/media_audio.h
media/audio/media_audio_capture.cpp media/audio/media_audio_capture.cpp
@ -1086,8 +1088,6 @@ PRIVATE
window/section_memento.h window/section_memento.h
window/section_widget.cpp window/section_widget.cpp
window/section_widget.h window/section_widget.h
window/system_media_controls_manager.cpp
window/system_media_controls_manager.h
window/window_connecting_widget.cpp window/window_connecting_widget.cpp
window/window_connecting_widget.h window/window_connecting_widget.h
window/window_controller.cpp window/window_controller.cpp

6
Telegram/SourceFiles/mainwindow.cpp
View file

@ -31,6 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "main/main_account.h" // Account::sessionValue. #include "main/main_account.h" // Account::sessionValue.
#include "main/main_domain.h" #include "main/main_domain.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "media/system_media_controls_manager.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "boxes/connection_box.h" #include "boxes/connection_box.h"
#include "storage/storage_account.h" #include "storage/storage_account.h"
@ -45,7 +46,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/notifications_manager.h" #include "window/notifications_manager.h"
#include "window/themes/window_theme.h" #include "window/themes/window_theme.h"
#include "window/themes/window_theme_warning.h" #include "window/themes/window_theme_warning.h"
#include "window/system_media_controls_manager.h"
#include "window/window_lock_widgets.h" #include "window/window_lock_widgets.h"
#include "window/window_main_menu.h" #include "window/window_main_menu.h"
#include "window/window_controller.h" // App::wnd. #include "window/window_controller.h" // App::wnd.
@ -133,8 +133,8 @@ void MainWindow::initHook() {
[=] { checkHistoryActivation(); }, [=] { checkHistoryActivation(); },
Qt::QueuedConnection); Qt::QueuedConnection);
if (Window::SystemMediaControlsManager::Supported()) { if (Media::SystemMediaControlsManager::Supported()) {
using MediaManager = Window::SystemMediaControlsManager; using MediaManager = Media::SystemMediaControlsManager;
_mediaControlsManager = std::make_unique<MediaManager>(&controller()); _mediaControlsManager = std::make_unique<MediaManager>(&controller());
} }
} }

8
Telegram/SourceFiles/mainwindow.h
View file

@ -19,12 +19,15 @@ class Widget;
enum class EnterPoint : uchar; enum class EnterPoint : uchar;
} // namespace Intro } // namespace Intro
namespace Media {
class SystemMediaControlsManager;
} // namespace Media
namespace Window { namespace Window {
class MediaPreviewWidget; class MediaPreviewWidget;
class SectionMemento; class SectionMemento;
struct SectionShow; struct SectionShow;
class PasscodeLockWidget; class PasscodeLockWidget;
class SystemMediaControlsManager;
namespace Theme { namespace Theme {
struct BackgroundUpdate; struct BackgroundUpdate;
class WarningWidget; class WarningWidget;
@ -131,8 +134,7 @@ private:
QPixmap grabInner(); QPixmap grabInner();
using MediaControlsManager = Window::SystemMediaControlsManager; std::unique_ptr<Media::SystemMediaControlsManager> _mediaControlsManager;
std::unique_ptr<MediaControlsManager> _mediaControlsManager;
QImage icon16, icon32, icon64, iconbig16, iconbig32, iconbig64; QImage icon16, icon32, icon64, iconbig16, iconbig32, iconbig64;

6
Telegram/SourceFiles/window/system_media_controls_manager.cpp → Telegram/SourceFiles/media/system_media_controls_manager.cpp
View file

@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service.
For license and copyright information please follow this link: For license and copyright information please follow this link:
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#include "window/system_media_controls_manager.h" #include "media/system_media_controls_manager.h"
#include "base/observer.h" #include "base/observer.h"
#include "base/platform/base_platform_system_media_controls.h" #include "base/platform/base_platform_system_media_controls.h"
@ -24,7 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/text/format_song_document_name.h" #include "ui/text/format_song_document_name.h"
#include "window/window_controller.h" #include "window/window_controller.h"
namespace Window { namespace Media {
bool SystemMediaControlsManager::Supported() { bool SystemMediaControlsManager::Supported() {
return base::Platform::SystemMediaControls::Supported(); return base::Platform::SystemMediaControls::Supported();
@ -253,4 +253,4 @@ SystemMediaControlsManager::SystemMediaControlsManager(
SystemMediaControlsManager::~SystemMediaControlsManager() = default; SystemMediaControlsManager::~SystemMediaControlsManager() = default;
} // namespace Window } // namespace Media

4
Telegram/SourceFiles/window/system_media_controls_manager.h → Telegram/SourceFiles/media/system_media_controls_manager.h
View file

@ -23,7 +23,7 @@ namespace Media::Streaming {
class Instance; class Instance;
} // namespace Media::Streaming } // namespace Media::Streaming
namespace Window { namespace Media {
class SystemMediaControlsManager { class SystemMediaControlsManager {
public: public:
@ -43,4 +43,4 @@ private:
rpl::lifetime _lifetime; rpl::lifetime _lifetime;
}; };
} // namespace Window } // namespace Media