Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-12 07:35:55 +01:00
Code Issues Projects Releases Wiki Activity

2019-06-21 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added 'RDApplication::syslog()' methods.
This commit is contained in:
Fred Gleason
2019-06-24 16:40:18 -04:00
parent 52dc14a3b3
commit f50447eb8b
71 changed files with 1064 additions and 887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/rdaudioconvert.cpp
View File

@@ -2,7 +2,7 @@
//
// Convert Audio File Formats
//
// (C) Copyright 2010-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -180,7 +180,8 @@ RDAudioConvert::ErrorCode RDAudioConvert::convert()
QString err_msg;
if(!temp_dir->create(&err_msg)) {
delete temp_dir;
syslog(LOG_WARNING,"Could not create %s",(const char *)err_msg.toUtf8());
rda->syslog(LOG_WARNING,"Could not create %s",
(const char *)err_msg.toUtf8());
return RDAudioConvert::ErrorInternal;
}
tmpfile1=QString(temp_dir->path())+"/signed32_1.wav";
@@ -828,7 +829,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) {
syslog(LOG_WARNING,"%s",sf_strerror(sf_dst));
rda->syslog(LOG_WARNING,"%s",sf_strerror(sf_dst));
ret = RDAudioConvert::ErrorInternal;
break;
}
@@ -925,7 +926,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) {
syslog(LOG_WARNING,"Could not open %s",(const char *)srcfile.toUtf8());
rda->syslog(LOG_WARNING,"Could not open %s",(const char *)srcfile.toUtf8());
return RDAudioConvert::ErrorInternal;
}
sf_command(src_sf,SFC_SET_NORM_FLOAT,NULL,SF_FALSE);
@@ -936,7 +937,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);
syslog(LOG_WARNING,"Could not open %s",(const char *)dstfile.toUtf8());
rda->syslog(LOG_WARNING,"Could not open %s",(const char *)dstfile.toUtf8());
return RDAudioConvert::ErrorInternal;
}
@@ -975,7 +976,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);
syslog(LOG_WARNING,"%s",src_strerror(err));
rda->syslog(LOG_WARNING,"%s",src_strerror(err));
return RDAudioConvert::ErrorInternal;
}
memset(&src_data,0,sizeof(src_data));
@@ -1026,7 +1027,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));
syslog(LOG_WARNING,"%s",src_strerror(err));
rda->syslog(LOG_WARNING,"%s",src_strerror(err));
return RDAudioConvert::ErrorInternal;
}
n=src_data.output_frames_gen;
@@ -1146,7 +1147,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Convert(const QString &srcfile,
// Open Source File
//
if((src_sf=sf_open(srcfile,SFM_READ,&src_sf_info))==NULL) {
syslog(LOG_WARNING,"%s",sf_strerror(NULL));
rda->syslog(LOG_WARNING,"%s",sf_strerror(NULL));
return RDAudioConvert::ErrorInternal;
}
@@ -1243,7 +1244,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Flac(SNDFILE *src_sf,
case FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_METADATA:
default:
delete flac;
syslog(LOG_WARNING,"flac->init() failure");
rda->syslog(LOG_WARNING,"flac->init() failure");
return RDAudioConvert::ErrorInternal;
}
@@ -1311,7 +1312,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Vorbis(SNDFILE *src_sf,
conv_settings->quality())) {
case OV_EFAULT:
default:
syslog(LOG_WARNING,"vorbis_encode_init_vbr() failure");
rda->syslog(LOG_WARNING,"vorbis_encode_init_vbr() failure");
return RDAudioConvert::ErrorInternal;
case OV_EINVAL:
@@ -1503,7 +1504,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Layer3(SNDFILE *src_sf,
if((lameopts=lame_init())==NULL) {
lame_close(lameopts);
::close(dst_fd);
syslog(LOG_WARNING,"lame_init() failure");
rda->syslog(LOG_WARNING,"lame_init() failure");
return RDAudioConvert::ErrorInternal;
}
lame_set_mode(lameopts,mpeg_mode);
@@ -1642,7 +1643,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Layer2Wav(SNDFILE *src_sf,
//
if((lameopts=twolame_init())==NULL) {
wave->closeWave();
syslog(LOG_WARNING,"twolame_init() failure");
rda->syslog(LOG_WARNING,"twolame_init() failure");
return RDAudioConvert::ErrorInternal;
}
twolame_set_mode(lameopts,mpeg_mode);
@@ -1747,7 +1748,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Layer2(SNDFILE *src_sf,
//
if((lameopts=twolame_init())==NULL) {
::close(dst_fd);
syslog(LOG_WARNING,"twolame_init() failure");
rda->syslog(LOG_WARNING,"twolame_init() failure");
return RDAudioConvert::ErrorInternal;
}
twolame_set_mode(lameopts,mpeg_mode);