Tempo ramps - audio-locked meters have a bbt of 1|1|0

[ardour.git] / libs / pbd / pbd / compose.h

diff --git a/libs/pbd/pbd/compose.h b/libs/pbd/pbd/compose.h
index cb4182699f53292024a1c3cbbc8f2b28d05dfc97..231afa583e4ba0a53703ff99b2446f9ab75e97c1 100644 (file)
--- a/libs/pbd/pbd/compose.h
+++ b/libs/pbd/pbd/compose.h
@@ -54,6 +54,10 @@ namespace StringPrivate
     template <typename T>
     Composition &arg(const T &obj);
 
+    // specialization to catch strings (C++ and C)
+    Composition &arg(const std::string &str);
+    Composition &arg(char const * const cstr);
+
     // compose and return string
     std::string str() const;
 
@@ -106,7 +110,7 @@ namespace StringPrivate
     case '8':
     case '9':
       return true;
-    
+
     default:
       return false;
     }
@@ -120,29 +124,65 @@ namespace StringPrivate
     os << obj;
 
     std::string rep = os.str();
-  
+
     if (!rep.empty()) {                // manipulators don't produce output
       for (specification_map::const_iterator i = specs.lower_bound(arg_no),
             end = specs.upper_bound(arg_no); i != end; ++i) {
        output_list::iterator pos = i->second;
        ++pos;
-      
+
        output.insert(pos, rep);
       }
-    
+
       os.str(std::string());
       //os.clear();
       ++arg_no;
     }
-  
+
     return *this;
   }
 
+  inline Composition &Composition::arg(const std::string &str)
+  {
+         /* specialization to ensure that empty strings show up
+          * in the output
+          */
+         for (specification_map::const_iterator i = specs.lower_bound(arg_no),
+                      end = specs.upper_bound(arg_no); i != end; ++i) {
+                 output_list::iterator pos = i->second;
+                 ++pos;
+
+                 output.insert(pos, str);
+         }
+
+         ++arg_no;
+
+         return *this;
+  }
+
+  inline Composition &Composition::arg(char const * const cstr)
+  {
+         /* specialization to ensure that empty C strings show up
+          * in the output
+          */
+         for (specification_map::const_iterator i = specs.lower_bound(arg_no),
+                      end = specs.upper_bound(arg_no); i != end; ++i) {
+                 output_list::iterator pos = i->second;
+                 ++pos;
+
+                 output.insert(pos, std::string (cstr));
+         }
+
+         ++arg_no;
+
+         return *this;
+  }
+
   inline Composition::Composition(std::string fmt)
     : arg_no(1)
   {
     std::string::size_type b = 0, i = 0;
-  
+
     // fill in output with the strings between the %1 %2 %3 etc. and
     // fill in specs with the positions
     while (i < fmt.length()) {
@@ -154,7 +194,7 @@ namespace StringPrivate
        else if (is_number(fmt[i + 1])) { // aha! a spec!
          // save string
          output.push_back(fmt.substr(b, i - b));
-       
+
          int n = 1;            // number of digits
          int spec_no = 0;
 
@@ -167,9 +207,9 @@ namespace StringPrivate
          spec_no /= 10;
          output_list::iterator pos = output.end();
          --pos;                // safe since we have just inserted a string>
-       
+
          specs.insert(specification_map::value_type(spec_no, pos));
-       
+
          // jump over spec string
          i += n;
          b = i;
@@ -180,7 +220,7 @@ namespace StringPrivate
       else
        ++i;
     }
-  
+
     if (i - b > 0)             // add the rest of the string
       output.push_back(fmt.substr(b, i - b));
   }
@@ -189,11 +229,11 @@ namespace StringPrivate
   {
     // assemble string
     std::string str;
-  
+
     for (output_list::const_iterator i = output.begin(), end = output.end();
         i != end; ++i)
       str += *i;
-  
+
     return str;
   }
 }
@@ -204,7 +244,7 @@ namespace StringPrivate
   // a series of functions which accept a format string on the form "text %1
   // more %2 less %3" and a number of templated parameters and spits out the
   // composited string
-  template <typename T1> 
+  template <typename T1>
   inline std::string string_compose(const std::string &fmt, const T1 &o1)
   {
     StringPrivate::Composition c(fmt);
@@ -212,7 +252,7 @@ namespace StringPrivate
     return c.str();
   }
 
-  template <typename T1, typename T2> 
+  template <typename T1, typename T2>
   inline std::string string_compose(const std::string &fmt,
                             const T1 &o1, const T2 &o2)
   {
@@ -221,7 +261,7 @@ namespace StringPrivate
     return c.str();
   }
 
-  template <typename T1, typename T2, typename T3> 
+  template <typename T1, typename T2, typename T3>
   inline std::string string_compose(const std::string &fmt,
                             const T1 &o1, const T2 &o2, const T3 &o3)
   {
@@ -230,7 +270,7 @@ namespace StringPrivate
     return c.str();
   }
 
-  template <typename T1, typename T2, typename T3, typename T4> 
+  template <typename T1, typename T2, typename T3, typename T4>
   inline std::string string_compose(const std::string &fmt,
                             const T1 &o1, const T2 &o2, const T3 &o3,
                             const T4 &o4)
