Merge branch 'preset-factory-error-handling'

Author: carm

src/libprojectM/MilkdropPresetFactory/Expr.cpp

@@ -157,11 +157,25 @@ float TreeExpr::eval_tree_expr ( int mesh_i, int mesh_j )
 	/* Otherwise, this node is an infix operator. Evaluate
 	   accordingly */
 
-	assert(left);
-	left_arg = left->eval_tree_expr ( mesh_i, mesh_j );
+	/* Safe guard in case the user gave a partially written expression */
+	if (left == NULL) {
+		if (infix_op == Eval::infix_mult)
+			left_arg = 1;
+		else
+			left_arg = 0;
+	}
+	else
+		left_arg = left->eval_tree_expr ( mesh_i, mesh_j );
 
-	assert(right);
-	right_arg = right->eval_tree_expr ( mesh_i, mesh_j );
+	/* Safe guard in case the user gave a partially written expression */
+	if (right == NULL) {
+		if (infix_op == Eval::infix_mult)
+			right_arg = 1;
+		else
+			right_arg = 0;
+	}
+	else
+		right_arg = right->eval_tree_expr ( mesh_i, mesh_j );
 
 
 	switch ( infix_op->type )

src/libprojectM/MilkdropPresetFactory/MilkdropPreset.cpp

@@ -37,9 +37,13 @@
 #include "fatal.h"
 #include <iostream>
 #include <fstream>
+#include <sstream>
 
 #include "PresetFrameIO.hpp"
 
+#include "PresetFactoryManager.hpp"
+
+
 MilkdropPreset::MilkdropPreset(std::istream & in, const std::string & presetName,  PresetOutputs & presetOutputs):
 	Preset(presetName),
     	builtinParams(_presetInputs, presetOutputs),
@@ -291,15 +295,7 @@ void MilkdropPreset::initialize(const std::string & pathname)
 if (MILKDROP_PRESET_DEBUG)
   std::cerr << "[Preset] loading file \"" << pathname << "\"..." << std::endl;
 
-  if ((retval = loadPresetFile(pathname)) < 0)
-  {
-if (MILKDROP_PRESET_DEBUG)
-     std::cerr << "[Preset] failed to load file \"" <<
-      pathname << "\"!" << std::endl;
-
-    /// @bug how should we handle this problem? a well define exception?
-    throw retval;
-  }
+ loadPresetFile(pathname);
 
   postloadInitialize();
 }
@@ -317,7 +313,7 @@ void MilkdropPreset::initialize(std::istream & in)
      std::cerr << "[Preset] failed to load from stream " << std::endl;
 
     /// @bug how should we handle this problem? a well define exception?
-    throw retval;
+    throw PresetFactoryException("failed to read from input stream");
   }
 
   postloadInitialize();
@@ -530,9 +526,12 @@ int MilkdropPreset::loadPresetFile(const std::string & pathname)
   /* Open the file corresponding to pathname */
   std::ifstream fs(pathname.c_str());
   if (!fs || fs.eof()) {
-    if (MILKDROP_PRESET_DEBUG)
-    	std::cerr << "loadPresetFile: loading of file \"" << pathname << "\" failed!\n";
-    return PROJECTM_ERROR;
+
+    std::ostringstream oss;
+    oss << "Problem reading file from path: \"" << pathname << "\"";
+
+    throw PresetFactoryException(oss.str());
+
   }
 
  return readIn(fs);

src/libprojectM/MilkdropPresetFactory/Parser.cpp

@@ -1070,7 +1070,7 @@ int Parser::insert_gen_rec(GenExpr * gen_expr, TreeExpr * root)
 
   if (root == NULL)
   {
-    //if (PARSE_DEBUG) printf("insert_gen_rec: root is null, returning failure\n");
+    if (PARSE_DEBUG) printf("insert_gen_rec: root is null, returning failure\n");
     return PROJECTM_FAILURE;
   }
 

src/libprojectM/MilkdropPresetFactory/Parser.hpp

@@ -29,7 +29,7 @@
 #ifndef _PARSER_H
 #define _PARSER_H
 //#define PARSE_DEBUG 2
-#define PARSE_DEBUG 0
+#define PARSE_DEBUG 2
 
 #include <stdio.h>
 

src/libprojectM/PresetFactoryManager.cpp

@@ -19,6 +19,7 @@
 #include "NativePresetFactory/NativePresetFactory.hpp"
 #endif
 
+#include "Common.hpp"
 #include <sstream>
 PresetFactoryManager::PresetFactoryManager() : _gx(0), _gy(0), initialized(false) {}
 
@@ -75,11 +76,29 @@ void PresetFactoryManager::registerFactory(const std::string & extensions, Prese
 	}
 }
 
