diff PyRealTime.cpp @ 34:c905122f79e7 vampy2

* Fixes from OpenSolaris build
author cannam
date Wed, 23 Sep 2009 12:07:32 +0000
parents 4f1894c7591b
children
line wrap: on
line diff
--- a/PyRealTime.cpp	Wed Sep 23 11:56:46 2009 +0000
+++ b/PyRealTime.cpp	Wed Sep 23 12:07:32 2009 +0000
@@ -45,18 +45,18 @@
 	self->rt = NULL;
 
 	if (sec == 0 && nsec == 0 && fmt == 0) 
-		self->rt = new RealTime::RealTime();
+		self->rt = new RealTime();
 	else if (fmt == 0)
-		self->rt = new RealTime::RealTime(sec,nsec);
+		self->rt = new RealTime(sec,nsec);
 	else { 
         /// new RealTime from seconds or milliseconds: i.e. >>>RealTime('seconds',12.3)
 		if (!string(fmt).compare("float") ||
 			!string(fmt).compare("seconds"))  
-			self->rt = new RealTime::RealTime( 
+			self->rt = new RealTime( 
 			RealTime::fromSeconds((double) unary)); 
 
 		if (!string(fmt).compare("milliseconds")) {
-			self->rt = new RealTime::RealTime( 
+			self->rt = new RealTime( 
 			RealTime::fromSeconds((double) unary / 1000.0)); }
 	}
 
@@ -205,7 +205,7 @@
     PyObject_New(RealTimeObject, &RealTime_Type); 
 	if (result == NULL) return NULL;
 
-	result->rt = new RealTime::RealTime(
+	result->rt = new RealTime(
 	*((RealTimeObject*)s)->rt + *((RealTimeObject*)w)->rt);
 	return (PyObject*)result;
 }
@@ -217,7 +217,7 @@
     PyObject_New(RealTimeObject, &RealTime_Type); 
 	if (result == NULL) return NULL;
 
-	result->rt = new RealTime::RealTime(
+	result->rt = new RealTime(
 	*((RealTimeObject*)s)->rt - *((RealTimeObject*)w)->rt);
 	return (PyObject*)result;
 }
@@ -313,7 +313,7 @@
 	PyObject_New(RealTimeObject, &RealTime_Type); 
 	if (self == NULL) return NULL;
 
-	self->rt = new RealTime::RealTime(*rt);
+	self->rt = new RealTime(*rt);
 	return (PyObject*) self;
 }*/
 
@@ -326,12 +326,12 @@
 	PyObject_New(RealTimeObject, &RealTime_Type); 
 	if (self == NULL) return NULL;
 
-	self->rt = new RealTime::RealTime(rt);
+	self->rt = new RealTime(rt);
 	return (PyObject*) self;
 }
 
 /*RealTime* from PyRealTime*/
-const Vamp::RealTime::RealTime*
+const Vamp::RealTime*
 PyRealTime_AsRealTime (PyObject *self) { 
 
 	RealTimeObject *s = (RealTimeObject*) self;