(hopefully) final huge namespace update.

1 files changed, 19 insertions, 14 deletions

diff --git a/muse2/muse/tempo.cpp b/muse2/muse/tempo.cpp
index e41e39c6..051fc7c5 100644
--- a/muse2/muse/tempo.cpp
+++ b/muse2/muse/tempo.cpp
@@ -30,7 +30,11 @@
 #include "gconfig.h"
 #include "xml.h"
 
-TempoList tempomap;
+namespace MusEGlobal {
+MusECore::TempoList tempomap;
+}
+
+namespace MusECore {
 
 //---------------------------------------------------------
 //   TempoList
@@ -83,7 +87,7 @@ void TempoList::normalize()
       for (iTEvent e = begin(); e != end(); ++e) {
             e->second->frame = frame;
             unsigned dtick = e->first - e->second->tick;
-            double dtime = double(dtick) / (MusEConfig::config.division * _globalTempo * 10000.0/e->second->tempo);
+            double dtime = double(dtick) / (MusEGlobal::config.division * _globalTempo * 10000.0/e->second->tempo);
             frame += lrint(dtime * MusEGlobal::sampleRate);
             }
       }
@@ -270,12 +274,12 @@ unsigned TempoList::tick2frame(unsigned tick, int* sn) const
                   return 0;
                   }
             unsigned dtick = tick - i->second->tick;
-            double dtime   = double(dtick) / (MusEConfig::config.division * _globalTempo * 10000.0/ i->second->tempo);
+            double dtime   = double(dtick) / (MusEGlobal::config.division * _globalTempo * 10000.0/ i->second->tempo);
             unsigned dframe   = lrint(dtime * MusEGlobal::sampleRate);
             f = i->second->frame + dframe;
             }
       else {
-            double t = (double(tick) * double(_tempo)) / (double(MusEConfig::config.division) * _globalTempo * 10000.0);
+            double t = (double(tick) * double(_tempo)) / (double(MusEGlobal::config.division) * _globalTempo * 10000.0);
             f = lrint(t * MusEGlobal::sampleRate);
             }
       if (sn)
@@ -314,10 +318,10 @@ unsigned TempoList::frame2tick(unsigned frame, int* sn) const
             unsigned te  = e->second->tempo;
             int dframe   = frame - e->second->frame;
             double dtime = double(dframe) / double(MusEGlobal::sampleRate);
-            tick         = e->second->tick + lrint(dtime * _globalTempo * MusEConfig::config.division * 10000.0 / te);
+            tick         = e->second->tick + lrint(dtime * _globalTempo * MusEGlobal::config.division * 10000.0 / te);
             }
       else
-            tick = lrint((double(frame)/double(MusEGlobal::sampleRate)) * _globalTempo * MusEConfig::config.division * 10000.0 / double(_tempo));
+            tick = lrint((double(frame)/double(MusEGlobal::sampleRate)) * _globalTempo * MusEGlobal::config.division * 10000.0 / double(_tempo));
       if (sn)
             *sn = _tempoSN;
       return tick;
@@ -338,7 +342,7 @@ unsigned TempoList::deltaTick2frame(unsigned tick1, unsigned tick2, int* sn) con
                   return 0;
                   }
             unsigned dtick = tick1 - i->second->tick;
-            double dtime   = double(dtick) / (MusEConfig::config.division * _globalTempo * 10000.0/ i->second->tempo);
+            double dtime   = double(dtick) / (MusEGlobal::config.division * _globalTempo * 10000.0/ i->second->tempo);
             unsigned dframe   = lrint(dtime * MusEGlobal::sampleRate);
             f1 = i->second->frame + dframe;
             
@@ -347,15 +351,15 @@ unsigned TempoList::deltaTick2frame(unsigned tick1, unsigned tick2, int* sn) con
                   return 0;
                   }
             dtick = tick2 - i->second->tick;
-            dtime   = double(dtick) / (MusEConfig::config.division * _globalTempo * 10000.0/ i->second->tempo);
+            dtime   = double(dtick) / (MusEGlobal::config.division * _globalTempo * 10000.0/ i->second->tempo);
             dframe   = lrint(dtime * MusEGlobal::sampleRate);
             f2 = i->second->frame + dframe;
             }
       else {
-            double t = (double(tick1) * double(_tempo)) / (double(MusEConfig::config.division) * _globalTempo * 10000.0);
+            double t = (double(tick1) * double(_tempo)) / (double(MusEGlobal::config.division) * _globalTempo * 10000.0);
             f1 = lrint(t * MusEGlobal::sampleRate);
             
-            t = (double(tick2) * double(_tempo)) / (double(MusEConfig::config.division) * _globalTempo * 10000.0);
+            t = (double(tick2) * double(_tempo)) / (double(MusEGlobal::config.division) * _globalTempo * 10000.0);
             f2 = lrint(t * MusEGlobal::sampleRate);
             }
       if (sn)
@@ -387,7 +391,7 @@ unsigned TempoList::deltaFrame2tick(unsigned frame1, unsigned frame2, int* sn) c
             unsigned te  = e->second->tempo;
             int dframe   = frame1 - e->second->frame;
             double dtime = double(dframe) / double(MusEGlobal::sampleRate);
-            tick1         = e->second->tick + lrint(dtime * _globalTempo * MusEConfig::config.division * 10000.0 / te);
+            tick1         = e->second->tick + lrint(dtime * _globalTempo * MusEGlobal::config.division * 10000.0 / te);
             
             for (e = begin(); e != end();) {
                   ciTEvent ee = e;
@@ -401,12 +405,12 @@ unsigned TempoList::deltaFrame2tick(unsigned frame1, unsigned frame2, int* sn) c
             te  = e->second->tempo;
             dframe   = frame2 - e->second->frame;
             dtime = double(dframe) / double(MusEGlobal::sampleRate);
-            tick2         = e->second->tick + lrint(dtime * _globalTempo * MusEConfig::config.division * 10000.0 / te);
+            tick2         = e->second->tick + lrint(dtime * _globalTempo * MusEGlobal::config.division * 10000.0 / te);
             }
       else
       {
-            tick1 = lrint((double(frame1)/double(MusEGlobal::sampleRate)) * _globalTempo * MusEConfig::config.division * 10000.0 / double(_tempo));
-            tick2 = lrint((double(frame2)/double(MusEGlobal::sampleRate)) * _globalTempo * MusEConfig::config.division * 10000.0 / double(_tempo));
+            tick1 = lrint((double(frame1)/double(MusEGlobal::sampleRate)) * _globalTempo * MusEGlobal::config.division * 10000.0 / double(_tempo));
+            tick2 = lrint((double(frame2)/double(MusEGlobal::sampleRate)) * _globalTempo * MusEGlobal::config.division * 10000.0 / double(_tempo));
       }
       if (sn)
             *sn = _tempoSN;
@@ -521,4 +525,5 @@ int TEvent::read(Xml& xml)
       return 0;
       }
 
+} // namespace MusECore