Switch to unified view

a/application.h b/application.h
...
...
23
23
24
#include <string>
24
#include <string>
25
25
26
#include <QObject>
26
#include <QObject>
27
#include <QApplication>
27
#include <QApplication>
28
28
#include "libupnpp/control/mediarenderer.hxx"
29
#include "libupnpp/control/mediarenderer.hxx"
29
30
#include "upqo/ohproduct_qo.h"
30
#include "upqo/ohproduct_qo.h"
31
31
32
class AVTPlayer;
32
class AVTPlayer;
33
class CSettingsStorage;
33
class CSettingsStorage;
34
class DirBrowser;
34
class DirBrowser;
...
...
39
class OHRadioQO;
39
class OHRadioQO;
40
class OHTimeQO;
40
class OHTimeQO;
41
class OHVolumeQO;
41
class OHVolumeQO;
42
class Playlist;
42
class Playlist;
43
class RenderingControlQO;
43
class RenderingControlQO;
44
class SongcastTool;
44
45
45
class Application : public QObject
46
class Application : public QObject
46
{
47
{
47
    Q_OBJECT;
48
    Q_OBJECT;
48
49
...
...
56
    void getIdleMeta(MetaData* mdp);
57
    void getIdleMeta(MetaData* mdp);
57
                        
58
                        
58
public slots:
59
public slots:
59
    void chooseRenderer();
60
    void chooseRenderer();
60
    void chooseSource();
61
    void chooseSource();
62
    void openSongcast();
61
    void reconnectOrChoose();
63
    void reconnectOrChoose();
62
    void onSourceTypeChanged(OHProductQO::SourceType);
64
    void onSourceTypeChanged(OHProductQO::SourceType);
63
65
    
64
private:
66
private:
65
67
66
    GUI_Player   *m_player;
68
    GUI_Player   *m_player;
67
    Playlist     *m_playlist;
69
    Playlist     *m_playlist;
68
    DirBrowser   *m_cdb;
70
    DirBrowser   *m_cdb;
...
...
73
    OHTimeQO     *m_ohtmo;
75
    OHTimeQO     *m_ohtmo;
74
    OHVolumeQO   *m_ohvlo;
76
    OHVolumeQO   *m_ohvlo;
75
    OHProductQO  *m_ohpro;
77
    OHProductQO  *m_ohpro;
76
    
78
    
77
    GUI_Playlist *m_ui_playlist;
79
    GUI_Playlist *m_ui_playlist;
78
80
    SongcastTool *m_sctool;
81
    
79
    CSettingsStorage *m_settings;
82
    CSettingsStorage *m_settings;
80
    QApplication     *m_app;
83
    QApplication     *m_app;
81
84
82
    bool             m_initialized;
85
    bool             m_initialized;
83
    OHProductQO::SourceType m_ohsourcetype;
86
    OHProductQO::SourceType m_ohsourcetype;