|
a/playlist/playlistohrd.cpp |
|
b/playlist/playlistohrd.cpp |
|
... |
|
... |
| 32 |
this, SLOT(onRemoteMetaArray(const MetaDataList&)));
|
32 |
this, SLOT(onRemoteMetaArray(const MetaDataList&)));
|
| 33 |
connect(m_ohrdo, SIGNAL(currentTrackId(int)),
|
33 |
connect(m_ohrdo, SIGNAL(currentTrackId(int)),
|
| 34 |
this, SLOT(onRemoteCurrentTrackid(int)));
|
34 |
this, SLOT(onRemoteCurrentTrackid(int)));
|
| 35 |
connect(m_ohrdo, SIGNAL(audioStateChanged(int, const char *)),
|
35 |
connect(m_ohrdo, SIGNAL(audioStateChanged(int, const char *)),
|
| 36 |
this, SLOT(onRemoteTpState(int, const char *)));
|
36 |
this, SLOT(onRemoteTpState(int, const char *)));
|
|
|
37 |
connect(m_ohrdo, SIGNAL(connectionLost()), this, SIGNAL(connectionLost()));
|
| 37 |
|
38 |
|
| 38 |
// Connections from local playlist to openhome
|
|
|
| 39 |
connect(this, SIGNAL(sig_row_activated(int)),
|
|
|
| 40 |
m_ohrdo, SLOT(setIdx(int)));
|
|
|
| 41 |
connect(this, SIGNAL(sig_pause()), m_ohrdo, SLOT(pause()));
|
|
|
| 42 |
connect(this, SIGNAL(sig_stop()), m_ohrdo, SLOT(stop()));
|
|
|
| 43 |
connect(this, SIGNAL(sig_resume_play()), m_ohrdo, SLOT(play()));
|
|
|
| 44 |
if (m_ohifo) {
|
39 |
if (m_ohifo) {
|
| 45 |
connect(m_ohifo, SIGNAL(metatextChanged(const MetaData&)),
|
40 |
connect(m_ohifo, SIGNAL(metatextChanged(const MetaData&)),
|
| 46 |
this, SIGNAL(sig_track_metadata(const MetaData&)));
|
41 |
this, SIGNAL(sig_track_metadata(const MetaData&)));
|
| 47 |
}
|
42 |
}
|
|
|
43 |
|
|
|
44 |
// Connections from local playlist to openhome
|
|
|
45 |
connect(this, SIGNAL(sig_pause()), m_ohrdo, SLOT(pause()));
|
|
|
46 |
connect(this, SIGNAL(sig_stop()), m_ohrdo, SLOT(stop()));
|
|
|
47 |
connect(this, SIGNAL(sig_resume_play()), m_ohrdo, SLOT(play()));
|
| 48 |
}
|
48 |
}
|
| 49 |
|
49 |
|
| 50 |
static bool samelist(const MetaDataList& mdv1, const MetaDataList& mdv2)
|
50 |
static bool samelist(const MetaDataList& mdv1, const MetaDataList& mdv2)
|
| 51 |
{
|
51 |
{
|
| 52 |
if (mdv1.size() != mdv2.size())
|
52 |
if (mdv1.size() != mdv2.size())
|
|
... |
|
... |
| 108 |
emit sig_track_metadata(md);
|
108 |
emit sig_track_metadata(md);
|
| 109 |
}
|
109 |
}
|
| 110 |
}
|
110 |
}
|
| 111 |
}
|
111 |
}
|
| 112 |
|
112 |
|
|
|
113 |
void PlaylistOHRD::psl_change_track_impl(int idx) {
|
|
|
114 |
m_ohrdo->setIdx(idx);
|
|
|
115 |
}
|
|
|
116 |
|
| 113 |
void PlaylistOHRD::psl_play()
|
117 |
void PlaylistOHRD::psl_play()
|
| 114 |
{
|
118 |
{
|
| 115 |
if (m_tpstate == AUDIO_STOPPED && valid_row(m_selection_min_row)) {
|
119 |
if (m_tpstate == AUDIO_STOPPED && valid_row(m_selection_min_row)) {
|
| 116 |
emit sig_row_activated(m_selection_min_row);
|
120 |
m_ohrdo->setIdx(m_selection_min_row);
|
| 117 |
} else {
|
121 |
} else {
|
| 118 |
emit sig_resume_play();
|
122 |
emit sig_resume_play();
|
| 119 |
}
|
123 |
}
|
| 120 |
}
|
124 |
}
|
| 121 |
|
125 |
|