|
- * 15 Oct 00, tuorfa@yahoo.com: attributes now continue if >1 \cell in group
- * 15 Oct 00, tuorfa@yahoo.com: fixed font-size bug, lack of
- * 7 Nov 00, tuorfa@yahoo.com: fixed \'## translatin bug
- * 8 Apr 01, tuorfa@yahoo.com: added check for out of memory after malloc
- * 21 Apr 01, tuorfa@yahoo.com: bug fixes regarding author, date
- * 21 Apr 01, tuorfa@yahoo.com: added paragraph alignment
- * 21 Apr 01, tuorfa@yahoo.com: fix for words getting lost after \par
- * 24 Jul 01, tuorfa@yahoo.com: moved conversion code to convert.c
- * 22 Sep 01, tuorfa@yahoo.com: moved word_dump to here from parse.c
- * 22 Sep 01, tuorfa@yahoo.com: added function-level comment blocks
- * 29 Mar 05, daved@physiol.usyd.edu.au: changes requested by ZT Smith
- * 11 Jan 07, jasp00@users.sourceforge.net: optimized unsafe loop
- * 16 Dec 07, daved@physiol.usyd.edu.au: updated to GPL v3
- *--------------------------------------------------------------------*/
-
-#ifdef LMMS_HAVE_CONFIG_H
-#include
-#endif
-
-#ifdef LMMS_HAVE_STDIO_H
-#include
-#endif
-
-#ifdef LMMS_HAVE_STDLIB_H
-#include
-#endif
-
-#ifdef LMMS_HAVE_CTYPE_H
-#include
-#endif
-
-#ifdef LMMS_HAVE_STRING_H
-#include
-#endif
-
-#include "defs.h"
-#include "parse.h"
-#include "ur_malloc.h"
-#include "main.h"
-#include "error.h"
-#include "word.h"
-#include "hash.h"
-
-
-/* For word_dump */
-static int indent_level=0;
-
-
-/*========================================================================
- * Name: word_string
- * Purpose: Obtains the string of a Word object. This involves accessing
- * the Word hash.
- * Args: Word*.
- * Returns: String.
- *=======================================================================*/
-
-char *
-word_string (Word *w) {
- char *str;
- CHECK_PARAM_NOT_NULL(w);
- if (w->hash_index) str = hash_get_string (w->hash_index);
- else str = NULL;
- return str;
-}
-
-
-
-/*========================================================================
- * Name: word_new
- * Purpose: Instantiates a new Word object.
- * Args: String.
- * Returns: Word*.
- *=======================================================================*/
-
-Word *
-word_new (char *str) {
- Word * w;
-
- w = (Word *) my_malloc(sizeof(Word));
- if (!w)
- error_handler ("out of memory");
- memset ((void*) w, 0, sizeof(Word));
- if (!w) error_handler ("cannot allocate a Word");
-
- if (str) w->hash_index = hash_get_index (str);
- else w->hash_index = 0;
-
- return w;
-}
-
-
-
-
-/*========================================================================
- * Name: word_free
- * Purpose: Deallocates a Word object. This is only called at the end of
- * main(), after everything is processed and output complete.
- * Args: Word.
- * Returns: None.
- *=======================================================================*/
-
-void word_free (Word *w) {
- Word *prev;
- Word *w2;
-
- CHECK_PARAM_NOT_NULL(w);
-
- while (w) {
- w2 = w->child;
- if (w2)
- word_free(w2);
-
- prev = w;
- w = w->next;
- my_free((char*) prev);
- }
-}
-
-
-
-
-
-/*========================================================================
- * Name: print_indentation
- * Purpose: Prints padding for the word_dump routine.
- * Args: Identation level.
- * Returns: None.
- *=======================================================================*/
-
-static void
-print_indentation (int level)
-{
- if (level) {
- /* indent in multiples of 2 */
- level = (level >> 1) + (level & 1);
- while (level-- > 0)
- printf (". ");
- } else {
- printf ("\n-----------------------------------------------------------------------\n\n");
- }
-}
-
-
-
-
-/*========================================================================
- * Name: word_dump
- * Purpose: Recursive diagnostic routine to print out a tree of words.
- * Args: Word tree.
- * Returns: None.
- *=======================================================================*/
-
-void
-word_dump (Word *w)
-{
- char *s;
-
- CHECK_PARAM_NOT_NULL(w);
-
- printf ("\n");
- indent_level += 2;
- print_indentation (indent_level);
-
- while (w) {
- s = word_string (w);
- if (s) {
- printf ("\"%s\" ", s);
- } else {
- if (w->child) {
- word_dump (w->child);
- printf ("\n");
- print_indentation (indent_level);
- }
- else
- warning_handler ("Word object has no string and no children");
- }
- w = w->next;
- }
-
- indent_level -= 2;
-}
diff --git a/plugins/flp_import/unrtf/word.h b/plugins/flp_import/unrtf/word.h
deleted file mode 100644
index 959b3b2ac..000000000
--- a/plugins/flp_import/unrtf/word.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*=============================================================================
- GNU UnRTF, a command-line program to convert RTF documents to other formats.
- Copyright (C) 2000,2001,2004 by Zachary Smith
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
- The maintainer is reachable by electronic mail at daved@physiol.usyd.edu.au
-=============================================================================*/
-
-
-/*----------------------------------------------------------------------
- * Module name: word.h
- * Author name: Zachary Smith
- * Create date: 1 Sept 2000
- * Purpose: Definitions for Word class.
- *----------------------------------------------------------------------
- * Changes:
- * 29 Mar 05, daved@physiol.usyd.edu.au: changes requested by ZT Smith
- * 16 Dec 07, daved@physiol.usyd.edu.au: updated to GPL v3
- *--------------------------------------------------------------------*/
-
-#ifndef _WORD
-#define _WORD
-
-class QBuffer;
-
-typedef struct _w {
- unsigned long hash_index;
- struct _w * next;
- struct _w * child;
-} Word;
-
-extern Word* word_new (char*);
-extern void word_free (Word*);
-extern Word* word_read (QBuffer*);
-extern char* word_string (Word*);
-extern void word_dump (Word*);
-extern void word_print_html (Word*);
-
-#define _WORD
-#endif
diff --git a/src/core/DataFile.cpp b/src/core/DataFile.cpp
index 181c6146c..bd426de79 100644
--- a/src/core/DataFile.cpp
+++ b/src/core/DataFile.cpp
@@ -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;
diff --git a/src/core/ImportFilter.cpp b/src/core/ImportFilter.cpp
index 7b5644721..01f1c5beb 100644
--- a/src/core/ImportFilter.cpp
+++ b/src/core/ImportFilter.cpp
@@ -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
*
diff --git a/src/core/Song.cpp b/src/core/Song.cpp
index 52aa8f9e0..376a74349 100644
--- a/src/core/Song.cpp
+++ b/src/core/Song.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") +
diff --git a/src/gui/FileBrowser.cpp b/src/gui/FileBrowser.cpp
index d3eb22132..f188dfff0 100644
--- a/src/gui/FileBrowser.cpp
+++ b/src/gui/FileBrowser.cpp
@@ -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;
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index f6f2ef663..75f478440 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.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 ) );
|