mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-17 11:18:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into cmake_dist

Browse Source 
# Conflicts:
#	include/Plugin.h
#	src/core/Plugin.cpp
This commit is contained in:
Lukas W
2015-03-21 11:53:00 +01:00
parent 35e1c4ed89 de9f879dde
commit e0f077ba02
105 changed files with 3436 additions and 1823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/core/DataFile.cpp
View File

@@ -36,6 +36,7 @@
#include "ConfigManager.h"
#include "PluginFactory.h"
#include "ProjectVersion.h"
#include "ProjectVersion.h"
#include "SongEditor.h"
@@ -163,6 +164,53 @@ DataFile::~DataFile()
bool DataFile::validate( QString extension )
{
switch( m_type )
{
case Type::SongProject:
if( extension == "mmp" || extension == "mmpz" )
{
return true;
}
break;
case Type::SongProjectTemplate:
if( extension == "mpt" )
{
return true;
}
break;
case Type::InstrumentTrackSettings:
if ( extension == "xpf" || extension == "xml" )
{
return true;
}
break;
case Type::UnknownType:
if (! ( extension == "mmp" || extension == "mpt" || extension == "mmpz" ||
extension == "xpf" || extension == "xml" ||
( extension == "xiz" && ! pluginFactory->pluginSupportingExtension(extension).isNull()) ||
extension == "sf2" || extension == "pat" || extension == "mid" ||
extension == "flp" || extension == "dll"
) )
{
return true;
}
if( extension == "wav" || extension == "ogg" ||
extension == "ds" )
{
return true;
}
break;
default:
return false;
}
return false;
}
QString DataFile::nameWithExtension( const QString & _fn ) const
{
switch( type() )
@@ -804,14 +852,17 @@ void DataFile::loadData( const QByteArray & _data, const QString & _sourceFile )
// only one compareType needs to be set, and we can compare on one line because setCompareType returns ProjectVersion
if ( createdWith.setCompareType(Minor) != openedWith)
{
if( Engine::hasGUI() )
if( Engine::hasGUI() && root.attribute( "type" ) == "song" ) //documentElement()
{
QMessageBox::information( NULL,
SongEditor::tr( "Project Version Mismatch" ),
SongEditor::tr(
"This project was created with "
"LMMS version %1, but version %2 "
"This %1 was created with "
"LMMS version %2, but version %3 "
"is installed")
.arg( _sourceFile.endsWith( ".mpt" ) ?
"template" :
"project" )
.arg( root.attribute( "creatorversion" ) )
.arg( LMMS_VERSION ) );
}