@@ -240,7 +280,7 @@ namespace StringPrivate
     return c.str();
   }
 
-  template <typename T1, typename T2, typename T3, typename T4, typename T5> 
+  template <typename T1, typename T2, typename T3, typename T4, typename T5>
   inline std::string string_compose(const std::string &fmt,
                             const T1 &o1, const T2 &o2, const T3 &o3,
                             const T4 &o4, const T5 &o5)
@@ -251,7 +291,7 @@ namespace StringPrivate
   }
 
   template <typename T1, typename T2, typename T3, typename T4, typename T5,
-           typename T6> 
+           typename T6>
   inline std::string string_compose(const std::string &fmt,
                             const T1 &o1, const T2 &o2, const T3 &o3,
                             const T4 &o4, const T5 &o5, const T6 &o6)
@@ -262,7 +302,7 @@ namespace StringPrivate
   }
 
   template <typename T1, typename T2, typename T3, typename T4, typename T5,
-           typename T6, typename T7> 
+           typename T6, typename T7>
   inline std::string string_compose(const std::string &fmt,
                             const T1 &o1, const T2 &o2, const T3 &o3,
                             const T4 &o4, const T5 &o5, const T6 &o6,
@@ -274,7 +314,7 @@ namespace StringPrivate
   }
 
   template <typename T1, typename T2, typename T3, typename T4, typename T5,
-           typename T6, typename T7, typename T8> 
+           typename T6, typename T7, typename T8>
   inline std::string string_compose(const std::string &fmt,
                             const T1 &o1, const T2 &o2, const T3 &o3,
                             const T4 &o4, const T5 &o5, const T6 &o6,
@@ -286,7 +326,7 @@ namespace StringPrivate
   }
 
   template <typename T1, typename T2, typename T3, typename T4, typename T5,
-           typename T6, typename T7, typename T8, typename T9> 
+           typename T6, typename T7, typename T8, typename T9>
   inline std::string string_compose(const std::string &fmt,
                             const T1 &o1, const T2 &o2, const T3 &o3,
                             const T4 &o4, const T5 &o5, const T6 &o6,
@@ -298,7 +338,7 @@ namespace StringPrivate
   }
 
   template <typename T1, typename T2, typename T3, typename T4, typename T5,
-           typename T6, typename T7, typename T8, typename T9, typename T10> 
+           typename T6, typename T7, typename T8, typename T9, typename T10>
   inline std::string string_compose(const std::string &fmt,
                             const T1 &o1, const T2 &o2, const T3 &o3,
                             const T4 &o4, const T5 &o5, const T6 &o6,
@@ -310,10 +350,10 @@ namespace StringPrivate
       .arg(o10);
     return c.str();
   }
-  
+
   template <typename T1, typename T2, typename T3, typename T4, typename T5,
            typename T6, typename T7, typename T8, typename T9, typename T10,
-           typename T11> 
+           typename T11>
   inline std::string string_compose(const std::string &fmt,
                             const T1 &o1, const T2 &o2, const T3 &o3,
                             const T4 &o4, const T5 &o5, const T6 &o6,
@@ -328,7 +368,7 @@ namespace StringPrivate
 
   template <typename T1, typename T2, typename T3, typename T4, typename T5,
            typename T6, typename T7, typename T8, typename T9, typename T10,
-           typename T11, typename T12> 
+           typename T11, typename T12>
   inline std::string string_compose(const std::string &fmt,
                             const T1 &o1, const T2 &o2, const T3 &o3,
                             const T4 &o4, const T5 &o5, const T6 &o6,
@@ -343,7 +383,7 @@ namespace StringPrivate
 
   template <typename T1, typename T2, typename T3, typename T4, typename T5,
            typename T6, typename T7, typename T8, typename T9, typename T10,
-           typename T11, typename T12, typename T13> 
+           typename T11, typename T12, typename T13>
   inline std::string string_compose(const std::string &fmt,
                             const T1 &o1, const T2 &o2, const T3 &o3,
                             const T4 &o4, const T5 &o5, const T6 &o6,
@@ -359,7 +399,7 @@ namespace StringPrivate
 
   template <typename T1, typename T2, typename T3, typename T4, typename T5,
            typename T6, typename T7, typename T8, typename T9, typename T10,
-           typename T11, typename T12, typename T13, typename T14> 
+           typename T11, typename T12, typename T13, typename T14>
   inline std::string string_compose(const std::string &fmt,
                             const T1 &o1, const T2 &o2, const T3 &o3,
                             const T4 &o4, const T5 &o5, const T6 &o6,
@@ -376,7 +416,7 @@ namespace StringPrivate
   template <typename T1, typename T2, typename T3, typename T4, typename T5,
            typename T6, typename T7, typename T8, typename T9, typename T10,
            typename T11, typename T12, typename T13, typename T14,
-           typename T15> 
+           typename T15>
   inline std::string string_compose(const std::string &fmt,
                             const T1 &o1, const T2 &o2, const T3 &o3,
                             const T4 &o4, const T5 &o5, const T6 &o6,