Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-19 22:48:01 +02:00
Code Issues Projects Releases Wiki Activity

2022-09-23 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in the Disc Ripper in rdlibrary(1) that caused
	manual changes to track metadata to be incorrectly applied.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2022-09-23 15:23:04 -04:00
parent 08e3c91f4f
commit 2a33998710
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -23370,3 +23370,6 @@
* Updated the DTD declaration in 'xdg/rivendell-rivendell.menu' to * Updated the DTD declaration in 'xdg/rivendell-rivendell.menu' to
conform to the FreeDesktop specfication at conform to the FreeDesktop specfication at
https://specifications.freedesktop.org/menu-spec/0.92/ar01s04.html. https://specifications.freedesktop.org/menu-spec/0.92/ar01s04.html.
2022-09-23 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in the Disc Ripper in rdlibrary(1) that caused
manual changes to track metadata to be incorrectly applied.

4
lib/rdwavedata_dialog.cpp
View File

@ -261,13 +261,13 @@ void RDWaveDataDialog::okData()
wave_data->setConductor(wave_conductor_edit->text()); wave_data->setConductor(wave_conductor_edit->text());
wave_data->setUserDefined(wave_userdef_edit->text()); wave_data->setUserDefined(wave_userdef_edit->text());
done(0); done(true);
} }
void RDWaveDataDialog::cancelData() void RDWaveDataDialog::cancelData()
{ {
done(-1); done(false);
} }

7
rdlibrary/disk_ripper.cpp
View File

@ -683,9 +683,10 @@ void DiskRipper::modifyCartLabelData()
if(rows.size()!=1) { if(rows.size()!=1) {
return; return;
} }
if(rip_wavedata_dialog->exec(rip_wave_datas[rows.first().row()])==0) { int real_row=rip_wave_datas.size()-rows.first().row()-1;
if(rip_wavedata_dialog->exec(rip_wave_datas[real_row])) {
rip_track_model-> rip_track_model->
setTrackTitle(rows.first(),rip_wave_datas[rows.first().row()]->title()); setTrackTitle(rows.first(),rip_wave_datas[real_row]->title());
} }
} }
@ -1056,7 +1057,7 @@ void DiskRipper::RipTrack(int track,int end_track,QString cutname,QString title)
&audio_conv_err))) { &audio_conv_err))) {
case RDAudioImport::ErrorOk: case RDAudioImport::ErrorOk:
cart->setMetadata(rip_wave_datas[rip_wave_datas.size()-track]); cart->setMetadata(rip_wave_datas[rip_wave_datas.size()-track]);
cut->setDescription(rip_wave_datas[track-1]->title()); cut->setDescription(rip_wave_datas[rip_wave_datas.size()-track]->title());
cut->setIsrc(rip_disc_record.isrc(rip_track_number-1)); cut->setIsrc(rip_disc_record.isrc(rip_track_number-1));
cut->setRecordingMbId(rip_disc_record.trackRecordingMbId(rip_track_number-1)); cut->setRecordingMbId(rip_disc_record.trackRecordingMbId(rip_track_number-1));
cut->setReleaseMbId(rip_disc_record.discReleaseMbId()); cut->setReleaseMbId(rip_disc_record.discReleaseMbId());