EngineBase: Use enum class for TrackChangeType
This commit is contained in:
parent
717ebbbb24
commit
f40f43861d
|
@ -385,7 +385,7 @@ void Player::NextItem(const EngineBase::TrackChangeFlags change, const Playlist:
|
||||||
Playlist *active_playlist = app_->playlist_manager()->active();
|
Playlist *active_playlist = app_->playlist_manager()->active();
|
||||||
|
|
||||||
// If we received too many errors in auto change, with repeat enabled, we stop
|
// If we received too many errors in auto change, with repeat enabled, we stop
|
||||||
if (change == EngineBase::TrackChangeType::Auto) {
|
if (change & EngineBase::TrackChangeType::Auto) {
|
||||||
const PlaylistSequence::RepeatMode repeat_mode = active_playlist->sequence()->repeat_mode();
|
const PlaylistSequence::RepeatMode repeat_mode = active_playlist->sequence()->repeat_mode();
|
||||||
if (repeat_mode != PlaylistSequence::RepeatMode::Off) {
|
if (repeat_mode != PlaylistSequence::RepeatMode::Off) {
|
||||||
if ((repeat_mode == PlaylistSequence::RepeatMode::Track && nb_errors_received_ >= 3) || (nb_errors_received_ >= app_->playlist_manager()->active()->filter()->rowCount())) {
|
if ((repeat_mode == PlaylistSequence::RepeatMode::Track && nb_errors_received_ >= 3) || (nb_errors_received_ >= app_->playlist_manager()->active()->filter()->rowCount())) {
|
||||||
|
@ -706,7 +706,7 @@ void Player::PlayAt(const int index, const quint64 offset_nanosec, EngineBase::T
|
||||||
pause_time_ = QDateTime();
|
pause_time_ = QDateTime();
|
||||||
play_offset_nanosec_ = offset_nanosec;
|
play_offset_nanosec_ = offset_nanosec;
|
||||||
|
|
||||||
if (current_item_ && change == EngineBase::TrackChangeType::Manual && engine_->position_nanosec() != engine_->length_nanosec()) {
|
if (current_item_ && change & EngineBase::TrackChangeType::Manual && engine_->position_nanosec() != engine_->length_nanosec()) {
|
||||||
emit TrackSkipped(current_item_);
|
emit TrackSkipped(current_item_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -75,7 +75,7 @@ class EngineBase : public QObject {
|
||||||
Error
|
Error
|
||||||
};
|
};
|
||||||
|
|
||||||
enum TrackChangeType {
|
enum class TrackChangeType {
|
||||||
// One of:
|
// One of:
|
||||||
First = 0x01,
|
First = 0x01,
|
||||||
Manual = 0x02,
|
Manual = 0x02,
|
||||||
|
@ -254,5 +254,6 @@ Q_DECLARE_METATYPE(EngineBase::Type)
|
||||||
Q_DECLARE_METATYPE(EngineBase::State)
|
Q_DECLARE_METATYPE(EngineBase::State)
|
||||||
Q_DECLARE_METATYPE(EngineBase::TrackChangeType)
|
Q_DECLARE_METATYPE(EngineBase::TrackChangeType)
|
||||||
Q_DECLARE_METATYPE(EngineBase::OutputDetails)
|
Q_DECLARE_METATYPE(EngineBase::OutputDetails)
|
||||||
|
Q_DECLARE_OPERATORS_FOR_FLAGS(EngineBase::TrackChangeFlags)
|
||||||
|
|
||||||
#endif // ENGINEBASE_H
|
#endif // ENGINEBASE_H
|
||||||
|
|
Loading…
Reference in New Issue