+
+
+std::auto_ptr<Preset> PresetFactoryManager::allocate(const std::string & url, const std::string & name)
+{
+	try {
+		const std::string extension = parseExtension (url);
+
+		return factory(extension).allocate(url, name);
+	} catch (const PresetFactoryException & e) {
+		throw e;
+	} catch (const std::exception & e) {
+		throw PresetFactoryException(e.what());
+	} catch (...) {
+		throw PresetFactoryException("uncaught preset factory exception");
+	}
+	return std::auto_ptr<Preset>();
+}
+
 PresetFactory & PresetFactoryManager::factory(const std::string & extension) {
 
-	if (!_factoryMap.count(extension)) {		
+	if (!extensionHandled(extension)) {
 		std::ostringstream os;
-		os << "No factory associated with \"" << extension << "\"." << std::endl;
+		os << "No  preset factory associated with \"" << extension << "\"." << std::endl;
 		throw PresetFactoryException(os.str());
 	}
 	return *_factoryMap[extension];

src/libprojectM/PresetFactoryManager.hpp

@@ -48,6 +48,7 @@ class PresetFactoryManager {
 		/// \param extension the file name extension to verify
 		/// \returns true if a factory exists, false otherwise
 		bool extensionHandled(const std::string & extension) const;
+		std::auto_ptr<Preset> allocate(const std::string & url, const std::string & name);
 
 	private:
 		int _gx, _gy;				

src/libprojectM/PresetLoader.cpp

@@ -136,11 +136,7 @@ std::auto_ptr<Preset> PresetLoader::loadPreset ( unsigned int index )  const
 	// Check that index isn't insane
 	assert ( index >= 0 );
 	assert ( index < _entries.size() );
-
-	// Return a new autopointer to a preset
-	const std::string extension = parseExtension ( _entries[index] );
-
-	return _presetFactoryManager.factory(extension).allocate
+	return _presetFactoryManager.allocate
 		( _entries[index], _presetNames[index] );
 
 }
@@ -149,13 +145,17 @@ std::auto_ptr<Preset> PresetLoader::loadPreset ( unsigned int index )  const
 std::auto_ptr<Preset> PresetLoader::loadPreset ( const std::string & url )  const
 {
 
-	// Return a new autopointer to a preset
-	const std::string extension = parseExtension ( url );
-
-	/// @bug probably should not use url for preset name
-	return _presetFactoryManager.factory(extension).allocate
-		(url, url);
 
+	try {
+		/// @bug probably should not use url for preset name
+		return _presetFactoryManager.allocate
+				(url, url);
+	} catch (const std::exception & e) {
+		throw PresetFactoryException(e.what());
+	} catch (...) {
+		throw PresetFactoryException("preset factory exception of unknown cause");
+	}
+	return std::auto_ptr<Preset>();
 }
 
 void PresetLoader::handleDirectoryError()

src/libprojectM/projectM.cpp

@@ -693,27 +693,35 @@ static void *thread_callback(void *prjm) {
         return index;
     }
 
-    void projectM::selectPreset ( unsigned int index, bool hardCut)
+    void projectM::selectPreset(unsigned int index, bool hardCut)
     {
 
 		if (m_presetChooser->empty())
 			return;
 
-		if (!hardCut) {
-                	timeKeeper->StartSmoothing();
-		}
 
 		*m_presetPos = m_presetChooser->begin(index);
+		switchPreset(hardCut);
+    }
 
+    void projectM::switchPreset(const bool hardCut) {
+		std::string result;
 		if (!hardCut) {
-			switchPreset(m_activePreset2);
+			result = switchPreset(m_activePreset2);
 		} else {
-			switchPreset(m_activePreset);
-			timeKeeper->StartPreset();
+			result = switchPreset(m_activePreset);
+			if (result.empty())
+				timeKeeper->StartPreset();
 		}
 
-	presetSwitchedEvent(hardCut, **m_presetPos);
+		if (result.empty() && !hardCut) {
+            timeKeeper->StartSmoothing();
+		}
 
+		if (result.empty())
+			presetSwitchedEvent(hardCut, **m_presetPos);
+		else
+			presetSwitchFailedEvent(hardCut, **m_presetPos, result);
 }
 
 
@@ -722,20 +730,9 @@ void projectM::selectRandom(const bool hardCut) {
 		if (m_presetChooser->empty())
 			return;
 
-		if (!hardCut) {
-                	timeKeeper->StartSmoothing();
-		}
-
 		*m_presetPos = m_presetChooser->weightedRandom(hardCut);
 
-		if (!hardCut) {
-			switchPreset(m_activePreset2);
-		} else {
-			switchPreset(m_activePreset);
-			timeKeeper->StartPreset();
-		}
-
-		presetSwitchedEvent(hardCut, **m_presetPos);
+		switchPreset(hardCut);
 
 }
 
@@ -744,72 +741,51 @@ void projectM::selectPrevious(const bool hardCut) {
 		if (m_presetChooser->empty())
 			return;
 
-		if (!hardCut) {
-                	timeKeeper->StartSmoothing();
-		}
 
 		m_presetChooser->previousPreset(*m_presetPos);
 
-		if (!hardCut) {
-			switchPreset(m_activePreset2);
-		} else {
-			switchPreset(m_activePreset);
-			timeKeeper->StartPreset();
-		}
-
-		presetSwitchedEvent(hardCut, **m_presetPos);
-
-//		m_activePreset =  m_presetPos->allocate();
-//		renderer->SetPipeline(m_activePreset->pipeline());
-//		renderer->setPresetName(m_activePreset->name());
-
-	       	//timeKeeper->StartPreset();
-
+		switchPreset(hardCut);
 }
 
 void projectM::selectNext(const bool hardCut) {
 
 		if (m_presetChooser->empty())
 			return;
 
-		if (!hardCut) {
-                	timeKeeper->StartSmoothing();
-			std::cout << "start smoothing" << std::endl;
-		}
-
 		m_presetChooser->nextPreset(*m_presetPos);
 
-		if (!hardCut) {
-			switchPreset(m_activePreset2);
-		} else {
-			switchPreset(m_activePreset);
-			timeKeeper->StartPreset();
-		}
-		presetSwitchedEvent(hardCut, **m_presetPos);
-
-
+		switchPreset(hardCut);
 }
 
 /**
- *
- * @param targetPreset
- */
-void projectM::switchPreset(std::auto_ptr<Preset> & targetPreset) {
+* Switches to the target preset.
+* @param targetPreset
+* @return a message indicating an error, empty otherwise.
+*/
+std::string projectM::switchPreset(std::auto_ptr<Preset> & targetPreset) {
 
 	#ifdef SYNC_PRESET_SWITCHES
 	pthread_mutex_lock(&preset_mutex);
 	#endif
-
+	try {
         targetPreset = m_presetPos->allocate();
-
+	} catch (const PresetFactoryException & e) {
+		#ifdef SYNC_PRESET_SWITCHES
+		pthread_mutex_unlock(&preset_mutex);
+		#endif
+		std::cerr << "problem allocating target preset: " << e.message() << std::endl;
+		return e.message();
+	}
         // Set preset name here- event is not done because at the moment this function is oblivious to smooth/hard switches
         renderer->setPresetName(targetPreset->name());
         renderer->SetPipeline(targetPreset->pipeline());
 
 	#ifdef SYNC_PRESET_SWITCHES
 	pthread_mutex_unlock(&preset_mutex);
 	#endif
-    }
+
+	return std::string();
+  }
 
     void projectM::setPresetLock ( bool isLocked )
     {

src/libprojectM/projectM.hpp

@@ -243,6 +243,8 @@ class DLLEXPORT projectM
   /// Occurs when active preset has switched. Switched to index is returned
   virtual void presetSwitchedEvent(bool isHardCut, unsigned int index) const {};
   virtual void shuffleEnabledValueChanged(bool isEnabled) const {};
+  virtual void presetSwitchFailedEvent(bool hardCut, unsigned int index, const std::string & message) const {};
+
 
   /// Occurs whenever preset rating has changed via changePresetRating() method
   virtual void presetRatingChanged(unsigned int index, int rating, PresetRatingType ratingType) const {};
@@ -320,7 +322,9 @@ class DLLEXPORT projectM
 
   Pipeline* currentPipe;
 
-void switchPreset(std::auto_ptr<Preset> & targetPreset);
+  std::string switchPreset(std::auto_ptr<Preset> & targetPreset);
+  void switchPreset(const bool hardCut);
+
 
 
 };

src/projectM-qt/qprojectm.hpp

@@ -35,13 +35,18 @@ class QProjectM : public QObject, public projectM {
 			presetSwitchedSignal(hardCut, index);
 		}
 
+		void presetSwitchFailedEvent(bool hardCut, unsigned int index, const std::string & message) const {
+			presetSwitchFailedSignal(hardCut, index, QString(message.c_str()));
+		}
+
 		void presetRatingChanged(unsigned int index, int rating,
 						PresetRatingType ratingType) const {
 			 presetRatingChangedSignal(index, rating, ratingType);
 		}
 
 	signals:
 		void presetSwitchedSignal(bool hardCut, unsigned int index) const;
+		void presetSwitchFailedSignal(bool hardCut, unsigned int index, const QString & message) const;
 		void presetRatingChangedSignal(unsigned int index, int rating,
 				PresetRatingType ratingType) const;