Changeset View
Changeset View
Standalone View
Standalone View
src/mediaplayer_p.cpp
Show First 20 Lines • Show All 127 Lines • ▼ Show 20 Line(s) | 118 | for (i = changed.constBegin(); i != changed.constEnd(); ++i) { | |||
---|---|---|---|---|---|
128 | } else if (property == QLatin1String("Shuffle")) { | 128 | } else if (property == QLatin1String("Shuffle")) { | ||
129 | PROPERTY_CHANGED2(m_shuffle, stringToShuffle(value.toString()), shuffleChanged); | 129 | PROPERTY_CHANGED2(m_shuffle, stringToShuffle(value.toString()), shuffleChanged); | ||
130 | } else if (property == QLatin1String("Status")) { | 130 | } else if (property == QLatin1String("Status")) { | ||
131 | PROPERTY_CHANGED2(m_status, stringToStatus(value.toString()), statusChanged); | 131 | PROPERTY_CHANGED2(m_status, stringToStatus(value.toString()), statusChanged); | ||
132 | } else if (property == QLatin1String("Position")) { | 132 | } else if (property == QLatin1String("Position")) { | ||
133 | PROPERTY_CHANGED(m_position, toUInt, positionChanged); | 133 | PROPERTY_CHANGED(m_position, toUInt, positionChanged); | ||
134 | } else if (property == QLatin1String("Track")) { | 134 | } else if (property == QLatin1String("Track")) { | ||
135 | m_track = variantToTrack(value); | 135 | m_track = variantToTrack(value); | ||
136 | Q_EMIT q.data()->trackChanged(m_track); | 136 | Q_EMIT q.lock()->trackChanged(m_track); | ||
137 | } | 137 | } | ||
138 | } | 138 | } | ||
139 | 139 | | |||
140 | for (const QString &property : invalidated) { | 140 | for (const QString &property : invalidated) { | ||
141 | if (property == QLatin1String("Name")) { | 141 | if (property == QLatin1String("Name")) { | ||
142 | PROPERTY_INVALIDATED(m_name, QString(), nameChanged); | 142 | PROPERTY_INVALIDATED(m_name, QString(), nameChanged); | ||
143 | } else if (property == QLatin1String("Equalizer")) { | 143 | } else if (property == QLatin1String("Equalizer")) { | ||
144 | PROPERTY_INVALIDATED(m_equalizer, MediaPlayer::EqualizerOff, equalizerChanged); | 144 | PROPERTY_INVALIDATED(m_equalizer, MediaPlayer::EqualizerOff, equalizerChanged); | ||
145 | } else if (property == QLatin1String("Repeat")) { | 145 | } else if (property == QLatin1String("Repeat")) { | ||
146 | PROPERTY_INVALIDATED(m_repeat, MediaPlayer::RepeatOff, repeatChanged); | 146 | PROPERTY_INVALIDATED(m_repeat, MediaPlayer::RepeatOff, repeatChanged); | ||
147 | } else if (property == QLatin1String("Shuffle")) { | 147 | } else if (property == QLatin1String("Shuffle")) { | ||
148 | PROPERTY_INVALIDATED(m_shuffle, MediaPlayer::ShuffleOff, shuffleChanged); | 148 | PROPERTY_INVALIDATED(m_shuffle, MediaPlayer::ShuffleOff, shuffleChanged); | ||
149 | } else if (property == QLatin1String("Status")) { | 149 | } else if (property == QLatin1String("Status")) { | ||
150 | PROPERTY_INVALIDATED(m_status, MediaPlayer::Error, statusChanged); | 150 | PROPERTY_INVALIDATED(m_status, MediaPlayer::Error, statusChanged); | ||
151 | } else if (property == QLatin1String("Position")) { | 151 | } else if (property == QLatin1String("Position")) { | ||
152 | PROPERTY_INVALIDATED(m_position, 0, positionChanged); | 152 | PROPERTY_INVALIDATED(m_position, 0, positionChanged); | ||
153 | } else if (property == QLatin1String("Track")) { | 153 | } else if (property == QLatin1String("Track")) { | ||
154 | m_track = variantToTrack(QVariant()); | 154 | m_track = variantToTrack(QVariant()); | ||
155 | Q_EMIT q.data()->trackChanged(m_track); | 155 | Q_EMIT q.lock()->trackChanged(m_track); | ||
156 | } | 156 | } | ||
157 | } | 157 | } | ||
158 | } | 158 | } | ||
159 | 159 | | |||
160 | MediaPlayerTrack MediaPlayerPrivate::variantToTrack(const QVariant &variant) const | 160 | MediaPlayerTrack MediaPlayerPrivate::variantToTrack(const QVariant &variant) const | ||
161 | { | 161 | { | ||
162 | const QVariantMap &properties = qdbus_cast<QVariantMap>(variant); | 162 | const QVariantMap &properties = qdbus_cast<QVariantMap>(variant); | ||
163 | return MediaPlayerTrack(properties); | 163 | return MediaPlayerTrack(properties); | ||
164 | } | 164 | } | ||
165 | 165 | | |||
166 | } // namespace BluezQt | 166 | } // namespace BluezQt |