From f4c2249d3a423c0878a617f30f589e25fab13bb0 Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Mon, 29 Jun 2009 13:24:45 +0200
Subject: [PATCH] AudioFileProcessor: adapted to resource framework

Adapted AudioFileProcessor to new resource framework support in plugin
base class.

Signed-off-by: Tobias Doerffel <tobias.doerffel@gmail.com>
---
 plugins/audio_file_processor/audio_file_processor.cpp | 11 ++++++++---
 plugins/audio_file_processor/audio_file_processor.h   |  8 +++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp
index 72388f594..c91e4911a 100644
--- a/plugins/audio_file_processor/audio_file_processor.cpp
+++ b/plugins/audio_file_processor/audio_file_processor.cpp
@@ -29,6 +29,7 @@
 #include <QtCore/QFileInfo>
 #include <QtGui/QDropEvent>
 
+#include "ResourceFileMapper.h"
 
 #include "audio_file_processor.h"
 #include "engine.h"
@@ -45,6 +46,8 @@
 #undef SINGLE_SOURCE_COMPILE
 #include "embed.cpp"
 
+static const char * __supportedExts[] =
+{ "wav", "ogg", "ds", "spx", "au", "voc", "aif", "aiff", "flac", "raw", NULL };
 
 extern "C"
 {
@@ -61,7 +64,7 @@ plugin::descriptor PLUGIN_EXPORT audiofileprocessor_plugin_descriptor =
 	0x0100,
 	plugin::Instrument,
 	new pluginPixmapLoader( "logo" ),
-	"wav,ogg,ds,spx,au,voc,aif,aiff,flac,raw",
+	__supportedExts,
 	NULL
 } ;
 
@@ -173,9 +176,11 @@ void audioFileProcessor::loadSettings( const QDomElement & _this )
 
 
 
-void audioFileProcessor::loadFile( const QString & _file )
+void audioFileProcessor::loadResource( const ResourceItem * _resourceItem )
 {
-	setAudioFile( _file );
+	// TODO: replace this with real support for ResourceItem's
+	ResourceFileMapper mapper( _resourceItem );
+	setAudioFile( mapper.fileName() );
 }
 
 
diff --git a/plugins/audio_file_processor/audio_file_processor.h b/plugins/audio_file_processor/audio_file_processor.h
index e2e00689b..3c001094e 100644
--- a/plugins/audio_file_processor/audio_file_processor.h
+++ b/plugins/audio_file_processor/audio_file_processor.h
@@ -2,7 +2,7 @@
  * audio_file_processor.h - declaration of class audioFileProcessor
  *                          (instrument-plugin for using audio-files)
  *
- * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -52,7 +52,7 @@ public:
 						QDomElement & _parent );
 	virtual void loadSettings( const QDomElement & _this );
 
-	virtual void loadFile( const QString & _file );
+	virtual void loadResource( const ResourceItem * _resourceItem );
 
 	virtual QString nodeName( void ) const;
 
@@ -60,7 +60,7 @@ public:
 
 	virtual f_cnt_t desiredReleaseFrames( void ) const
 	{
-		return( 128 );
+		return 128;
 	}
 
 	virtual pluginView * instantiateView( QWidget * _parent );
@@ -129,6 +129,4 @@ private:
 } ;
 
 
-
-
 #endif