--- a/application.h
+++ b/application.h
@@ -1,8 +1,6 @@
-/* application.h */
-
-/* Copyright (C) 2013 Lucio Carreras
- *
- * This file is part of sayonara player
+/*
+ * Copyright (C) 2017 J.F. Dockes
+ * Copyright (C) 2013 Lucio Carreras
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -27,23 +25,7 @@
#include <QObject>
#include <QApplication>
-#include "libupnpp/control/mediarenderer.hxx"
-#include "upqo/ohproduct_qo.h"
-
-class AVTPlayer;
-class CSettingsStorage;
-class DirBrowser;
-class GUI_Player;
-class GUI_Playlist;
class MetaData;
-class OHProductQO;
-class OHRadioQO;
-class OHTimeQO;
-class OHVolumeQO;
-class Playlist;
-class RenderingControlQO;
-class SongcastTool;
-class UpplayNotifications;
class Application : public QObject
{
@@ -54,43 +36,21 @@
virtual ~Application();
bool is_initialized();
-
void getIdleMeta(MetaData* mdp);
-
+ static int horizontalDPI;
+
public slots:
void chooseRenderer();
void chooseSource();
void openSongcast();
void reconnectOrChoose();
- void onSourceTypeChanged(OHProductQO::SourceType);
+ void onSourceTypeChanged(int);
void onDirSortOrder();
void onPrefsChanged();
private:
-
- GUI_Player *m_player;
- std::shared_ptr<Playlist> m_playlist;
- DirBrowser *m_cdb;
-
- UPnPClient::MRDH m_rdr;
- RenderingControlQO *m_rdco;
- AVTPlayer *m_avto;
- OHTimeQO *m_ohtmo;
- OHVolumeQO *m_ohvlo;
- OHProductQO *m_ohpro;
-
- GUI_Playlist *m_ui_playlist;
- SongcastTool *m_sctool;
- UpplayNotifications *m_notifs;
-
- CSettingsStorage *m_settings;
- QApplication *m_app;
-
- bool m_initialized;
- // Can we send titles into the playlist (e.g. not OHradio).
- bool m_playlistIsPlaylist;
- OHProductQO::SourceType m_ohsourcetype;
- QString m_renderer_friendly_name;
+ class Internal;
+ Internal *m;
void clear_renderer();
void init_connections();