From 641be31d66546d2a819872cad4b6a94b26221f29 Mon Sep 17 00:00:00 2001
From: Garrett <g@floft.net>
Date: Tue, 21 Oct 2014 22:58:30 -0700
Subject: [PATCH] No more reference counts for GIG file instances

Since libgig can't really be used in a multithreaded way unless it was
somewhat rewritten, just use a separate instance of the file for each
new GIG file regardless of if we already have one open in the current
file. Since it's fast now, you can easily have quite a few very large
GIG files open and still have low latency.

Also removed C++11 requirement since I no longer need a move
constructor.
---
 plugins/gig_player/CMakeLists.txt |  2 +-
 plugins/gig_player/gig_player.cpp | 74 +++++++------------------------
 plugins/gig_player/gig_player.h   |  4 +-
 3 files changed, 19 insertions(+), 61 deletions(-)

diff --git a/plugins/gig_player/CMakeLists.txt b/plugins/gig_player/CMakeLists.txt
index b786c0fe4..2eb71eca5 100644
--- a/plugins/gig_player/CMakeLists.txt
+++ b/plugins/gig_player/CMakeLists.txt
@@ -3,7 +3,7 @@ if(LMMS_HAVE_GIG)
 	INCLUDE_DIRECTORIES(${GIG_INCLUDE_DIRS})
 
 	# Required for not crashing loading files with libgig
-	SET(GCC_COVERAGE_COMPILE_FLAGS "-fexceptions -std=c++11")
+	SET(GCC_COVERAGE_COMPILE_FLAGS "-fexceptions")
 	add_definitions(${GCC_COVERAGE_COMPILE_FLAGS})
 
     LINK_DIRECTORIES(${GIG_LIBRARY_DIRS})
diff --git a/plugins/gig_player/gig_player.cpp b/plugins/gig_player/gig_player.cpp
index 4b15ba794..9761c245b 100644
--- a/plugins/gig_player/gig_player.cpp
+++ b/plugins/gig_player/gig_player.cpp
@@ -78,11 +78,6 @@ struct GIGPluginData
 
 
 
-// Static map of current GIG instances
-QMap<QString, gigInstance*> gigInstrument::s_instances;
-QMutex gigInstrument::s_instancesMutex;
-
-
 
 gigInstrument::gigInstrument( InstrumentTrack * _instrument_track ) :
 	Instrument( _instrument_track, &gigplayer_plugin_descriptor ),
@@ -201,22 +196,7 @@ void gigInstrument::freeInstance()
 
 	if ( m_instance != NULL )
 	{
-		s_instancesMutex.lock();
-		--(m_instance->refCount);
-
-		// No more references
-		if( m_instance->refCount <= 0 )
-		{
-			s_instances.remove( m_filename );
-			qDebug() << "gigInstrument: deleting instance of" << m_filename;
-			delete m_instance;
-		}
-		else
-		{
-			qDebug() << "gigInstrument: decreasing reference count for" << m_filename;
-		}
-
-		s_instancesMutex.unlock();
+		delete m_instance;
 		m_instance = NULL;
 	}
 
@@ -228,7 +208,6 @@ void gigInstrument::freeInstance()
 void gigInstrument::openFile( const QString & _gigFile, bool updateTrackName )
 {
 	emit fileLoading();
-	bool succeeded = false;
 
 	// Used for loading file
 	char * gigAscii = qstrdup( qPrintable( SampleBuffer::tryToMakeAbsolute( _gigFile ) ) );
@@ -238,42 +217,19 @@ void gigInstrument::openFile( const QString & _gigFile, bool updateTrackName )
 	freeInstance();
 
 	m_synthMutex.lock();
-	s_instancesMutex.lock();
 
-	// Increment Reference
-	if( s_instances.contains( relativePath ) )
+	try
 	{
-		m_instance = s_instances[ relativePath ];
-		m_instance->refCount++;
-		qDebug() << "gigInstrument: increasing reference count for" << relativePath;
-		succeeded = true;
-	}
-
-	// Add to map, if doesn't exist.
-	else
-	{
-		try
-		{
-			// Grab this sf from the top of the stack and add to list
-			m_instance = new gigInstance( _gigFile );
-			s_instances.insert( relativePath, m_instance );
-			succeeded = true;
-			qDebug() << "gigInstrument: adding instance of" << relativePath;
-		}
-		catch( ... )
-		{
-			m_instance = NULL;
-			succeeded = false;
-		}
-	}
-
-	s_instancesMutex.unlock();
-	m_synthMutex.unlock();
-
-	if( succeeded )
+		m_instance = new gigInstance( _gigFile );
 		m_filename = relativePath;
-	else
+	}
+	catch( ... )
+	{
+		m_instance = NULL;
 		m_filename = "";
+	}
+
+	m_synthMutex.unlock();
 
 	emit fileChanged();
 
@@ -551,7 +507,11 @@ void gigInstrument::play( sampleFrame * _working_buffer )
 	// Convert sample rate if needed
 	if( sampleConvert )
 	{
-		convertSampleRate(*convertBuf, *_working_buffer, samples, frames, oldRate, newRate);
+		// If an error occured, it's better to render nothing than have some
+		// screetching high-volume noise
+		if (!convertSampleRate(*convertBuf, *_working_buffer, samples, frames, oldRate, newRate))
+			std::memset(&_working_buffer[0][0], 0, 2*frames*sizeof(float)); // *2 for channels
+
 		delete[] convertBuf;
 	}
 
@@ -603,7 +563,7 @@ void gigInstrument::deleteNotePluginData( NotePlayHandle * _n )
 
 			float fadeOut = i->releaseTime;
 			int samples = i->sample->SamplesTotal;
-			int len = std::min( int( std::floor( fadeOut * engine::mixer()->processingSampleRate() ) ),
+			int len = std::min( int( floor( fadeOut * engine::mixer()->processingSampleRate() ) ),
 					samples - i->pos );
 
 			// TODO: not sample exact? What about in the middle of us writing out the sample?
@@ -705,7 +665,7 @@ Dimension gigInstrument::getDimensions( gig::Region* pRegion, int velocity, bool
 				dim.DimValues[i] = 0;
 				break;
 			default:
-				qDebug() << "gigInstrument: Unknown dimension";
+				// Warning: unknown dimension
 				dim.DimValues[i] = 0;
 		}
 	}
diff --git a/plugins/gig_player/gig_player.h b/plugins/gig_player/gig_player.h
index 4b5fed5f1..c65342a2b 100644
--- a/plugins/gig_player/gig_player.h
+++ b/plugins/gig_player/gig_player.h
@@ -51,8 +51,7 @@ class gigInstance
 public:
 	gigInstance( QString filename ) :
 		riff( filename.toUtf8().constData() ),
-		gig( &riff ),
-		refCount( 1 )
+		gig( &riff )
 	{}
 
 private:
@@ -60,7 +59,6 @@ private:
 
 public:
 	gig::File gig;
-	int refCount;
 };