upplay / Code / Diff of /application.cpp

Diff of /application.cpp [80a90c] .. [162853]

Switch to unified view


...
#endif

#define CONNECT(a,b,c,d) m_app->connect(a, SIGNAL(b), c, SLOT(d), \
                                        Qt::UniqueConnection)

static UPPrefs g_prefs;

UPnPDeviceDirectory *superdir;

static MRDH getRenderer(const string& name, bool isfriendlyname)
{
    if (superdir == 0) {
...

    QString version = UPPLAY_VERSION;
    m_settings->setVersion(version);

    m_player = new GUI_Player(this);
    g_prefs.setParent(m_player);
    m_player->enableSourceSelect(false);
    
    m_ui_playlist = new GUI_Playlist(m_player->getParentOfPlaylist(), 0);
    m_player->setPlaylistWidget(m_ui_playlist);

...

    if (!m_playlist) {
        qDebug() << "Application::createPlaylistForOpenHomeSource: "
            "could not create playlist object";
    }
}

void Application::onDirSortOrder()
{
    g_prefs.onShowPrefs(UPPrefs::PTAB_DIRSORT);
}

void Application::onSourceTypeChanged(OHProductQO::SourceType tp)
{
    //qDebug() << "Application::onSourceTypeChanged: " << int(tp);
...
    CONNECT(m_player, sig_choose_renderer(), this, chooseRenderer());
    CONNECT(m_player, sig_open_songcast(), this, openSongcast());
    CONNECT(m_player, sig_choose_source(), this, chooseSource());
    CONNECT(m_player, sig_skin_changed(bool), m_cdb, setStyleSheet(bool));
    CONNECT(m_player, showSearchPanel(bool), m_cdb, showSearchPanel(bool));

    CONNECT(m_player, sig_preferences(), &g_prefs, onShowPrefs());
    CONNECT(&g_prefs, sig_prefsChanged(), m_cdb, onSortprefs());
    CONNECT(m_cdb, sig_next_group_html(QString),
            m_ui_playlist, psl_next_group_html(QString));
    CONNECT(m_cdb, sig_sort_order(), this, onDirSortOrder());
    CONNECT(m_player, sig_sortprefs(), m_cdb, onSortprefs());
}

	a/application.cpp		b/application.cpp
	...		...
69	#endif	69	#endif
70		70
71	#define CONNECT(a,b,c,d) m_app->connect(a, SIGNAL(b), c, SLOT(d), \	71	#define CONNECT(a,b,c,d) m_app->connect(a, SIGNAL(b), c, SLOT(d), \
72	Qt::UniqueConnection)	72	Qt::UniqueConnection)
73		73
		74	static UPPrefs g_prefs;
		75
74	UPnPDeviceDirectory *superdir;	76	UPnPDeviceDirectory *superdir;
75		77
76	static MRDH getRenderer(const string& name, bool isfriendlyname)	78	static MRDH getRenderer(const string& name, bool isfriendlyname)
77	{	79	{
78	if (superdir == 0) {	80	if (superdir == 0) {
	...		...
110		112
111	QString version = UPPLAY_VERSION;	113	QString version = UPPLAY_VERSION;
112	m_settings->setVersion(version);	114	m_settings->setVersion(version);
113		115
114	m_player = new GUI_Player(this);	116	m_player = new GUI_Player(this);
		117	g_prefs.setParent(m_player);
115	m_player->enableSourceSelect(false);	118	m_player->enableSourceSelect(false);
116		119
117	m_ui_playlist = new GUI_Playlist(m_player->getParentOfPlaylist(), 0);	120	m_ui_playlist = new GUI_Playlist(m_player->getParentOfPlaylist(), 0);
118	m_player->setPlaylistWidget(m_ui_playlist);	121	m_player->setPlaylistWidget(m_ui_playlist);
119		122
	...		...
503		506
504	if (!m_playlist) {	507	if (!m_playlist) {
505	qDebug() << "Application::createPlaylistForOpenHomeSource: "	508	qDebug() << "Application::createPlaylistForOpenHomeSource: "
506	"could not create playlist object";	509	"could not create playlist object";
507	}	510	}
		511	}
		512
		513	void Application::onDirSortOrder()
		514	{
		515	g_prefs.onShowPrefs(UPPrefs::PTAB_DIRSORT);
508	}	516	}
509		517
510	void Application::onSourceTypeChanged(OHProductQO::SourceType tp)	518	void Application::onSourceTypeChanged(OHProductQO::SourceType tp)
511	{	519	{
512	//qDebug() << "Application::onSourceTypeChanged: " << int(tp);	520	//qDebug() << "Application::onSourceTypeChanged: " << int(tp);
	...		...
657	CONNECT(m_player, sig_choose_renderer(), this, chooseRenderer());	665	CONNECT(m_player, sig_choose_renderer(), this, chooseRenderer());
658	CONNECT(m_player, sig_open_songcast(), this, openSongcast());	666	CONNECT(m_player, sig_open_songcast(), this, openSongcast());
659	CONNECT(m_player, sig_choose_source(), this, chooseSource());	667	CONNECT(m_player, sig_choose_source(), this, chooseSource());
660	CONNECT(m_player, sig_skin_changed(bool), m_cdb, setStyleSheet(bool));	668	CONNECT(m_player, sig_skin_changed(bool), m_cdb, setStyleSheet(bool));
661	CONNECT(m_player, showSearchPanel(bool), m_cdb, showSearchPanel(bool));	669	CONNECT(m_player, showSearchPanel(bool), m_cdb, showSearchPanel(bool));
662	static UPPrefs g_prefs(m_player);
663	CONNECT(m_player, sig_preferences(), &g_prefs, onShowPrefs());	670	CONNECT(m_player, sig_preferences(), &g_prefs, onShowPrefs());
664	CONNECT(&g_prefs, sig_prefsChanged(), m_cdb, onSortprefs());	671	CONNECT(&g_prefs, sig_prefsChanged(), m_cdb, onSortprefs());
665	CONNECT(m_cdb, sig_next_group_html(QString),	672	CONNECT(m_cdb, sig_next_group_html(QString),
666	m_ui_playlist, psl_next_group_html(QString));	673	m_ui_playlist, psl_next_group_html(QString));
		674	CONNECT(m_cdb, sig_sort_order(), this, onDirSortOrder());
667	CONNECT(m_player, sig_sortprefs(), m_cdb, onSortprefs());	675	CONNECT(m_player, sig_sortprefs(), m_cdb, onSortprefs());
668	}	676	}