"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/core/main.cpp" between
lmms-1.2.0-rc7.tar.gz and lmms-1.2.0-rc8.tar.gz

About: LMMS (Linux MultiMedia Studio) is a sound generation system (creation of melodies and beats, synthesis and mixing of sounds, arranging of samples; full MIDI support). Release candidate.

main.cpp  (lmms-1.2.0-rc7):main.cpp  (lmms-1.2.0-rc8)
skipping to change at line 67 skipping to change at line 67
#include <signal.h> #include <signal.h>
#include "MainApplication.h" #include "MainApplication.h"
#include "ConfigManager.h" #include "ConfigManager.h"
#include "NotePlayHandle.h" #include "NotePlayHandle.h"
#include "embed.h" #include "embed.h"
#include "Engine.h" #include "Engine.h"
#include "GuiApplication.h" #include "GuiApplication.h"
#include "ImportFilter.h" #include "ImportFilter.h"
#include "MainWindow.h" #include "MainWindow.h"
#include "MixHelpers.h"
#include "OutputSettings.h" #include "OutputSettings.h"
#include "ProjectRenderer.h" #include "ProjectRenderer.h"
#include "RenderManager.h" #include "RenderManager.h"
#include "Song.h" #include "Song.h"
#include "SetupDialog.h" #include "SetupDialog.h"
static inline QString baseName( const QString & file ) static inline QString baseName( const QString & file )
{ {
return QFileInfo( file ).absolutePath() + "/" + return QFileInfo( file ).absolutePath() + "/" +
QFileInfo( file ).completeBaseName(); QFileInfo( file ).completeBaseName();
skipping to change at line 239 skipping to change at line 240
} }
} }
#if !defined(LMMS_BUILD_WIN32) && !defined(LMMS_BUILD_HAIKU) #if !defined(LMMS_BUILD_WIN32) && !defined(LMMS_BUILD_HAIKU)
if ( ( getuid() == 0 || geteuid() == 0 ) && !allowRoot ) if ( ( getuid() == 0 || geteuid() == 0 ) && !allowRoot )
{ {
printf( "LMMS cannot be run as root.\nUse \"--allowroot\" to over ride.\n\n" ); printf( "LMMS cannot be run as root.\nUse \"--allowroot\" to over ride.\n\n" );
return EXIT_FAILURE; return EXIT_FAILURE;
} }
#endif #endif
#ifdef LMMS_BUILD_LINUX
// don't let OS steal the menu bar. FIXME: only effective on Qt4
QCoreApplication::setAttribute( Qt::AA_DontUseNativeMenuBar );
#endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
#endif
QCoreApplication * app = coreOnly ? QCoreApplication * app = coreOnly ?
new QCoreApplication( argc, argv ) : new QCoreApplication( argc, argv ) :
new MainApplication( argc, argv ); new MainApplication( argc, argv );
Mixer::qualitySettings qs( Mixer::qualitySettings::Mode_HighQuality ); Mixer::qualitySettings qs( Mixer::qualitySettings::Mode_HighQuality );
OutputSettings os( 44100, OutputSettings::BitRateSettings(160, false), Ou tputSettings::Depth_16Bit, OutputSettings::StereoMode_JointStereo ); OutputSettings os( 44100, OutputSettings::BitRateSettings(160, false), Ou tputSettings::Depth_16Bit, OutputSettings::StereoMode_JointStereo );
ProjectRenderer::ExportFileFormats eff = ProjectRenderer::WaveFile; ProjectRenderer::ExportFileFormats eff = ProjectRenderer::WaveFile;
// second of two command-line parsing stages // second of two command-line parsing stages
for( int i = 1; i < argc; ++i ) for( int i = 1; i < argc; ++i )
skipping to change at line 610 skipping to change at line 617
{ {
fileCheck( fileToLoad ); fileCheck( fileToLoad );
} }
else if( !fileToImport.isEmpty() ) else if( !fileToImport.isEmpty() )
{ {
fileCheck( fileToImport ); fileCheck( fileToImport );
} }
ConfigManager::inst()->loadConfigFile(configFile); ConfigManager::inst()->loadConfigFile(configFile);
// Hidden settings
MixHelpers::setNaNHandler( ConfigManager::inst()->value( "app",
"nanhandler", "1" ).toInt() );
// set language // set language
QString pos = ConfigManager::inst()->value( "app", "language" ); QString pos = ConfigManager::inst()->value( "app", "language" );
if( pos.isEmpty() ) if( pos.isEmpty() )
{ {
pos = QLocale::system().name().left( 2 ); pos = QLocale::system().name().left( 2 );
} }
#ifdef LMMS_BUILD_WIN32 #ifdef LMMS_BUILD_WIN32
#undef QT_TRANSLATIONS_DIR #undef QT_TRANSLATIONS_DIR
#define QT_TRANSLATIONS_DIR ConfigManager::inst()->localeDir() #define QT_TRANSLATIONS_DIR ConfigManager::inst()->localeDir()
 End of changes. 3 change blocks. 
1 lines changed or deleted 12 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)