hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

ProjectRenderer: renamed OutputSettings to EncoderSettings + Doxygen comments

Browse Source 
Renamed the ProjectRenderer::OutputSettings structure to
ProjectRenderer::EncoderSettings to better reflect its meaning.

Additionally added some basic Doxygen comments.
This commit is contained in:
Tobias Doerffel
2009-11-29 15:29:46 +01:00
parent 20589f19e4
commit 03d3548ba1
4 changed files with 57 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/ProjectRenderer.cpp
View File

@@ -79,9 +79,9 @@ const char * ProjectRenderer::EFF_ext[] = {"wav", "ogg", "mp3", "flac"};
ProjectRenderer::ProjectRenderer(
const AudioOutputContext::QualitySettings & _qs,
const OutputSettings & _os,
ExportFileFormats _file_format,
const QString & _out_file ) :
const EncoderSettings & es,
ExportFileFormats fileFormat,
const QString & outFile ) :
QThread( engine::getMixer() ),
m_fileDev( NULL ),
m_progress( 0 ),
@@ -90,18 +90,18 @@ ProjectRenderer::ProjectRenderer(
m_context = new AudioOutputContext( engine::getMixer(),
NULL,
_qs );
if( __fileEncodeDevices[_file_format].m_getDevInst == NULL )
if( __fileEncodeDevices[fileFormat].m_getDevInst == NULL )
{
return;
}
bool success_ful = false;
m_fileDev = __fileEncodeDevices[_file_format].m_getDevInst(
_os.samplerate, DEFAULT_CHANNELS, success_ful,
_out_file, _os.vbr,
_os.bitrate, _os.bitrate - 64, _os.bitrate + 64,
_os.depth == Depth_32Bit ? 32 :
( _os.depth == Depth_24Bit ? 24 : 16 ),
m_fileDev = __fileEncodeDevices[fileFormat].m_getDevInst(
es.samplerate, DEFAULT_CHANNELS, success_ful,
outFile, es.vbr,
es.bitrate, es.bitrate - 64, es.bitrate + 64,
es.depth == Depth_32Bit ? 32 :
( es.depth == Depth_24Bit ? 24 : 16 ),
m_context );
if( success_ful == false )
{
@@ -119,6 +119,7 @@ ProjectRenderer::ProjectRenderer(
ProjectRenderer::~ProjectRenderer()
{
delete m_fileDev;
delete m_context;
}
@@ -182,7 +183,8 @@ void ProjectRenderer::updateConsoleProgress()
char buf[80];
char prog[cols+1];
if( m_fileDev == NULL ){
if( m_fileDev == NULL )
{
qWarning("Error occured. Aborting render.");
m_consoleUpdateTimer->stop();
delete m_consoleUpdateTimer;

11
src/core/main.cpp
View File

@@ -22,7 +22,6 @@
*
*/
#include <QtCore/QFileInfo>
#include <QtCore/QLocale>
#include <QtCore/QProcess>
@@ -128,8 +127,8 @@ int main( int argc, char * * argv )
AudioOutputContext::QualitySettings qs(
AudioOutputContext::QualitySettings::Preset_HighQuality );
ProjectRenderer::OutputSettings os( 44100, false, 160,
ProjectRenderer::Depth_16Bit );
ProjectRenderer::EncoderSettings es( 44100, false, 160,
ProjectRenderer::Depth_16Bit );
ProjectRenderer::ExportFileFormats eff = ProjectRenderer::WaveFile;
@@ -251,7 +250,7 @@ int main( int argc, char * * argv )
sample_rate_t sr = QString( argv[i + 1] ).toUInt();
if( sr >= 44100 && sr <= 192000 )
{
os.samplerate = sr;
es.samplerate = sr;
}
else
{
@@ -268,7 +267,7 @@ int main( int argc, char * * argv )
int br = QString( argv[i + 1] ).toUInt();
if( br >= 64 && br <= 384 )
{
os.bitrate = br;
es.bitrate = br;
}
else
{
@@ -515,7 +514,7 @@ int main( int argc, char * * argv )
if( !render_out.isEmpty() )
{
// create renderer
ProjectRenderer * r = new ProjectRenderer( qs, os, eff,
ProjectRenderer * r = new ProjectRenderer( qs, es, eff,
render_out + QString( ProjectRenderer::EFF_ext[eff] ) );
QCoreApplication::instance()->connect( r,
SIGNAL( finished() ), SLOT( quit() ) );

4
src/gui/ExportProjectDialog.cpp
View File

@@ -155,13 +155,13 @@ void ExportProjectDialog::startBtnClicked()
ui->sampleExactControllersCB->isChecked(),
ui->aliasFreeOscillatorsCB->isChecked() );
ProjectRenderer::OutputSettings os = ProjectRenderer::OutputSettings(
ProjectRenderer::EncoderSettings es = ProjectRenderer::EncoderSettings(
ui->samplerateCB->currentText().section( " ", 0, 0 ).toUInt(),
false,
ui->bitrateCB->currentText().section( " ", 0, 0 ).toUInt(),
static_cast<ProjectRenderer::Depths>( ui->depthCB->currentIndex() ) );
m_renderer = new ProjectRenderer( qs, os, ft, m_fileName );
m_renderer = new ProjectRenderer( qs, es, ft, m_fileName );
if( m_renderer->isReady() )
{
updateTitleBar( 0 );