Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-15 09:09:36 +02:00
Code Issues Projects Releases Wiki Activity

Change LogErr to LogWarning

Browse Source
This commit is contained in:
Patrick Linstruth 2019-01-14 11:48:56 -08:00
parent 44bfd738a7
commit 578b49a766
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/rdaudioconvert.cpp
View File

@ -177,7 +177,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::convert()
QString err_msg;
if(!temp_dir->create(&err_msg)) {
delete temp_dir;
rda->log(RDConfig::LogErr,QString("Could not create "+err_msg));
rda->log(RDConfig::LogWarning,QString("Could not create "+err_msg));
return RDAudioConvert::ErrorInternal;
}
tmpfile1=QString(temp_dir->path())+"/signed32_1.wav";
@ -825,7 +825,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage1M4A(const QString &dstfile,
UpdatePeak((const float*)sample_buffer, frameInfo.samples);
if(sf_write_float(sf_dst, (const float*)sample_buffer, frameInfo.samples) != (sf_count_t)frameInfo.samples) {
rda->log(RDConfig::LogErr,QString().sprintf("%s",sf_strerror(sf_dst)));
rda->log(RDConfig::LogWarning,QString().sprintf("%s",sf_strerror(sf_dst)));
ret = RDAudioConvert::ErrorInternal;
break;
}
@ -922,7 +922,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage2Convert(const QString &srcfile,
//
memset(&src_info,0,sizeof(src_info));
if((src_sf=sf_open(srcfile,SFM_READ,&src_info))==NULL) {
rda->log(RDConfig::LogErr,QString().sprintf("Could not open %s",(const char *)srcfile));
rda->log(RDConfig::LogWarning,QString().sprintf("Could not open %s",(const char *)srcfile));
return RDAudioConvert::ErrorInternal;
}
sf_command(src_sf,SFC_SET_NORM_FLOAT,NULL,SF_FALSE);
@ -933,7 +933,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage2Convert(const QString &srcfile,
dst_info.samplerate=conv_settings->sampleRate();
if((dst_sf=sf_open(dstfile,SFM_WRITE,&dst_info))==NULL) {
sf_close(src_sf);
rda->log(RDConfig::LogErr,QString().sprintf("Could not open %s",(const char *)dstfile));
rda->log(RDConfig::LogWarning,QString().sprintf("Could not open %s",(const char *)dstfile));
return RDAudioConvert::ErrorInternal;
}
@ -972,7 +972,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage2Convert(const QString &srcfile,
if((src_state=src_new(conv_src_converter,src_info.channels,&err))==NULL) {
sf_close(src_sf);
sf_close(dst_sf);
rda->log(RDConfig::LogErr,QString().sprintf("%s",src_strerror(err)));
rda->log(RDConfig::LogWarning,QString().sprintf("%s",src_strerror(err)));
return RDAudioConvert::ErrorInternal;
}
memset(&src_data,0,sizeof(src_data));
@ -1023,7 +1023,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage2Convert(const QString &srcfile,
src_data.input_frames=n;
if((err=src_process(src_state,&src_data))!=0) {
fprintf(stderr,"SRC Error: %s\n",src_strerror(err));
rda->log(RDConfig::LogErr,QString().sprintf("%s",src_strerror(err)));
rda->log(RDConfig::LogWarning,QString().sprintf("%s",src_strerror(err)));
return RDAudioConvert::ErrorInternal;
}
n=src_data.output_frames_gen;
@ -1143,7 +1143,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Convert(const QString &srcfile,
// Open Source File
//
if((src_sf=sf_open(srcfile,SFM_READ,&src_sf_info))==NULL) {
rda->log(RDConfig::LogErr,QString().sprintf("%s",sf_strerror(NULL)));
rda->log(RDConfig::LogWarning,QString().sprintf("%s",sf_strerror(NULL)));
return RDAudioConvert::ErrorInternal;
}
@ -1214,7 +1214,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Flac(SNDFILE *src_sf,
default:
delete flac;
rda->log(RDConfig::LogErr,QString("flac->init() failure"));
rda->log(RDConfig::LogWarning,QString("flac->init() failure"));
return RDAudioConvert::ErrorInternal;
}
*/
@ -1240,7 +1240,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Flac(SNDFILE *src_sf,
case FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_METADATA:
default:
delete flac;
rda->log(RDConfig::LogErr,QString("flac->init() failure"));
rda->log(RDConfig::LogWarning,QString("flac->init() failure"));
return RDAudioConvert::ErrorInternal;
}
@ -1308,7 +1308,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Vorbis(SNDFILE *src_sf,
conv_settings->quality())) {
case OV_EFAULT:
default:
rda->log(RDConfig::LogErr,QString("vorbis_encode_init_vbr() failure"));
rda->log(RDConfig::LogWarning,QString("vorbis_encode_init_vbr() failure"));
return RDAudioConvert::ErrorInternal;
case OV_EINVAL:
@ -1500,7 +1500,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Layer3(SNDFILE *src_sf,
if((lameopts=lame_init())==NULL) {
lame_close(lameopts);
::close(dst_fd);
rda->log(RDConfig::LogErr,QString("lame_init() failure"));
rda->log(RDConfig::LogWarning,QString("lame_init() failure"));
return RDAudioConvert::ErrorInternal;
}
lame_set_mode(lameopts,mpeg_mode);
@ -1639,7 +1639,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Layer2Wav(SNDFILE *src_sf,
//
if((lameopts=twolame_init())==NULL) {
wave->closeWave();
rda->log(RDConfig::LogErr,QString("twolame_init() failure"));
rda->log(RDConfig::LogWarning,QString("twolame_init() failure"));
return RDAudioConvert::ErrorInternal;
}
twolame_set_mode(lameopts,mpeg_mode);
@ -1744,7 +1744,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Layer2(SNDFILE *src_sf,
//
if((lameopts=twolame_init())==NULL) {
::close(dst_fd);
rda->log(RDConfig::LogErr,QString("twolame_init() failure"));
rda->log(RDConfig::LogWarning,QString("twolame_init() failure"));
return RDAudioConvert::ErrorInternal;
}
twolame_set_mode(lameopts,mpeg_mode);