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

added new commandline option "--upgrade" for upgrading project-files easily

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1264 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-07-02 22:17:41 +00:00
parent bc34c0083f
commit 139c8e6be2
3 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,5 +1,10 @@
2008-07-02 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* src/core/main.cpp:
* src/core/song.cpp:
added new commandline option "--upgrade" for upgrading project-files
easily
* src/core/config_mgr.cpp:
fixed wrong macro-name - fixes unusable Mallets-plugin

54
src/core/main.cpp
View File

@@ -39,14 +39,13 @@
#include <sched.h>
#endif
#include "main_window.h"
#include "config_mgr.h"
#include "embed.h"
#include "engine.h"
#include "config_mgr.h"
#include "lmms_style.h"
#include "main_window.h"
#include "project_renderer.h"
#include "song.h"
#include "lmms_style.h"
#warning TODO: move somewhere else
static inline QString baseName( const QString & _file )
@@ -99,7 +98,7 @@ int main( int argc, char * * argv )
new QCoreApplication( argc, argv ) :
new QApplication( argc, argv ) ;
QString file_to_load, render_out;
QString file_to_load, file_to_save, render_out;
mixer::qualitySettings qs( mixer::qualitySettings::Mode_HighQuality );
projectRenderer::outputSettings os( 44100, FALSE, 160,
@@ -149,11 +148,19 @@ int main( int argc, char * * argv )
"-x, --oversampling <value> specify oversampling\n"
" possible values: 1, 2, 4, 8\n"
" default: 2\n"
"-u,--upgrade <in> <out> upgrade file <in> and save as <out>\n"
"-v, --version show version information and exit.\n"
"-h, --help show this usage message and exit.\n\n",
LMMS_PACKAGE_VERSION );
return( EXIT_SUCCESS );
}
else if( argc > i+1 && ( QString( argv[i] ) == "--upgrade" ||
QString( argv[i] ) == "-u" ) )
{
file_to_load = argv[i + 1];
file_to_save = argv[i + 2];
i += 2;
}
else if( argc > i && ( QString( argv[i] ) == "--render" ||
QString( argv[i] ) == "-r" ) )
{
@@ -305,7 +312,7 @@ int main( int argc, char * * argv )
return( EXIT_FAILURE );
}
if( render_out == "" )
if( render_out.isEmpty() && file_to_save.isEmpty() )
{
QApplication::setStyle( new lmmsStyle() );
@@ -379,22 +386,31 @@ int main( int argc, char * * argv )
engine::init( FALSE );
engine::getSong()->loadProject( file_to_load );
// create renderer
projectRenderer * r = new projectRenderer( qs, os, eff,
render_out +
QString( ( eff == projectRenderer::WaveFile ) ?
if( !render_out.isEmpty() )
{
// create renderer
projectRenderer * r = new projectRenderer( qs, os, eff,
render_out +
QString( ( eff ==
projectRenderer::WaveFile ) ?
"wav" : "ogg" ) );
QCoreApplication::instance()->connect( r, SIGNAL( finished() ),
SLOT( quit() ) );
QCoreApplication::instance()->connect( r,
SIGNAL( finished() ), SLOT( quit() ) );
// timer for progress-updates
QTimer * t = new QTimer( r );
r->connect( t, SIGNAL( timeout() ),
SLOT( updateConsoleProgress() ) );
t->start( 50 );
// timer for progress-updates
QTimer * t = new QTimer( r );
r->connect( t, SIGNAL( timeout() ),
SLOT( updateConsoleProgress() ) );
t->start( 50 );
// start now!
r->startProcessing();
// start now!
r->startProcessing();
}
else
{
engine::getSong()->saveProjectAs( file_to_save );
return( 0 );
}
}
const int ret = app->exec();

15
src/core/song.cpp
View File

@@ -966,16 +966,19 @@ bool song::saveProject( void )
m_globalAutomationTrack->saveState( mmp, mmp.content() );
engine::getFxMixer()->saveState( mmp, mmp.content() );
engine::getPianoRoll()->saveState( mmp, mmp.content() );
engine::getAutomationEditor()->saveState( mmp, mmp.content() );
( (journallingObject *)( engine::getProjectNotes() ) )->saveState( mmp,
if( engine::hasGUI() )
{
engine::getPianoRoll()->saveState( mmp, mmp.content() );
engine::getAutomationEditor()->saveState( mmp, mmp.content() );
( (journallingObject *)( engine::getProjectNotes() ) )->saveState( mmp,
mmp.content() );
m_playPos[Mode_PlaySong].m_timeLine->saveState( mmp, mmp.content() );
m_playPos[Mode_PlaySong].m_timeLine->saveState( mmp, mmp.content() );
}
saveControllerStates( mmp, mmp.content() );
m_fileName = mmp.nameWithExtension( m_fileName );
if( mmp.writeFile( m_fileName ) == TRUE )
if( mmp.writeFile( m_fileName ) == TRUE && engine::hasGUI() )
{
textFloat::displayMessage( tr( "Project saved" ),
tr( "The project %1 is now saved."
@@ -986,7 +989,7 @@ bool song::saveProject( void )
m_modified = FALSE;
engine::getMainWindow()->resetWindowTitle();
}
else
else if( engine::hasGUI() )
{
textFloat::displayMessage( tr( "Project NOT saved." ),
tr( "The project %1 was not saved!" ).arg(