[Traverso-commit] traverso/src/engine defines.h

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/09/10 18:43:03

Modified files:
        src/engine     : defines.h 

Log message:
        Conversion work from nframes_t to TimeRef

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/defines.h?cvsroot=traverso&r1=1.18&r2=1.19

Patches:
Index: defines.h
===================================================================
RCS file: /sources/traverso/traverso/src/engine/defines.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- defines.h   31 Aug 2007 09:19:51 -0000      1.18
+++ defines.h   10 Sep 2007 18:43:03 -0000      1.19
@@ -119,6 +119,22 @@
                return (qreal)left.m_position / right;
        }
        
+       friend TimeRef operator/(const TimeRef& left, const TimeRef& right) {
+               Q_ASSERT(right.m_position != 0);
+               TimeRef location(left.m_position / right.m_position);
+               return location;
+       }
+       
+       friend TimeRef operator*(const qint64 left, TimeRef& right) {
+               TimeRef location(left * right.m_position);
+               return location;
+       }
+       
+       friend TimeRef operator*(const TimeRef& left, TimeRef& right) {
+               TimeRef location(left.m_position * right.m_position);
+               return location;
+       }
+       
        friend int operator<(const TimeRef& left, const TimeRef& right) {
                return left.m_position < right.m_position;
        }
@@ -169,8 +185,8 @@
 typedef unsigned long          channel_t;
 
 typedef float audio_sample_t;
-//typedef unsigned char peak_data_t;
-typedef short peak_data_t;
+typedef unsigned char peak_data_t;
+// typedef short peak_data_t;
 
 
 typedef FastDelegate1<nframes_t, int> ProcessCallback;