Switch to unified view

a/application.h b/application.h
...
...
20
20
21
#ifndef APPLICATION_H
21
#ifndef APPLICATION_H
22
#define APPLICATION_H
22
#define APPLICATION_H
23
23
24
#include <string>
24
#include <string>
25
#include <memory>
25
26
26
#include <QObject>
27
#include <QObject>
27
#include <QApplication>
28
#include <QApplication>
28
29
29
#include "libupnpp/control/mediarenderer.hxx"
30
#include "libupnpp/control/mediarenderer.hxx"
...
...
63
    void onSourceTypeChanged(OHProductQO::SourceType);
64
    void onSourceTypeChanged(OHProductQO::SourceType);
64
    
65
    
65
private:
66
private:
66
67
67
    GUI_Player   *m_player;
68
    GUI_Player   *m_player;
68
    Playlist     *m_playlist;
69
    std::shared_ptr<Playlist> m_playlist;
69
    DirBrowser   *m_cdb;
70
    DirBrowser   *m_cdb;
70
71
71
    UPnPClient::MRDH    m_rdr;
72
    UPnPClient::MRDH    m_rdr;
72
    RenderingControlQO *m_rdco;
73
    RenderingControlQO *m_rdco;
73
    AVTPlayer    *m_avto;
74
    AVTPlayer    *m_avto;
...
...
80
    
81
    
81
    CSettingsStorage *m_settings;
82
    CSettingsStorage *m_settings;
82
    QApplication     *m_app;
83
    QApplication     *m_app;
83
84
84
    bool             m_initialized;
85
    bool             m_initialized;
86
    // Can we send titles into the playlist (e.g. not OHradio).
87
    bool             m_playlistIsPlaylist;
85
    OHProductQO::SourceType m_ohsourcetype;
88
    OHProductQO::SourceType m_ohsourcetype;
86
    QString          m_renderer_friendly_name;
89
    QString          m_renderer_friendly_name;
87
90
88
    void init_connections();
91
    void init_connections();
89
    void renderer_connections();
92
    void renderer_connections();