Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-08 16:12:33 +02:00
Code Issues Projects Releases Wiki Activity

Fixed conflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason 2019-08-31 12:09:04 -04:00
commit 32001d5a55
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -19048,3 +19048,6 @@
2019-08-29 Patrick Linstruth <patrick@deltecent.com> 2019-08-29 Patrick Linstruth <patrick@deltecent.com>
* Refactored 'RDCddbLookup' class to use 'QTcpSocket' class * Refactored 'RDCddbLookup' class to use 'QTcpSocket' class
instead of 'Q3Socket'. instead of 'Q3Socket'.
2019-08-29 Patrick Linstruth <patrick@deltecent.com>
* Modified rdlibrary(1) Rip Disk dialog to use Artist and Album
text fields when modifying cart labels.

33
rdlibrary/disk_ripper.cpp
View File

@ -443,6 +443,11 @@ void DiskRipper::ripDiskButtonData()
rip_isrc_read=true; rip_isrc_read=true;
} }
//
// Set Artist and Album
//
SetArtistAlbum();
// //
// Rip // Rip
// //
@ -503,7 +508,9 @@ void DiskRipper::ripDiskButtonData()
item->setText(5,""); item->setText(5,"");
item=(RDListViewItem *)item->nextSibling(); item=(RDListViewItem *)item->nextSibling();
} }
rip_cdrom->eject();
// rip_cdrom->eject();
if(rip_aborting) { if(rip_aborting) {
QMessageBox::information(this,tr("Rip Complete"),tr("Rip aborted!")); QMessageBox::information(this,tr("Rip Complete"),tr("Rip aborted!"));
} }
@ -737,7 +744,10 @@ void DiskRipper::setSingleButtonData()
void DiskRipper::modifyCartLabelData() void DiskRipper::modifyCartLabelData()
{ {
SetArtistAlbum();
RDListViewItem *item=(RDListViewItem *)rip_track_list->firstChild(); RDListViewItem *item=(RDListViewItem *)rip_track_list->firstChild();
while(item!=NULL) { while(item!=NULL) {
if(item->isSelected()) { if(item->isSelected()) {
int track=item->text(0).toInt()-1; int track=item->text(0).toInt()-1;
@ -777,6 +787,8 @@ void DiskRipper::mediaChangedData()
{ {
RDListViewItem *l; RDListViewItem *l;
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
rip_isrc_read=false; rip_isrc_read=false;
rip_cutnames.clear(); rip_cutnames.clear();
rip_end_track.clear(); rip_end_track.clear();
@ -813,6 +825,8 @@ void DiskRipper::mediaChangedData()
lookupRecord(rip_cdda_dir.path(),rda->libraryConf()->ripperDevice(), lookupRecord(rip_cdda_dir.path(),rda->libraryConf()->ripperDevice(),
rda->libraryConf()->cddbServer(),8880, rda->libraryConf()->cddbServer(),8880,
RIPPER_CDDB_USER,PACKAGE_NAME,VERSION); RIPPER_CDDB_USER,PACKAGE_NAME,VERSION);
QApplication::restoreOverrideCursor();
} }
@ -1149,6 +1163,23 @@ QString DiskRipper::BuildTrackName(int start_track,int end_track) const
} }
void DiskRipper::SetArtistAlbum()
{
RDListViewItem *item=(RDListViewItem *)rip_track_list->firstChild();
while(item!=NULL) {
int track=item->text(0).toInt()-1;
if(rip_wave_datas[track]->artist().isEmpty()) {
rip_wave_datas[track]->setArtist(rip_artist_edit->text());
}
if(rip_wave_datas[track]->album().isEmpty()) {
rip_wave_datas[track]->setAlbum(rip_album_edit->text());
}
item=(RDListViewItem *)item->nextSibling();
}
}
void DiskRipper::SendNotification(RDNotification::Action action, void DiskRipper::SendNotification(RDNotification::Action action,
unsigned cartnum) unsigned cartnum)
{ {

1
rdlibrary/disk_ripper.h
View File

@ -88,6 +88,7 @@ class DiskRipper : public QDialog
void RipTrack(int track,int end_track,QString cutname,QString title); void RipTrack(int track,int end_track,QString cutname,QString title);
void UpdateRipButton(); void UpdateRipButton();
QString BuildTrackName(int start_track,int end_track) const; QString BuildTrackName(int start_track,int end_track) const;
void SetArtistAlbum();
void SendNotification(RDNotification::Action action,unsigned cartnum); void SendNotification(RDNotification::Action action,unsigned cartnum);
RDCdPlayer *rip_cdrom; RDCdPlayer *rip_cdrom;
RDCddbRecord rip_cddb_record; RDCddbRecord rip_cddb_record;