| added | playlist/Playlist.h |
| added | playlist/Playlist_GUI_slots.cpp |
| added | playlist/Playlist.cpp |
| changed | GUI/player/GUI_Player.cpp |
| changed | GUI/player/GUI_Player.h |
| changed | GUI/player/GUI_PlayerConnections.cpp |
| changed | GUI/player/GUI_PlayerCover.cpp |
| changed | GUI/player/GUI_PlayerMenubar.cpp |
| changed | GUI/player/GUI_PlayerPlugins.cpp |
| changed | GUI/player/GUI_TrayIcon.cpp |
| changed | GUI/player/GUI_TrayIcon.h |
| changed | HelperStructs/Helper.cpp |
| changed | .gitignore |
| changed | upplay.cpp |
| changed | upplay.pro |
| copied | cdbrowser.cpp -> contentDirectory/cdbrowser.cpp |
| copied | cdbrowser.h -> contentDirectory/cdbrowser.h |
| copied | dirreader.h -> contentDirectory/dirreader.h |
| copied | mainw.h -> GUI/browser/browserw.h |
| copied | mainw.ui -> GUI/browser/browserw.ui |
cdbrowser.cpp to contentDirectory/cdbrowser.cpp
File was renamed.
cdbrowser.h to contentDirectory/cdbrowser.h
File was renamed.
dirreader.h to contentDirectory/dirreader.h
--- a/dirreader.h +++ b/contentDirectory/dirreader.h @@ -27,7 +27,6 @@ #include <upnp/upnp.h> #include "libupnpp/control/cdirectory.hxx" -//#include "libupnpp/cdircontent.hxx" class DirReader : public QThread { Q_OBJECT; @@ -37,6 +36,7 @@ : QThread(parent), m_serv(server), m_objid(objid) { } + ~DirReader() { for (auto& entry: m_slices) @@ -82,7 +82,9 @@ private: UPnPClient::CDSH m_serv; std::string m_objid; - std::vector<UPnPDirContent*> m_slices; + // We use a list (vs vector) so that existing element addresses + // are unchanged when we append + std::list<UPnPDirContent*> m_slices; int m_status; };
mainw.h to GUI/browser/browserw.h
--- a/mainw.h +++ b/GUI/browser/browserw.h @@ -17,17 +17,17 @@ #ifndef _MAINW_H_INCLUDED_ #define _MAINW_H_INCLUDED_ -#include <QMainWindow> +#include <QWidget> #include "ui_mainw.h" -class MainWindow : public QMainWindow, public Ui::MainWindow +class BrowserW : public QWidget, public Ui::BrowserW { Q_OBJECT public: - MainWindow(QWidget * parent = 0) - : QMainWindow(parent) + BrowserW(QWidget * parent = 0) + : QWidget(parent) { setupUi(this); //init();
mainw.ui to GUI/browser/browserw.ui
--- a/mainw.ui +++ b/GUI/browser/browserw.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MainWindow</class> - <widget class="QMainWindow" name="MainWindow"> + <class>BrowserW</class> + <widget class="QWidget" name="topWidget"> <property name="geometry"> <rect> <x>0</x> @@ -10,28 +10,12 @@ <height>600</height> </rect> </property> - <property name="windowTitle"> - <string>MainWindow</string> - </property> - <widget class="QWidget" name="centralwidget"> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="CDBrowser" name="cdbrowser"> - </widget> - </item> - </layout> - </widget> - <widget class="QMenuBar" name="menubar"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>800</width> - <height>27</height> - </rect> - </property> - </widget> - <widget class="QStatusBar" name="statusbar"/> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="CDBrowser" name="cdbrowser"> + </widget> + </item> + </layout> </widget> <resources/> <connections/>