Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-23 17:30:22 +01:00
Code Issues Projects Releases Wiki Activity

2018-08-28 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdimport(1) that would throw a spurious SQL error
	when using the '--to-cart=' switch with an already existing cart
	[Issue #000217].
This commit is contained in:
Fred Gleason
2018-08-28 14:25:17 -04:00
parent 83fa79a84d
commit 586661c0be
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -16675,3 +16675,7 @@
2018-08-28 Fred Gleason <fredg@paravelsystems.com> 2018-08-28 Fred Gleason <fredg@paravelsystems.com>
* Added support for the Spinitron v2 API in the 'spinitron_plus' * Added support for the Spinitron v2 API in the 'spinitron_plus'
RLM [Pull Request #000211]. RLM [Pull Request #000211].
2018-08-28 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdimport(1) that would throw a spurious SQL error
when using the '--to-cart=' switch with an already existing cart
[Issue #000217].

11
utils/rdimport/rdimport.cpp
View File

@@ -1090,8 +1090,6 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
} }
if(*cartnum==0) { if(*cartnum==0) {
*cartnum=effective_group->nextFreeCart(); *cartnum=effective_group->nextFreeCart();
}
if(*cartnum==0) {
PrintLogDateTime(stderr); PrintLogDateTime(stderr);
fprintf(stderr,"rdimport: no free carts available in specified group\n"); fprintf(stderr,"rdimport: no free carts available in specified group\n");
fflush(stderr); fflush(stderr);
@@ -1114,8 +1112,13 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
if(import_delete_cuts) { if(import_delete_cuts) {
DeleteCuts(import_cart_number); DeleteCuts(import_cart_number);
} }
cart_created= if(RDCart::exists(*cartnum)) {
RDCart::create(effective_group->name(),RDCart::Audio,&err_msg,*cartnum)!=0; cart_created=false;
}
else {
cart_created=
RDCart::create(effective_group->name(),RDCart::Audio,&err_msg,*cartnum)!=0;
}
RDCart *cart=new RDCart(*cartnum); RDCart *cart=new RDCart(*cartnum);
int cutnum= int cutnum=
cart->addCut(import_format,import_bitrate,import_channels); cart->addCut(import_format,import_bitrate,import_channels);