parent
821e524b5f
commit
f312b04df7
|
@ -238,7 +238,7 @@ add_executable(clementine
|
|||
)
|
||||
target_link_libraries(clementine clementine_lib)
|
||||
|
||||
set_property(TARGET clementine
|
||||
set_property(TARGET clementine clementine_lib
|
||||
PROPERTY COMPILE_FLAGS
|
||||
"-Wnon-virtual-dtor -Woverloaded-virtual -Wall"
|
||||
)
|
||||
|
|
|
@ -701,6 +701,8 @@ void MainWindow::SelectionSetValue() {
|
|||
case Playlist::Column_Genre:
|
||||
song.set_genre(column_value.toString());
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
song.Save();
|
||||
playlist_->item_at(row)->Reload();
|
||||
|
|
|
@ -137,7 +137,7 @@ int Playlist::NextVirtualIndex(int i) const {
|
|||
Song last_song = current_item_metadata();
|
||||
for (int j=i+1 ; j<virtual_items_.count(); ++j) {
|
||||
Song this_song = item_at(virtual_items_[j])->Metadata();
|
||||
if ((last_song.is_compilation() && this_song.is_compilation() ||
|
||||
if (((last_song.is_compilation() && this_song.is_compilation()) ||
|
||||
last_song.artist() == this_song.artist()) &&
|
||||
last_song.album() == this_song.album()) {
|
||||
return j; // Found one
|
||||
|
@ -471,6 +471,7 @@ QString Playlist::column_name(Column column) {
|
|||
case Column_Filetype: return tr("File type");
|
||||
case Column_DateModified: return tr("Date modified");
|
||||
case Column_DateCreated: return tr("Date created");
|
||||
default: return QString();
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
|
|
@ -142,25 +142,26 @@ class Playlist : public QAbstractListModel {
|
|||
void UpdateScrobblePoint();
|
||||
void ReshuffleIndices();
|
||||
int NextVirtualIndex(int i) const;
|
||||
|
||||
|
||||
private:
|
||||
QList<PlaylistItem*> items_;
|
||||
QList<int> virtual_items_; // Contains the indices into items_ in the order
|
||||
// that they will be played.
|
||||
bool is_shuffled_;
|
||||
|
||||
QPersistentModelIndex current_item_;
|
||||
QPersistentModelIndex stop_after_;
|
||||
bool current_is_paused_;
|
||||
int current_virtual_index_;
|
||||
|
||||
bool is_shuffled_;
|
||||
|
||||
int scrobble_point_;
|
||||
bool has_scrobbled_;
|
||||
|
||||
PlaylistSequence* playlist_sequence_;
|
||||
|
||||
// Hack to stop QTreeView::setModel sorting the playlist
|
||||
bool ignore_sorting_;
|
||||
|
||||
PlaylistSequence* playlist_sequence_;
|
||||
};
|
||||
|
||||
#endif // PLAYLIST_H
|
||||
|
|
Loading…
Reference in New Issue