From 20f0fa742f39f265ec73811d08bc315162a41d75 Mon Sep 17 00:00:00 2001 From: Herwig Birke Date: Wed, 7 Mar 2018 16:52:32 +0100 Subject: [PATCH] . --- calbum.cpp | 18 +-- calbum.h | 12 +- cdatabase.cpp | 2 +- cmainwindow.cpp | 315 ++++++++++++++++++------------------------------ cmainwindow.h | 21 +--- cmainwindow.ui | 8 +- cmediainfo.cpp | 8 +- ctrack.cpp | 16 +-- ctrack.h | 10 +- 9 files changed, 150 insertions(+), 260 deletions(-) diff --git a/calbum.cpp b/calbum.cpp index b182211..eeeb37d 100644 --- a/calbum.cpp +++ b/calbum.cpp @@ -2,9 +2,9 @@ #include "ctrack.h" -cAlbum::cAlbum(const QString& szAlbum, const QString &szLeadArtist) : +cAlbum::cAlbum(const QString& szAlbum, const QString &szBand) : m_szAlbum(szAlbum), - m_szLeadArtist(szLeadArtist) + m_szBand(szBand) { } @@ -18,19 +18,19 @@ QString cAlbum::album() return(m_szAlbum); } -void cAlbum::setLeadArtist(const QString& szLeadArtist) +void cAlbum::setBand(const QString& szBand) { - m_szLeadArtist = szLeadArtist; + m_szBand = szBand; } -QString cAlbum::leadArtist() +QString cAlbum::band() { - return(m_szLeadArtist); + return(m_szBand); } -cTrack* cAlbum::addTrack(const QString& szTitle, const qint16& trackNumber, const QString& szPartOfSet, const QString& szBand, const QString& szComposer, const QDate &recordingTime) +cTrack* cAlbum::addTrack(const QString& szTitle, const QString &szTrackNumber, const QString& szPartOfSet, const QString& szBand, const QString& szComposer, const QDate &recordingTime) { - return(m_trackList.add(this, szTitle, trackNumber, szPartOfSet, szBand, szComposer, recordingTime)); + return(m_trackList.add(this, szTitle, szTrackNumber, szPartOfSet, szBand, szComposer, recordingTime)); } cTrackList cAlbum::trackList() @@ -38,7 +38,7 @@ cTrackList cAlbum::trackList() return(m_trackList); } -cAlbum* cAlbumList::add(const QString& szAlbum, const QString& szLeadArtist) +cAlbum* cAlbumList::add(const QString& szAlbum, const QString& szBand) { QString szAlbum1 = szAlbum; QString szLeadArtist1 = szLeadArtist; diff --git a/calbum.h b/calbum.h index 1dd0f1a..6864e03 100644 --- a/calbum.h +++ b/calbum.h @@ -15,19 +15,19 @@ class cTrackList; class cAlbum { public: - cAlbum(const QString& szAlbum, const QString& szLeadArtist); + cAlbum(const QString& szAlbum, const QString& szBand); void setAlbum(const QString& szAlbum); QString album(); - void setLeadArtist(const QString& szLeadArtist); - QString leadArtist(); + void setBand(const QString& szBand); + QString band(); - cTrack* addTrack(const QString& szTitle, const qint16& trackNumber, const QString& szPartOfSet, const QString& szBand, const QString& szComposer, const QDate& recordingTime); + cTrack* addTrack(const QString& szTitle, const QString& szTrackNumber, const QString& szPartOfSet, const QString& szBand, const QString& szComposer, const QDate& recordingTime); cTrackList trackList(); private: QString m_szAlbum; - QString m_szLeadArtist; + QString m_szBand; cTrackList m_trackList; }; @@ -36,7 +36,7 @@ Q_DECLARE_METATYPE(cAlbum*) class cAlbumList : public QList { public: - cAlbum* add(const QString& szAlbum, const QString &szLeadArtist); + cAlbum* add(const QString& szAlbum, const QString &szBand); }; diff --git a/cdatabase.cpp b/cdatabase.cpp index 8845293..821e561 100644 --- a/cdatabase.cpp +++ b/cdatabase.cpp @@ -93,7 +93,7 @@ int cDatabase::initDB() " album TEXT, " " title TEXT, " " copyright TEXT, " - " tracknumber INTEGER, " + " trackNumber TEXT, " " contentGroupDescription TEXT, " " subTitle TEXT, " " originalAlbum TEXT, " diff --git a/cmainwindow.cpp b/cmainwindow.cpp index a6d3ad1..0f06f52 100644 --- a/cmainwindow.cpp +++ b/cmainwindow.cpp @@ -74,31 +74,12 @@ cMainWindow::cMainWindow(QWidget *parent) : m_lpDB = new cDatabase(this); m_lpMusicListModel = new QStandardItemModel(0, 3); - ui->m_lpMusicListOriginal->setModel(m_lpMusicListModel); - ui->m_lpMusicListOriginal->setItemDelegate(new cMusicViewItemDelegate(ui->m_lpMusicListOriginal)); - ui->m_lpMusicListNew->setModel(m_lpMusicListModel); - ui->m_lpMusicListNew->setItemDelegate(new cMusicViewItemDelegate(ui->m_lpMusicListNew)); + ui->m_lpMusicList->setModel(m_lpMusicListModel); +// ui->m_lpMusicList->setItemDelegate(new cMusicViewItemDelegate(ui->m_lpMusicList)); - connect(ui->m_lpMusicListOriginal, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onCustomContextMenuRequestedOriginal(QPoint))); - connect(ui->m_lpMusicListNew, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onCustomContextMenuRequestedNew(QPoint))); - - connect(ui->m_lpMusicListOriginal, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(onDoubleClickedOriginal(QModelIndex))); - connect(ui->m_lpMusicListNew, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(onDoubleClickedNew(QModelIndex))); - - connect(ui->m_lpMusicListOriginal, SIGNAL(pressed(QModelIndex)), this, SLOT(onPressedOriginal(QModelIndex))); - connect(ui->m_lpMusicListNew, SIGNAL(pressed(QModelIndex)), this, SLOT(onPressedNew(QModelIndex))); - - connect(ui->m_lpMusicListOriginal, SIGNAL(expanded(QModelIndex)), this, SLOT(onExpandedOriginal(QModelIndex))); - connect(ui->m_lpMusicListNew, SIGNAL(expanded(QModelIndex)), this, SLOT(onExpandedNew(QModelIndex))); - - connect(ui->m_lpMusicListOriginal, SIGNAL(collapsed(QModelIndex)), this, SLOT(onCollapsedOriginal(QModelIndex))); - connect(ui->m_lpMusicListNew, SIGNAL(collapsed(QModelIndex)), this, SLOT(onCollapsedNew(QModelIndex))); - - connect(ui->m_lpMusicListOriginal->selectionModel(), &QItemSelectionModel::selectionChanged, this, &cMainWindow::onSelectionChangedOriginal); - connect(ui->m_lpMusicListNew->selectionModel(), &QItemSelectionModel::selectionChanged, this, &cMainWindow::onSelectionChangedNew); - - connect(ui->m_lpMusicListOriginal->verticalScrollBar(), &QScrollBar::valueChanged, this, &cMainWindow::onScrollbarValueChangedOriginal); - connect(ui->m_lpMusicListNew->verticalScrollBar(), &QScrollBar::valueChanged, this, &cMainWindow::onScrollbarValueChangedNew); + connect(ui->m_lpMusicList, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onCustomContextMenuRequested(QPoint))); + connect(ui->m_lpMusicList, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(onDoubleClicked(QModelIndex))); + connect(ui->m_lpMusicList, SIGNAL(pressed(QModelIndex)), this, SLOT(onPressed(QModelIndex))); loadDB(); displayDB(); @@ -136,7 +117,7 @@ void cMainWindow::loadDB() QString szOldAlbum = ""; QString szAlbum; QString szTitle; - qint16 iTrackNumber; + QString szTrackNumber; QString szPartOfSet; QString szLeadArtist; QString szBand; @@ -145,7 +126,72 @@ void cMainWindow::loadDB() cAlbum* lpAlbum = 0; - query.prepare("SELECT leadArtist, album, title, trackNumber, partOfSet, band, composer, recordingTime FROM file ORDER BY leadArtist, album, trackNumber;"); + query.prepare("SELECT id, " + " fileName, " + " fileSize, " + " fileDate, " + " fileType, " + " length, " + " bitrate, " + " sampleRate, " + " channels, " + " bitsPerSample, " + " layer, " + " version, " + " sampleWidth, " + " sampleFrames, " + " isEncrypted, " + " trackGain, " + " albumGain, " + " trackPeak, " + " albumPeak, " + " protectionenabled, " + " channelMode, " + " isCopyrighted, " + " isOriginal, " + " album, " + " title, " + " copyright, " + " trackNumber, " + " contentGroupDescription, " + " subTitle, " + " originalAlbum, " + " partOfSet, " + " subTitleOfSet, " + " internationalStandardRecordingCode, " + " leadArtist, " + " band, " + " conductor, " + " interpret, " + " originalArtist, " + " textWriter, " + " originalTextWriter, " + " composer, " + " encodedBy, " + " beatsPerMinute, " + " language, " + " contentType, " + " mediaType, " + " mood, " + " producedNotice, " + " publisher, " + " fileOwner, " + " internetRadioStationName, " + " internetRadioStationOwner, " + " originalFilename, " + " playlistDelay, " + " encodingTime, " + " originalReleaseTime, " + " recordingTime, " + " releaseTime, " + " taggingTime, " + " swhwSettings, " + " albumSortOrder, " + " performerSortOrder, " + " titleSortOrder, " + " synchronizedLyrics, " + " unsynchronizedLyrics " + "FROM file;"); if(!query.exec()) { myDebug << query.lastError().text(); @@ -156,23 +202,16 @@ void cMainWindow::loadDB() { szAlbum = query.value("album").toString(); szTitle = query.value("title").toString(); - iTrackNumber = query.value("trackNumber").toInt(); + szTrackNumber = query.value("trackNumber").toString(); szPartOfSet = query.value("partOfSet").toString(); szLeadArtist = query.value("leadArtist").toString(); szBand = query.value("band").toString(); szComposer = query.value("composer").toString(); recordingTime = query.value("recordingTime").toDate(); - if(szOldLeadArtist != szLeadArtist || szOldAlbum != szAlbum) - { - szOldLeadArtist = szLeadArtist; - szOldAlbum = szAlbum; - - lpAlbum = m_albumList.add(szAlbum, szLeadArtist); - } - + lpAlbum = m_albumList.add(szAlbum, szBand); if(lpAlbum) - lpAlbum->addTrack(szTitle, iTrackNumber, szPartOfSet, szBand, szComposer, recordingTime); + lpAlbum->addTrack(szTitle, szTrackNumber, szPartOfSet, szBand, szComposer, recordingTime); } } @@ -181,13 +220,10 @@ void cMainWindow::displayDB() m_lpMusicListModel->clear(); QStringList header; - header << "Original" << "New"; + header << "Original"; m_lpMusicListModel->setHorizontalHeaderLabels(header); - ui->m_lpMusicListOriginal->setColumnHidden(1, true); - ui->m_lpMusicListNew->setColumnHidden(0, true); - QString szOldLeadArtist = "OldLeadArtist"; QString szOldAlbum = "OldAlbum"; QList lpLeadArtistItem; @@ -205,7 +241,6 @@ void cMainWindow::displayDB() lpLeadArtistItem.clear(); lpLeadArtistItem.append(new QStandardItem(szOldLeadArtist)); - lpLeadArtistItem.append(new QStandardItem(szOldLeadArtist)); m_lpMusicListModel->appendRow(lpLeadArtistItem); } @@ -229,188 +264,66 @@ void cMainWindow::displayDB() QList lpTrackItem; lpTrackItem.append(new QStandardItem(lpTrack->title())); - lpTrackItem.append(new QStandardItem(lpTrack->title())); lpAlbumItem.at(0)->appendRow(lpTrackItem); } } } -void cMainWindow::onCustomContextMenuRequestedOriginal(const QPoint &pos) +void cMainWindow::onCustomContextMenuRequested(const QPoint &/*pos*/) { - onCustomContextMenuRequested(ui->m_lpMusicListOriginal, pos); -} + /* + QMenu* lpMenu = new QMenu(this); -void cMainWindow::onDoubleClickedOriginal(const QModelIndex &index) -{ - onDoubleClicked(index); -} + lpMenu->addAction("add", this, SLOT(onActionAdd())); -void cMainWindow::onPressedOriginal(const QModelIndex &index) -{ - onPressed(index); -} + lpMenu->addAction("update all", this, SLOT(onActionUpdateAll())); + lpMenu->addAction("update unfinished", this, SLOT(onActionUpdateUnfinished())); + lpMenu->addSeparator(); -void cMainWindow::onExpandedOriginal(const QModelIndex &index) -{ - ui->m_lpMusicListNew->expand(index); -} - -void cMainWindow::onCollapsedOriginal(const QModelIndex &index) -{ - ui->m_lpMusicListNew->collapse(index); -} - -void cMainWindow::onSelectionChangedOriginal(const QItemSelection &selected, const QItemSelection &deselected) -{ - if(m_bProcessing) - return; - - m_bProcessing = true; - - QItemSelectionModel* lpOriginal = ui->m_lpMusicListOriginal->selectionModel(); - QItemSelectionModel* lpNew = ui->m_lpMusicListNew->selectionModel(); - QModelIndexList selected1 = lpOriginal->selectedIndexes(); - - lpNew->clearSelection(); - - for(int z = 0;z < selected1.count();z++) - { - - QStandardItem* lpItem = m_lpMusicListModel->itemFromIndex(selected1.at(z)); - QModelIndex index = lpItem->index(); - lpNew->select(index, QItemSelectionModel::Select); - } - - m_bProcessing = false; -} - -void cMainWindow::onScrollbarValueChangedOriginal(int value) -{ - if(m_bProcessing) - return; - - m_bProcessing = true; - - ui->m_lpMusicListNew->verticalScrollBar()->setValue(value); - - m_bProcessing = false; -} - -void cMainWindow::onCustomContextMenuRequestedNew(const QPoint &pos) -{ - onCustomContextMenuRequested(ui->m_lpMusicListNew, pos); -} - -void cMainWindow::onDoubleClickedNew(const QModelIndex &index) -{ - onDoubleClicked(index); -} - -void cMainWindow::onPressedNew(const QModelIndex &index) -{ - onPressed(index); -} - -void cMainWindow::onExpandedNew(const QModelIndex &index) -{ - ui->m_lpMusicListOriginal->expand(index); -} - -void cMainWindow::onCollapsedNew(const QModelIndex &index) -{ - ui->m_lpMusicListOriginal->collapse(index); -} - -void cMainWindow::onSelectionChangedNew(const QItemSelection &selected, const QItemSelection &deselected) -{ - if(m_bProcessing) - return; - - m_bProcessing = true; - - QItemSelectionModel* lpOriginal = ui->m_lpMusicListOriginal->selectionModel(); - QItemSelectionModel* lpNew = ui->m_lpMusicListNew->selectionModel(); - QModelIndexList selected2 = lpNew->selectedIndexes(); - - lpOriginal->clearSelection(); - - for(int z = 0;z < selected2.count();z++) - { - QStandardItem* lpItem = m_lpMusicListModel->itemFromIndex(selected2.at(z)); - QModelIndex index = lpItem->index(); - lpOriginal->select(index, QItemSelectionModel::Select); - } - - m_bProcessing = false; -} - -void cMainWindow::onScrollbarValueChangedNew(int value) -{ - if(m_bProcessing) - return; - - m_bProcessing = true; - - ui->m_lpMusicListOriginal->verticalScrollBar()->setValue(value); - - m_bProcessing = false; -} - -void cMainWindow::onCustomContextMenuRequested(const QTreeView* lpTreeView, const QPoint &pos) -{ -/* - QMenu* lpMenu = new QMenu(this); - - lpMenu->addAction("add", this, SLOT(onActionAdd())); - - lpMenu->addAction("update all", this, SLOT(onActionUpdateAll())); - lpMenu->addAction("update unfinished", this, SLOT(onActionUpdateUnfinished())); - lpMenu->addSeparator(); - - if(lpTreeView->selectionModel()->selectedRows().count() == 1) - { - cSerie* lpSerie = m_lpSeriesListModel->itemFromIndex(lpTreeView->selectionModel()->selectedRows().at(0))->data(Qt::UserRole).value(); - if(lpSerie) + if(lpTreeView->selectionModel()->selectedRows().count() == 1) { - lpMenu->addAction("update", this, SLOT(onActionUpdate())); - lpMenu->addAction("delete", this, SLOT(onActionDelete())); - lpMenu->addAction("edit", this, SLOT(onActionEdit())); - lpMenu->addSeparator(); - - if(!lpSerie->IMDBID().isEmpty()) - lpMenu->addAction("open IMDB", this, SLOT(onActionGotoIMDB())); - - if(!lpSerie->download().isEmpty()) + cSerie* lpSerie = m_lpSeriesListModel->itemFromIndex(lpTreeView->selectionModel()->selectedRows().at(0))->data(Qt::UserRole).value(); + if(lpSerie) { - lpMenu->addAction("open download link", this, SLOT(onActionGotoDownload())); - lpMenu->addAction("copy download link", this, SLOT(onActionCopyDownload())); + lpMenu->addAction("update", this, SLOT(onActionUpdate())); + lpMenu->addAction("delete", this, SLOT(onActionDelete())); + lpMenu->addAction("edit", this, SLOT(onActionEdit())); + lpMenu->addSeparator(); + + if(!lpSerie->IMDBID().isEmpty()) + lpMenu->addAction("open IMDB", this, SLOT(onActionGotoIMDB())); + + if(!lpSerie->download().isEmpty()) + { + lpMenu->addAction("open download link", this, SLOT(onActionGotoDownload())); + lpMenu->addAction("copy download link", this, SLOT(onActionCopyDownload())); + } + lpMenu->addAction("open all download links", this, SLOT(onActionGotoAllDownload())); + lpMenu->addAction("open all download links (open)", this, SLOT(onActionGotoAllDownloadOpen())); + lpMenu->addSeparator(); + lpMenu->addAction("load images", this, SLOT(onActionLoadPictures())); } - lpMenu->addAction("open all download links", this, SLOT(onActionGotoAllDownload())); - lpMenu->addAction("open all download links (open)", this, SLOT(onActionGotoAllDownloadOpen())); + } + else if(lpTreeView->selectionModel()->selectedRows().count()) + { + lpMenu->addAction("update selected", this, SLOT(onActionUpdate())); + lpMenu->addAction("delete selected", this, SLOT(onActionDelete())); lpMenu->addSeparator(); lpMenu->addAction("load images", this, SLOT(onActionLoadPictures())); } - } - else if(lpTreeView->selectionModel()->selectedRows().count()) - { - lpMenu->addAction("update selected", this, SLOT(onActionUpdate())); - lpMenu->addAction("delete selected", this, SLOT(onActionDelete())); + lpMenu->addSeparator(); - lpMenu->addAction("load images", this, SLOT(onActionLoadPictures())); - } + lpMenu->addAction("export...", this, SLOT(onActionExport())); - lpMenu->addSeparator(); - lpMenu->addAction("export...", this, SLOT(onActionExport())); - - lpMenu->popup(lpTreeView->viewport()->mapToGlobal(pos)); -*/ + lpMenu->popup(lpTreeView->viewport()->mapToGlobal(pos)); + */ } -void cMainWindow::onDoubleClicked(const QModelIndex &index) +void cMainWindow::onDoubleClicked(const QModelIndex &/*index*/) { } -void cMainWindow::onPressed(const QModelIndex &index) +void cMainWindow::onPressed(const QModelIndex &/*index*/) { switch(QGuiApplication::mouseButtons()) { diff --git a/cmainwindow.h b/cmainwindow.h index 985dd1a..20c000c 100644 --- a/cmainwindow.h +++ b/cmainwindow.h @@ -42,27 +42,12 @@ private: void loadDB(); void displayDB(); - void onCustomContextMenuRequested(const QTreeView *lpTreeView, const QPoint &pos); - void onDoubleClicked(const QModelIndex &index); - void onPressed(const QModelIndex &index); protected: void initSettings(); private slots: - void onCustomContextMenuRequestedOriginal(const QPoint &pos); - void onDoubleClickedOriginal(const QModelIndex &index); - void onPressedOriginal(const QModelIndex &index); - void onExpandedOriginal(const QModelIndex &index); - void onCollapsedOriginal(const QModelIndex &index); - void onSelectionChangedOriginal(const QItemSelection &selected, const QItemSelection &deselected); - void onScrollbarValueChangedOriginal(int value); - - void onCustomContextMenuRequestedNew(const QPoint &pos); - void onDoubleClickedNew(const QModelIndex &index); - void onPressedNew(const QModelIndex &index); - void onExpandedNew(const QModelIndex &index); - void onCollapsedNew(const QModelIndex &index); - void onSelectionChangedNew(const QItemSelection &selected, const QItemSelection &deselected); - void onScrollbarValueChangedNew(int value); + void onCustomContextMenuRequested(const QPoint &pos); + void onDoubleClicked(const QModelIndex &index); + void onPressed(const QModelIndex &index); }; #endif // CMAINWINDOW_H diff --git a/cmainwindow.ui b/cmainwindow.ui index 9845d03..f173fc4 100644 --- a/cmainwindow.ui +++ b/cmainwindow.ui @@ -16,13 +16,7 @@ - - - Qt::Horizontal - - - - + diff --git a/cmediainfo.cpp b/cmediainfo.cpp index ab903d6..26b1cdf 100644 --- a/cmediainfo.cpp +++ b/cmediainfo.cpp @@ -66,7 +66,6 @@ void cMediaInfo::clear() m_szSubTitle = ""; m_szAlbum = ""; m_szOriginalAlbum = ""; - m_szTrackNumber = ""; m_szPartOfSet = ""; m_szSubTitleOfSet = ""; m_szInternationalStandardRecordingCode = ""; @@ -119,7 +118,6 @@ void cMediaInfo::clear() m_szTitle = ""; m_szRating = ""; m_szCopyright = ""; - m_szTrackNumber = ""; m_iYear = -1; m_iID3v2Version = -1; @@ -487,9 +485,9 @@ qint32 cMediaInfo::writeFilename() } if(query.next()) - query.prepare("UPDATE file SET fileType=:fileType, length=:length, bitrate=:bitrate, sampleRate=:sampleRate, channels=:channels, bitsPerSample=:bitsPerSample, layer=:layer, version=:version, sampleWidth=:sampleWidth, sampleFrames=:sampleFrames, isEncrypted=:isEncrypted, trackGain=:trackGain, albumGain=:albumGain, trackPeak=:trackPeak, albumPeak=:albumPeak, protectionEnabled=:protectionEnabled, channelMode=:channelMode, isCopyrighted=:isCopyrighted, isOriginal=:isOriginal, album=:album, title=:title, copyright=:copyright, tracknumber=:tracknumber, contentGroupDescription=:contentGroupDescription, subTitle=:subTitle, originalAlbum=:originalAlbum, partOfSet=:partOfSet, subTitleOfSet=:subTitleOfSet, internationalStandardRecordingCode=:internationalStandardRecordingCode, leadArtist=:leadArtist, band=:band, conductor=:conductor, interpret=:interpret, originalArtist=:originalArtist, textWriter=:textWriter, originalTextWriter=:originalTextWriter, composer=:composer, encodedBy=:encodedBy, beatsPerMinute=:beatsPerMinute, language=:language, contentType=:contentType, mediaType=:mediaType, mood=:mood, producedNotice=:producedNotice, publisher=:publisher, fileOwner=:fileOwner, internetRadioStationName=:internetRadioStationName, internetRadioStationOwner=:internetRadioStationOwner, originalFilename=:originalFilename, playlistDelay=:playlistDelay, encodingTime=:encodingTime, originalReleaseTime=:originalReleaseTime, recordingTime=:recordingTime, releaseTime=:releaseTime, taggingTime=:taggingTime, swhwSettings=:swhwSettings, albumSortOrder=:albumSortOrder, performerSortOrder=:performerSortOrder, titleSortOrder=:titleSortOrder, synchronizedLyrics=:synchronizedLyrics, unsynchronizedLyrics=:unsynchronizedLyrics WHERE filename=:filename AND filesize=:filesize AND filedate=:filedate;"); + query.prepare("UPDATE file SET fileType=:fileType, length=:length, bitrate=:bitrate, sampleRate=:sampleRate, channels=:channels, bitsPerSample=:bitsPerSample, layer=:layer, version=:version, sampleWidth=:sampleWidth, sampleFrames=:sampleFrames, isEncrypted=:isEncrypted, trackGain=:trackGain, albumGain=:albumGain, trackPeak=:trackPeak, albumPeak=:albumPeak, protectionEnabled=:protectionEnabled, channelMode=:channelMode, isCopyrighted=:isCopyrighted, isOriginal=:isOriginal, album=:album, title=:title, copyright=:copyright, trackNumber=:trackNumber, contentGroupDescription=:contentGroupDescription, subTitle=:subTitle, originalAlbum=:originalAlbum, partOfSet=:partOfSet, subTitleOfSet=:subTitleOfSet, internationalStandardRecordingCode=:internationalStandardRecordingCode, leadArtist=:leadArtist, band=:band, conductor=:conductor, interpret=:interpret, originalArtist=:originalArtist, textWriter=:textWriter, originalTextWriter=:originalTextWriter, composer=:composer, encodedBy=:encodedBy, beatsPerMinute=:beatsPerMinute, language=:language, contentType=:contentType, mediaType=:mediaType, mood=:mood, producedNotice=:producedNotice, publisher=:publisher, fileOwner=:fileOwner, internetRadioStationName=:internetRadioStationName, internetRadioStationOwner=:internetRadioStationOwner, originalFilename=:originalFilename, playlistDelay=:playlistDelay, encodingTime=:encodingTime, originalReleaseTime=:originalReleaseTime, recordingTime=:recordingTime, releaseTime=:releaseTime, taggingTime=:taggingTime, swhwSettings=:swhwSettings, albumSortOrder=:albumSortOrder, performerSortOrder=:performerSortOrder, titleSortOrder=:titleSortOrder, synchronizedLyrics=:synchronizedLyrics, unsynchronizedLyrics=:unsynchronizedLyrics WHERE filename=:filename AND filesize=:filesize AND filedate=:filedate;"); else - query.prepare("INSERT INTO file (fileName, fileSize, fileDate, fileType, length, bitrate, sampleRate, channels, bitsPerSample, layer, version, sampleWidth, sampleFrames, isEncrypted, trackGain, albumGain, trackPeak, albumPeak, protectionEnabled, channelMode, isCopyrighted, isOriginal, album, title, copyright, tracknumber, contentGroupDescription, subTitle, originalAlbum, partOfSet, subTitleOfSet, internationalStandardRecordingCode, leadArtist, band, conductor, interpret, originalArtist, textWriter, originalTextWriter, composer, encodedBy, beatsPerMinute, language, contentType, mediaType, mood, producedNotice, publisher, fileOwner, internetRadioStationName, internetRadioStationOwner, originalFilename, playlistDelay, encodingTime, originalReleaseTime, recordingTime, releaseTime, taggingTime, swhwSettings, albumSortOrder, performerSortOrder, titleSortOrder, synchronizedLyrics, unsynchronizedLyrics) VALUES (:fileName, :fileSize, :fileDate, :fileType, :length, :bitrate, :sampleRate, :channels, :bitsPerSample, :layer, :version, :sampleWidth, :sampleFrames, :isEncrypted, :trackGain, :albumGain, :trackPeak, :albumPeak, :protectionEnabled, :channelMode, :isCopyrighted, :isOriginal, :album, :title, :copyright, :tracknumber, :contentGroupDescription, :subTitle, :originalAlbum, :partOfSet, :subTitleOfSet, :internationalStandardRecordingCode, :leadArtist, :band, :conductor, :interpret, :originalArtist, :textWriter, :originalTextWriter, :composer, :encodedBy, :beatsPerMinute, :language, :contentType, :mediaType, :mood, :producedNotice, :publisher, :fileOwner, :internetRadioStationName, :internetRadioStationOwner, :originalFilename, :playlistDelay, :encodingTime, :originalReleaseTime, :recordingTime, :releaseTime, :taggingTime, :swhwSettings, :albumSortOrder, :performerSortOrder, :titleSortOrder, :synchronizedLyrics, :unsynchronizedLyrics);"); + query.prepare("INSERT INTO file (fileName, fileSize, fileDate, fileType, length, bitrate, sampleRate, channels, bitsPerSample, layer, version, sampleWidth, sampleFrames, isEncrypted, trackGain, albumGain, trackPeak, albumPeak, protectionEnabled, channelMode, isCopyrighted, isOriginal, album, title, copyright, trackNumber, contentGroupDescription, subTitle, originalAlbum, partOfSet, subTitleOfSet, internationalStandardRecordingCode, leadArtist, band, conductor, interpret, originalArtist, textWriter, originalTextWriter, composer, encodedBy, beatsPerMinute, language, contentType, mediaType, mood, producedNotice, publisher, fileOwner, internetRadioStationName, internetRadioStationOwner, originalFilename, playlistDelay, encodingTime, originalReleaseTime, recordingTime, releaseTime, taggingTime, swhwSettings, albumSortOrder, performerSortOrder, titleSortOrder, synchronizedLyrics, unsynchronizedLyrics) VALUES (:fileName, :fileSize, :fileDate, :fileType, :length, :bitrate, :sampleRate, :channels, :bitsPerSample, :layer, :version, :sampleWidth, :sampleFrames, :isEncrypted, :trackGain, :albumGain, :trackPeak, :albumPeak, :protectionEnabled, :channelMode, :isCopyrighted, :isOriginal, :album, :title, :copyright, :trackNumber, :contentGroupDescription, :subTitle, :originalAlbum, :partOfSet, :subTitleOfSet, :internationalStandardRecordingCode, :leadArtist, :band, :conductor, :interpret, :originalArtist, :textWriter, :originalTextWriter, :composer, :encodedBy, :beatsPerMinute, :language, :contentType, :mediaType, :mood, :producedNotice, :publisher, :fileOwner, :internetRadioStationName, :internetRadioStationOwner, :originalFilename, :playlistDelay, :encodingTime, :originalReleaseTime, :recordingTime, :releaseTime, :taggingTime, :swhwSettings, :albumSortOrder, :performerSortOrder, :titleSortOrder, :synchronizedLyrics, :unsynchronizedLyrics);"); query.bindValue(":fileName", fileName()); query.bindValue(":fileSize", fileSize()); @@ -516,7 +514,7 @@ qint32 cMediaInfo::writeFilename() query.bindValue(":album", album()); query.bindValue(":title", title()); query.bindValue(":copyright", copyright()); - query.bindValue(":tracknumber", trackNumber()); + query.bindValue(":trackNumber", trackNumber()); query.bindValue(":contentGroupDescription", contentGroupDescription()); query.bindValue(":subTitle", subTitle()); query.bindValue(":originalAlbum", originalAlbum()); diff --git a/ctrack.cpp b/ctrack.cpp index 86a59fa..b726b89 100644 --- a/ctrack.cpp +++ b/ctrack.cpp @@ -1,10 +1,10 @@ #include "ctrack.h" -cTrack::cTrack(cAlbum* lpAlbum, const QString& szTitle, const qint16& trackNumber, const QString& szPartOfSet, const QString& szBand, const QString& szComposer, const QDate& recordingTime) : +cTrack::cTrack(cAlbum* lpAlbum, const QString& szTitle, const QString &szTrackNumber, const QString& szPartOfSet, const QString& szBand, const QString& szComposer, const QDate& recordingTime) : m_lpAlbum(lpAlbum), m_szTitle(szTitle), - m_iTrackNumber(trackNumber), + m_szTrackNumber(szTrackNumber), m_szPartOfSet(szPartOfSet), m_szBand(szBand), m_szComposer(szComposer), @@ -32,14 +32,14 @@ QString cTrack::title() return(m_szTitle); } -void cTrack::setTrackNumber(const qint16& trackNumber) +void cTrack::setTrackNumber(const QString &szTrackNumber) { - m_iTrackNumber = trackNumber; + m_szTrackNumber = szTrackNumber; } -qint16 cTrack::trackNumber() +QString cTrack::trackNumber() { - return(m_iTrackNumber); + return(m_szTrackNumber); } void cTrack::setPartOfSet(const QString& szPartOfSet) @@ -82,7 +82,7 @@ QDate cTrack::recordingTime() return(m_recordingTime); } -cTrack* cTrackList::add(cAlbum* lpAlbum, const QString& szTitle, const qint16& trackNumber, const QString& szPartOfSet, const QString& szBand, const QString& szComposer, const QDate &recordingTime) +cTrack* cTrackList::add(cAlbum* lpAlbum, const QString& szTitle, const QString &szTrackNumber, const QString& szPartOfSet, const QString& szBand, const QString& szComposer, const QDate &recordingTime) { QString szTitle1 = szTitle; QString szBand1 = szBand; @@ -95,7 +95,7 @@ cTrack* cTrackList::add(cAlbum* lpAlbum, const QString& szTitle, const qint16& if(szComposer1.isEmpty()) szComposer1 = "*** NO COMPOSER ***"; - cTrack* lpTrackNew = new cTrack(lpAlbum, szTitle1, trackNumber, szPartOfSet, szBand1, szComposer1, recordingTime); + cTrack* lpTrackNew = new cTrack(lpAlbum, szTitle1, szTrackNumber, szPartOfSet, szBand1, szComposer1, recordingTime); append(lpTrackNew); return(lpTrackNew); } diff --git a/ctrack.h b/ctrack.h index bf87cfd..21d1aa5 100644 --- a/ctrack.h +++ b/ctrack.h @@ -13,7 +13,7 @@ class cAlbum; class cTrack { public: - cTrack(cAlbum* lpAlbum, const QString& szTitle, const qint16& trackNumber, const QString& szPartOfSet, const QString& szBand, const QString& szComposer, const QDate& recordingTime); + cTrack(cAlbum* lpAlbum, const QString& szTitle, const QString& szTrackNumber, const QString& szPartOfSet, const QString& szBand, const QString& szComposer, const QDate& recordingTime); void setAlbum(cAlbum* lpAlbum); cAlbum* album(); @@ -21,8 +21,8 @@ public: void setTitle(const QString& szTitle); QString title(); - void setTrackNumber(const qint16& trackNumber); - qint16 trackNumber(); + void setTrackNumber(const QString& szTrackNumber); + QString trackNumber(); void setPartOfSet(const QString& szPartOfSet); QString partOfSet(); @@ -39,7 +39,7 @@ public: private: cAlbum* m_lpAlbum; QString m_szTitle; - qint16 m_iTrackNumber; + QString m_szTrackNumber; QString m_szPartOfSet; QString m_szBand; QString m_szComposer; @@ -51,7 +51,7 @@ Q_DECLARE_METATYPE(cTrack*) class cTrackList : public QList { public: - cTrack* add(cAlbum* lpAlbum, const QString& szTitle, const qint16& trackNumber, const QString& szPartOfSet, const QString& szBand, const QString& szComposer, const QDate& recordingTime); + cTrack* add(cAlbum* lpAlbum, const QString& szTitle, const QString& szTrackNumber, const QString& szPartOfSet, const QString& szBand, const QString& szComposer, const QDate& recordingTime); }; #endif // CTRACK_H