Switch to unified view

a/dirbrowser/cdbrowser.h b/dirbrowser/cdbrowser.h
...
...
23
#include <time.h>
23
#include <time.h>
24
24
25
#include <vector>
25
#include <vector>
26
#include <iostream>
26
#include <iostream>
27
#include <unordered_set>
27
#include <unordered_set>
28
#include <unordered_map>
28
29
29
#ifdef USING_WEBENGINE
30
#ifdef USING_WEBENGINE
30
#include <QWebEngineView>
31
#include <QWebEngineView>
31
#define QWEBVIEW QWebEngineView
32
#define QWEBVIEW QWebEngineView
32
#define QWEBPAGE QWebEnginePage
33
#define QWEBPAGE QWebEnginePage
...
...
44
#include <QMouseEvent>
45
#include <QMouseEvent>
45
46
46
#include "libupnpp/control/description.hxx"
47
#include "libupnpp/control/description.hxx"
47
#include "libupnpp/control/mediaserver.hxx"
48
#include "libupnpp/control/mediaserver.hxx"
48
#include "libupnpp/control/cdirectory.hxx"
49
#include "libupnpp/control/cdirectory.hxx"
50
#include "libupnpp/control/cdircontent.hxx"
49
51
50
#include "HelperStructs/MetaData.h"
52
#include "HelperStructs/MetaData.h"
51
#include "HelperStructs/globals.h"
53
#include "HelperStructs/globals.h"
52
54
53
#include "randplayer.h"
55
#include "randplayer.h"
...
...
127
                QPoint());
129
                QPoint());
128
    void curpathClicked(unsigned int i);
130
    void curpathClicked(unsigned int i);
129
    void waitForPage();
131
    void waitForPage();
130
    void mySetHtml(const QString&);
132
    void mySetHtml(const QString&);
131
    void doCreatePopupMenu();
133
    void doCreatePopupMenu();
134
135
    static const std::string CTTitleStartMarker;
136
    void init_HTML();
137
    static QString CTToHtml(unsigned int idx,
138
                            const UPnPClient::UPnPDirObject& e);
139
    static QString ItemToHtml(unsigned int idx,
140
                              const UPnPClient::UPnPDirObject&, int maxartlen);
141
    static QString DSToHtml(unsigned int idx,
142
                            const UPnPClient::UPnPDeviceDesc& dev);
143
    static QString initialServersPage();
144
    static QString emptyServersPage();
132
    
145
    
133
    // When displaying the servers list, we periodically check the
146
    // When displaying the servers list, we periodically check the
134
    // server pool state. The last seen Media Server descriptions are
147
    // server pool state. The last seen Media Server descriptions are
135
    // stored in m_msdescs for diffing with the new ones and deciding
148
    // stored in m_msdescs for diffing with the new ones and deciding
136
    // if we need to redraw. Timer and servers list are only used
149
    // if we need to redraw. Timer and servers list are only used
...
...
145
    // Search caps of current server
158
    // Search caps of current server
146
    std::set<std::string> m_searchcaps;
159
    std::set<std::string> m_searchcaps;
147
160
148
    std::vector<CtPathElt> m_curpath;
161
    std::vector<CtPathElt> m_curpath;
149
162
163
    std::unordered_map<std::string, std::string> m_alphamap;
164
    char m_curinitial{0};
165
    
150
    // Threaded objects to perform directory reads and recursive walks
166
    // Threaded objects to perform directory reads and recursive walks
151
    CDBrowseQO *m_reader;
167
    CDBrowseQO *m_reader;
152
    RecursiveReaper    *m_reaper;
168
    RecursiveReaper    *m_reaper;
153
    void deleteReaders();
169
    void deleteReaders();
154
    bool newCds(int cdsidx);
170
    bool newCds(int cdsidx);