made STRINGIFY_PLUGIN_NAME from embed.h a generic macro STRINGIFY in lmms_basics.h

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1784 0778d3d1-df1d-0410-868b-ea421aaaa00d

include/embed.h

@@ -31,10 +31,7 @@
 
 
 #include "export.h"
-
-
-#define STRINGIFY_PLUGIN_NAME(s) STR(s)
-#define STR(PN)	#PN
+#include "lmms_basics.h"
 
 
 namespace embed
@@ -124,8 +121,7 @@ public:
 
 	virtual QString pixmapName( void ) const
 	{
-		return QString( STRINGIFY_PLUGIN_NAME(PLUGIN_NAME) ) +
-								"::" + m_name;
+		return QString( STRINGIFY(PLUGIN_NAME) ) + "::" + m_name;
 	}
 
 } ;

include/lmms_basics.h

@@ -136,4 +136,9 @@ typedef sample_t surroundSampleFrame[SURROUND_CHANNELS];
 typedef sample_t sampleFrameA[DEFAULT_CHANNELS] __attribute__((__aligned__(ALIGN_SIZE)));
 #endif
 
+
+#define STRINGIFY(s) STR(s)
+#define STR(PN)	#PN
+
+
 #endif

include/plugin.h

@@ -152,8 +152,7 @@ public:
 	// returns display-name out of descriptor
 	virtual QString displayName( void ) const
 	{
-		return model::displayName().isNull() ?
-						m_descriptor->displayName :
+		return m_descriptor ? m_descriptor->displayName :
 							model::displayName();
 	}