Remove FLP import, revert to GPLv2+ only (#2904)

Author: grejppi

LICENSE.txt

@@ -32,7 +32,7 @@ Features
 * Many powerful instrument and effect-plugins out of the box
 * Full user-defined track-based automation and computer-controlled automation sources
 * Compatible with many standards such as SoundFont2, VST(i), LADSPA, GUS Patches, and full MIDI support
-* Import of MIDI and FLP (FL Studio®/Fruityloops® Project) files
+* MIDI file importing
 
 Building
 ---------

README.md

@@ -179,7 +179,6 @@ public slots:
 
 
 	friend class EnvelopeAndLfoView;
-	friend class FlpImport;
 
 } ;
 

include/EnvelopeAndLfoParameters.h

@@ -179,7 +179,6 @@ class FileItem : public QTreeWidgetItem
 		SoundFontFile,
 		PatchFile,
 		MidiFile,
-		FlpFile,
 		VstPluginFile,
 		UnknownFile,
 		NumFileTypes
@@ -228,7 +227,6 @@ class FileItem : public QTreeWidgetItem
 	static QPixmap * s_soundfontFilePixmap;
 	static QPixmap * s_vstPluginFilePixmap;
 	static QPixmap * s_midiFilePixmap;
-	static QPixmap * s_flpFilePixmap;
 	static QPixmap * s_unknownFilePixmap;
 
 	QString m_path;

include/FileBrowser.h

@@ -202,7 +202,6 @@ class InstrumentFunctionArpeggio : public Model, public JournallingObject
 	ComboBoxModel m_arpModeModel;
 
 
-	friend class FlpImport;
 	friend class InstrumentTrack;
 	friend class InstrumentFunctionArpeggioView;
 

include/InstrumentFunctions.h

@@ -78,7 +78,6 @@ class InstrumentSoundShaping : public Model, public JournallingObject
 
 
 	friend class InstrumentSoundShapingView;
-	friend class FlpImport;
 
 } ;
 

include/InstrumentSoundShaping.h

@@ -268,7 +268,6 @@ protected slots:
 	friend class InstrumentTrackView;
 	friend class InstrumentTrackWindow;
 	friend class NotePlayHandle;
-	friend class FlpImport;
 	friend class InstrumentMiscView;
 
 } ;

include/InstrumentTrack.h

@@ -19,7 +19,6 @@ ADD_SUBDIRECTORY(DualFilter)
 ADD_SUBDIRECTORY(dynamics_processor)
 ADD_SUBDIRECTORY(Eq)
 ADD_SUBDIRECTORY(Flanger)
-ADD_SUBDIRECTORY(flp_import)
 ADD_SUBDIRECTORY(HydrogenImport)
 ADD_SUBDIRECTORY(kicker)
 ADD_SUBDIRECTORY(ladspa_browser)

plugins/CMakeLists.txt

@@ -191,7 +191,7 @@ bool DataFile::validate( QString extension )
 				extension == "xpf" || extension == "xml" ||
 				( extension == "xiz" && ! pluginFactory->pluginSupportingExtension(extension).isNull()) ||
 				extension == "sf2" || extension == "pat" || extension == "mid" ||
-				extension == "flp" || extension == "dll"
+				extension == "dll"
 				) )
 		{
 			return true;

plugins/flp_import/CMakeLists.txt

@@ -1,5 +1,5 @@
 /*
- * ImportFilter.cpp - base-class for all import-filters (MIDI, FLP etc)
+ * ImportFilter.cpp - base-class for all import-filters
  *
  * Copyright (c) 2006-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *

plugins/flp_import/FlpImport.cpp

@@ -1170,8 +1170,6 @@ void Song::importProject()
 			ConfigManager::inst()->userProjectsDir(),
 			tr("MIDI sequences") +
 			" (*.mid *.midi *.rmi);;" +
-			tr("FL Studio projects") +
-			" (*.flp);;" +
 			tr("Hydrogen projects") +
 			" (*.h2song);;" +
 			tr("All file types") +

plugins/flp_import/FlpImport.h

@@ -478,9 +478,6 @@ void FileBrowserTreeWidget::mouseMoveEvent( QMouseEvent * me )
 							embed::getIconPixmap( "vst_plugin_file" ), this );
 					break;
 				case FileItem::MidiFile:
-// don't allow dragging FLP-files as FLP import filter clears project
-// without asking
-//				case fileItem::FlpFile:
 					new StringPairDrag( "importedproject", f->fullName(),
 							embed::getIconPixmap( "midi_file" ), this );
 					break;
@@ -568,11 +565,6 @@ void FileBrowserTreeWidget::handleFile(FileItem * f, InstrumentTrack * it )
 		}
 
 		case FileItem::ImportAsProject:
-			if( f->type() == FileItem::FlpFile &&
-				!gui->mainWindow()->mayChangeProject(true) )
-			{
-				break;
-			}
 			ImportFilter::import( f->fullName(),
 							Engine::getSong() );
 			break;
@@ -853,7 +845,6 @@ QPixmap * FileItem::s_sampleFilePixmap = NULL;
 QPixmap * FileItem::s_soundfontFilePixmap = NULL;
 QPixmap * FileItem::s_vstPluginFilePixmap = NULL;
 QPixmap * FileItem::s_midiFilePixmap = NULL;
-QPixmap * FileItem::s_flpFilePixmap = NULL;
 QPixmap * FileItem::s_unknownFilePixmap = NULL;
 
 
@@ -918,12 +909,6 @@ void FileItem::initPixmaps( void )
 							"midi_file", 16, 16 ) );
 	}
 
-	if( s_flpFilePixmap == NULL )
-	{
-		s_flpFilePixmap = new QPixmap( embed::getIconPixmap(
-							"midi_file", 16, 16 ) );
-	}
-
 	if( s_unknownFilePixmap == NULL )
 	{
 		s_unknownFilePixmap = new QPixmap( embed::getIconPixmap(
@@ -951,9 +936,6 @@ void FileItem::initPixmaps( void )
 		case MidiFile:
 			setIcon( 0, *s_midiFilePixmap );
 			break;
-		case FlpFile:
-			setIcon( 0, *s_flpFilePixmap );
-			break;
 		case UnknownFile:
 		default:
 			setIcon( 0, *s_unknownFilePixmap );
@@ -997,11 +979,6 @@ void FileItem::determineFileType( void )
 		m_type = MidiFile;
 		m_handling = ImportAsProject;
 	}
-	else if( ext == "flp" )
-	{
-		m_type = FlpFile;
-		m_handling = ImportAsProject;
-	}
 	else if( ext == "dll" )
 	{
 		m_type = VstPluginFile;

plugins/flp_import/unrtf.cpp

@@ -108,7 +108,7 @@ MainWindow::MainWindow() :
 	sideBar->appendTab( new FileBrowser(
 				confMgr->userProjectsDir() + "*" +
 				confMgr->factoryProjectsDir(),
-					"*.mmp *.mmpz *.xml *.mid *.flp",
+					"*.mmp *.mmpz *.xml *.mid",
 							tr( "My Projects" ),
 					embed::getIconPixmap( "project_file" ).transformed( QTransform().rotate( 90 ) ),
 							splitter, false, true ) );