Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changes to clean up BSTM from library_features branch on lp #5

Closed
wants to merge 3 commits into from
Closed

changes to clean up BSTM from library_features branch on lp #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8071874
changes to clean up BSTM from library_features branch on lp
May 20, 2013
318e6ab
made changes according to owens comments on github
May 20, 2013
de0210e
Merge branch 'master' into bstmCleanUp
May 22, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mixxx/src/dlgautodj.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ DlgAutoDJ::DlgAutoDJ(QWidget* parent, ConfigObject<ConfigValue>* pConfig,
playlistId = playlistDao.createPlaylist(AUTODJ_TABLE,
PlaylistDAO::PLHT_AUTO_DJ);
}
m_pAutoDJTableModel->setPlaylist(playlistId);
m_pAutoDJTableModel->setTableModel(playlistId);
m_pTrackTableView->loadTrackModel(m_pAutoDJTableModel);

// Override some playlist-view properties:
Expand Down
21 changes: 5 additions & 16 deletions mixxx/src/library/baseexternalplaylistmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,19 @@ BaseExternalPlaylistModel::BaseExternalPlaylistModel(
QString settingsNamespace, QString playlistsTable,
QString playlistTracksTable, QString trackSource)
: BaseSqlTableModel(parent, pTrackCollection,
pTrackCollection->getDatabase(),
settingsNamespace),
m_playlistsTable(playlistsTable),
m_playlistTracksTable(playlistTracksTable),
m_trackSource(trackSource),
m_pTrackCollection(pTrackCollection),
m_database(m_pTrackCollection->getDatabase()) {
connect(this, SIGNAL(doSearch(const QString&)),
this, SLOT(slotSearch(const QString&)));
m_trackSource(trackSource) {
}

BaseExternalPlaylistModel::~BaseExternalPlaylistModel() {
}

void BaseExternalPlaylistModel::setTableModel(int id){
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

space needed between ) and {

Q_UNUSED(id);
}

TrackPointer BaseExternalPlaylistModel::getTrack(const QModelIndex& index) const {
QString artist = index.sibling(
index.row(), fieldIndex("artist")).data().toString();
Expand Down Expand Up @@ -74,16 +73,6 @@ TrackPointer BaseExternalPlaylistModel::getTrack(const QModelIndex& index) const
return pTrack;
}

void BaseExternalPlaylistModel::search(const QString& searchText) {
// qDebug() << "BaseExternalPlaylistModel::search()" << searchText
// << QThread::currentThread();
emit(doSearch(searchText));
}

void BaseExternalPlaylistModel::slotSearch(const QString& searchText) {
BaseSqlTableModel::search(searchText);
}

bool BaseExternalPlaylistModel::isColumnInternal(int column) {
if (column == fieldIndex("track_id") ||
(PlayerManager::numPreviewDecks() == 0 && column == fieldIndex("preview"))) {
Expand Down
21 changes: 6 additions & 15 deletions mixxx/src/library/baseexternalplaylistmodel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,18 @@ class BaseExternalPlaylistModel : public BaseSqlTableModel {
QString playlistTracksTable, QString trackSource);
virtual ~BaseExternalPlaylistModel();

void setTableModel(int id=-1);
virtual TrackPointer getTrack(const QModelIndex& index) const;
virtual void search(const QString& searchText);
virtual bool isColumnInternal(int column);
virtual bool isColumnHiddenByDefault(int column);
virtual Qt::ItemFlags flags(const QModelIndex &index) const;
virtual void setPlaylist(QString path_name);
virtual TrackModel::CapabilitiesFlags getCapabilities() const;

private slots:
void slotSearch(const QString& searchText);

signals:
void doSearch(const QString& searchText);
bool isColumnInternal(int column);
bool isColumnHiddenByDefault(int column);
Qt::ItemFlags flags(const QModelIndex &index) const;
void setPlaylist(QString path_name);
TrackModel::CapabilitiesFlags getCapabilities() const;

private:
QString m_playlistsTable;
QString m_playlistTracksTable;
QString m_trackSource;

TrackCollection* m_pTrackCollection;
QSqlDatabase& m_database;
};

#endif /* BASEEXTERNALPLAYLISTMODEL_H */
28 changes: 9 additions & 19 deletions mixxx/src/library/baseexternaltrackmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,19 @@ BaseExternalTrackModel::BaseExternalTrackModel(QObject* parent,
QString settingsNamespace,
QString trackTable,
QString trackSource)
: BaseSqlTableModel(parent, pTrackCollection,
pTrackCollection->getDatabase(),
settingsNamespace),
m_pTrackCollection(pTrackCollection),
m_database(m_pTrackCollection->getDatabase()) {
connect(this, SIGNAL(doSearch(const QString&)),
this, SLOT(slotSearch(const QString&)));
: BaseSqlTableModel(parent, pTrackCollection, settingsNamespace),
m_trackTable(trackTable),
m_trackSource(trackSource) {
setTableModel();
}

void BaseExternalTrackModel::setTableModel(int id) {
Q_UNUSED(id);
QStringList columns;
columns << "id";
// TODO(XXX) preview column, needs a temporary view

setTable(trackTable, columns[0], columns,
m_pTrackCollection->getTrackSource(trackSource));
setTable(m_trackTable, columns[0], columns,
m_pTrackCollection->getTrackSource(m_trackSource));
setDefaultSort(fieldIndex("artist"), Qt::AscendingOrder);
initHeaderData();
}
Expand Down Expand Up @@ -74,15 +73,6 @@ TrackPointer BaseExternalTrackModel::getTrack(const QModelIndex& index) const {
return pTrack;
}

void BaseExternalTrackModel::search(const QString& searchText) {
// qDebug() << "BaseExternalTrackModel::search()" << searchText
// << QThread::currentThread();
emit(doSearch(searchText));
}

void BaseExternalTrackModel::slotSearch(const QString& searchText) {
BaseSqlTableModel::search(searchText);
}

bool BaseExternalTrackModel::isColumnInternal(int column) {
// Used for preview deck widgets.
Expand Down
20 changes: 7 additions & 13 deletions mixxx/src/library/baseexternaltrackmodel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,16 @@ class BaseExternalTrackModel : public BaseSqlTableModel {
QString trackSource);
virtual ~BaseExternalTrackModel();

void setTableModel(int id=-1);
TrackModel::CapabilitiesFlags getCapabilities() const;
virtual TrackPointer getTrack(const QModelIndex& index) const;
virtual void search(const QString& searchText);
virtual bool isColumnInternal(int column);
virtual bool isColumnHiddenByDefault(int column);
virtual Qt::ItemFlags flags(const QModelIndex &index) const;

private slots:
void slotSearch(const QString& searchText);

signals:
void doSearch(const QString& searchText);
TrackPointer getTrack(const QModelIndex& index) const;
bool isColumnInternal(int column);
bool isColumnHiddenByDefault(int column);
Qt::ItemFlags flags(const QModelIndex &index) const;

private:
TrackCollection* m_pTrackCollection;
QSqlDatabase& m_database;
QString m_trackTable;
QString m_trackSource;
};

#endif /* BASEEXTERNALTRACKMODEL_H */
27 changes: 14 additions & 13 deletions mixxx/src/library/baseplaylistfeature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
#include "widget/wlibrary.h"
#include "widget/wlibrarytextbrowser.h"

BasePlaylistFeature::BasePlaylistFeature(
QObject* parent, ConfigObject<ConfigValue>* pConfig,
TrackCollection* pTrackCollection,
QString rootViewName)
: LibraryFeature(parent),
m_pConfig(pConfig),
m_pTrackCollection(pTrackCollection),
m_playlistDao(pTrackCollection->getPlaylistDAO()),
m_trackDao(pTrackCollection->getTrackDAO()),
m_pPlaylistTableModel(NULL),
m_rootViewName(rootViewName) {
BasePlaylistFeature::BasePlaylistFeature(QObject* parent,
ConfigObject<ConfigValue>* pConfig,
TrackCollection* pTrackCollection,
QString rootViewName)
: LibraryFeature(parent),
m_pConfig(pConfig),
m_pTrackCollection(pTrackCollection),
m_playlistDao(pTrackCollection->getPlaylistDAO()),
m_trackDao(pTrackCollection->getTrackDAO()),
m_pPlaylistTableModel(NULL),
m_rootViewName(rootViewName) {
m_pCreatePlaylistAction = new QAction(tr("New Playlist"),this);
connect(m_pCreatePlaylistAction, SIGNAL(triggered()),
this, SLOT(slotCreatePlaylist()));
Expand Down Expand Up @@ -96,7 +96,7 @@ void BasePlaylistFeature::activateChild(const QModelIndex& index) {
QString playlistName = index.data().toString();
int playlistId = m_playlistDao.getPlaylistIdFromName(playlistName);
if (m_pPlaylistTableModel) {
m_pPlaylistTableModel->setPlaylist(playlistId);
m_pPlaylistTableModel->setTableModel(playlistId);
emit(showTrackModel(m_pPlaylistTableModel));
}
}
Expand Down Expand Up @@ -337,11 +337,12 @@ void BasePlaylistFeature::slotExportPlaylist() {
}

// Create a new table model since the main one might have an active search.
// This will only export songs that we think exist on default
QScopedPointer<PlaylistTableModel> pPlaylistTableModel(
new PlaylistTableModel(this, m_pTrackCollection,
"mixxx.db.model.playlist_export"));

pPlaylistTableModel->setPlaylist(m_pPlaylistTableModel->getPlaylist());
pPlaylistTableModel->setTableModel(m_pPlaylistTableModel->getPlaylist());
pPlaylistTableModel->setSort(pPlaylistTableModel->fieldIndex(PLAYLISTTRACKSTABLE_POSITION), Qt::AscendingOrder);
pPlaylistTableModel->select();

Expand Down
18 changes: 10 additions & 8 deletions mixxx/src/library/basesqltablemodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// basesqltablemodel.h
// Created by RJ Ryan ([email protected]) 1/29/2010

#include <QtAlgorithms>
Expand All @@ -20,16 +19,15 @@ const bool sDebug = false;

BaseSqlTableModel::BaseSqlTableModel(QObject* pParent,
TrackCollection* pTrackCollection,
QSqlDatabase db,
QString settingsNamespace)
: QAbstractTableModel(pParent),
TrackModel(db, settingsNamespace),
m_currentSearch(""),
m_previewDeckGroup(PlayerManager::groupForPreviewDeck(0)),
m_iPreviewDeckTrackId(-1),
TrackModel(pTrackCollection->getDatabase(), settingsNamespace),
m_pTrackCollection(pTrackCollection),
m_trackDAO(m_pTrackCollection->getTrackDAO()),
m_database(db) {
m_database(pTrackCollection->getDatabase()),
m_currentSearch(""),
m_previewDeckGroup(PlayerManager::groupForPreviewDeck(0)),
m_iPreviewDeckTrackId(-1) {
m_bInitialized = false;
m_bDirty = true;
m_iSortColumn = 0;
Expand Down Expand Up @@ -359,7 +357,7 @@ void BaseSqlTableModel::setSearch(const QString& searchText, const QString extra
m_bDirty = true;
}

void BaseSqlTableModel::search(const QString& searchText, const QString extraFilter) {
void BaseSqlTableModel::search(const QString& searchText, const QString& extraFilter) {
if (sDebug) {
qDebug() << this << "search" << searchText;
}
Expand Down Expand Up @@ -626,6 +624,10 @@ int BaseSqlTableModel::getTrackId(const QModelIndex& index) const {
return index.sibling(index.row(), fieldIndex(m_idColumn)).data().toInt();
}

TrackPointer BaseSqlTableModel::getTrack(const QModelIndex& index) const {
return m_trackDAO.getTrack(getTrackId(index));
}

QString BaseSqlTableModel::getTrackLocation(const QModelIndex& index) const {
if (!index.isValid()) {
return "";
Expand Down
Loading