massive gutting and refactoring. sperl is lazy carnivore.

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@270 6778bc44-b910-0410-a7a0-be141de4315d

src/projectM-engine/CustomShape.hpp

@@ -114,14 +114,6 @@ public:
     void load_unspec_init_cond_shape();
   };
 
-/** Splaytree traversal helpers */
-inline void free_custom_shape_helper( void *custom_shape ) {
-    delete ((CustomShape *)custom_shape);
-  }
-
-inline void eval_custom_shape_init_conds_helper( void *custom_shape ) {
-    ((CustomShape *)custom_shape)->eval_custom_shape_init_conds();
-  }
 
 #endif /** !_CUSTOM_SHAPE_H */
 

src/projectM-engine/InitCond.cpp

@@ -54,7 +54,7 @@ InitCond::~InitCond() {
   }
 
 /* Evaluate an initial conditon */
-void InitCond::eval_init_cond() {
+void InitCond::evaluate() {
 
   /* Parameter is of boolean type, either a 1 or 0 value integer */
   /* Set matrix flag to zero. This ensures

src/projectM-engine/InitCond.hpp

@@ -49,23 +49,11 @@ public:
 
     InitCond( Param * param, CValue init_val );
     ~InitCond();
-    void eval_init_cond();
+    void evaluate();
 
     void init_cond_to_string();
     void write_init();
   };
 
-/** Splaytree traversal helpers */
-inline void eval_init_cond_helper( void *init_cond ) {
-    ((InitCond *)init_cond)->eval_init_cond();
-  }
-
-inline void write_init_helper( void *init_cond ) {
-    ((InitCond *)init_cond)->write_init();
-  }
-
-inline void init_cond_to_string_helper( void *init_cond ) {
-    ((InitCond *)init_cond)->init_cond_to_string();
-  }
 
 #endif /** !_INIT_COND_H */

src/projectM-engine/PerFrameEqn.cpp

@@ -35,7 +35,7 @@
 #include "wipemalloc.h"
 
 /* Evaluate an equation */
-void PerFrameEqn::eval_per_frame_eqn() {
+void PerFrameEqn::evaluate() {
 
      if (PER_FRAME_EQN_DEBUG) { 
 		 printf("per_frame_%d=%s= ", index, param->name);

src/projectM-engine/PerFrameEqn.hpp

@@ -44,17 +44,9 @@ public:
     PerFrameEqn(int index, Param * param, GenExpr * gen_expr);
     ~PerFrameEqn();
 
-    void eval_per_frame_eqn();
+    void evaluate();
     void eval_per_frame_init_eqn( PerFrameEqn *per_frame_eqn );
   };
 
-/** Splaytree traversal helpers */
-inline void eval_per_frame_eqn_helper( void *per_frame_eqn ) {
-    ((PerFrameEqn *)per_frame_eqn)->eval_per_frame_eqn();
-  }
-
-inline void free_per_frame_eqn_helper( void *per_frame_eqn ) {
-    delete (PerFrameEqn *)per_frame_eqn;
-  }
 
 #endif /** !_PER_FRAME_EQN_H */

src/projectM-engine/PerPixelEqn.cpp

@@ -37,7 +37,7 @@
 #include "wipemalloc.h"
 
 /* Evaluates a per pixel equation */
-void PerPixelEqn::evalPerPixelEqn() {
+void PerPixelEqn::evaluate() {
 
   float ** param_matrix = NULL;
   GenExpr * eqn_ptr = NULL;
@@ -83,34 +83,10 @@ void PerPixelEqn::evalPerPixelEqn() {
    param->flags |= P_FLAG_PER_PIXEL;
 }
 
-PerPixelEqn *PerPixelEqn::new_per_pixel_eqn( int index, Param * param, 
-                                             GenExpr * gen_expr) {
+PerPixelEqn(int _index, Param * _param, GenExrp *_gen_expr):index(_index), param(_param), gen_expr(_gen_expr) {
 
-	PerPixelEqn * per_pixel_eqn;
-	
-	if (index < 0)
-	  return NULL;
-	if (param == NULL)
-	  return NULL;
-	if (gen_expr == NULL)
-	  return NULL;
-	
-	if ((per_pixel_eqn = (PerPixelEqn*)wipemalloc(sizeof(PerPixelEqn))) == NULL)
-	  return NULL;
-	
-	per_pixel_eqn->index = index;
-	per_pixel_eqn->param = param;
-	per_pixel_eqn->gen_expr = gen_expr;
-	
-	return per_pixel_eqn;	
+	assert(index >= 0);
+	assert(param != NULL);
+	assert(gen_expr != null);
 }
 
-void PerPixelEqn::free_per_pixel_eqn() {
-
-	delete gen_expr;
-	
-	return;
-}
-
-
-

src/projectM-engine/PerPixelEqn.hpp

@@ -56,19 +56,11 @@ public:
     GenExpr *gen_expr;	
 
     void evalPerPixelEqns( Preset *preset );
-    void evalPerPixelEqn();
+    void evaluate();
+
+    PerPixelEqn(int index, Param * param, GenExpr * gen_expr);
 
-    void free_per_pixel_eqn();
-    static PerPixelEqn *new_per_pixel_eqn( int index, Param *param, GenExpr * gen_expr);
   };
 
-/** Splaytree traversal helpers */
-inline void free_per_pixel_eqn_helper( void *per_pixel_eqn ) {
-    ((PerPixelEqn *)per_pixel_eqn)->free_per_pixel_eqn();
-  }
-
-inline void eval_per_pixel_eqn_helper( void *per_pixel_eqn ) {
-    ((PerPixelEqn *)per_pixel_eqn)->evalPerPixelEqn();
-  }
 
 #endif /** !_PER_PIXEL_EQN_H */

src/projectM-engine/PerPointEqn.hpp

@@ -45,13 +45,9 @@ public:
     static PerPointEqn *new_per_point_eqn( int index, Param *param, GenExpr *gen_expr);
  };
 
-/** Splaytree traversal helpers */
-inline void free_per_point_eqn_helper( void *per_point_eqn ) {
-    delete ((PerPointEqn *)per_point_eqn);
-  }
 
-inline void eval_per_point_eqn_helper( void *per_point_eqn ) {
-    ((PerPointEqn *)per_point_eqn)->evalPerPointEqn();
-  }
+//inline void eval_per_point_eqn_helper( void *per_point_eqn ) {
+//    ((PerPointEqn *)per_point_eqn)->evalPerPointEqn();
+//  }
 
 #endif /** !_PER_POINT_EQN_H */

src/projectM-engine/Preset.hpp

@@ -96,8 +96,6 @@ public:
     std::map<std::string,InitCond*> * per_frame_init_eqn_tree; /* per frame initial equations */
     std::map<std::string,InitCond*> * init_cond_tree; /* initial conditions */
     std::map<std::string,Param*> * user_param_tree; /* user parameter splay tree */
-    std::map<int, CustomWave *> * custom_wave_tree; /* custom wave forms for this preset */
-    std::map<int, CustomShape *> * custom_shape_tree; /* custom shapes for this preset */
 
     int add_per_pixel_eqn( char *name, GenExpr *gen_expr );
     int isPerPixelEqn( int op );