fix conflicts after merge with master

[ardour.git] / libs / ardour / ardour / data_type.h

diff --git a/libs/ardour/ardour/data_type.h b/libs/ardour/ardour/data_type.h
index 36114b29a973800551c354e96998bdc715ca1b3f..b4129e26296f4b61a2a721f3c4ad1ee765d71d8a 100644 (file)
--- a/libs/ardour/ardour/data_type.h
+++ b/libs/ardour/ardour/data_type.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2006 Paul Davis
-    Author: Dave Robillard
+    Author: David Robillard
 
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by the Free
@@ -21,11 +21,11 @@
 #define __ardour_data_type_h__
 
 #include <string>
-#include <jack/jack.h>
+#include <stdint.h>
+#include <glib.h>
 
 namespace ARDOUR {
 
-
 /** A type of Data Ardour is capable of processing.
  *
  * The majority of this class is dedicated to conversion to and from various
@@ -61,32 +61,26 @@ public:
 
        /** Construct from a string (Used for loading from XML and Ports)
         * The string can be as in an XML file (eg "audio" or "midi"), or a
-        * Jack type string (from jack_port_type) */
+        */
        DataType(const std::string& str)
        : _symbol(NIL) {
-               if (str == "audio" || str == JACK_DEFAULT_AUDIO_TYPE)
+               if (!g_ascii_strncasecmp(str.c_str(), "audio", str.length())) {
                        _symbol = AUDIO;
-               else if (str == "midi" || str == JACK_DEFAULT_MIDI_TYPE)
+               } else if (!g_ascii_strncasecmp(str.c_str(), "midi", str.length())) {
                        _symbol = MIDI;
-       }
-
-       /** Get the Jack type this DataType corresponds to */
-       const char* to_jack_type() const {
-               switch (_symbol) {
-                       case AUDIO: return JACK_DEFAULT_AUDIO_TYPE;
-                       case MIDI:  return JACK_DEFAULT_MIDI_TYPE;
-                       default:    return "";
                }
        }
 
        /** Inverse of the from-string constructor */
        const char* to_string() const {
                switch (_symbol) {
-                       case AUDIO: return "audio";
-                       case MIDI:  return "midi";
-                       default:    return "unknown"; // reeeally shouldn't ever happen
+               case AUDIO: return "audio";
+               case MIDI:  return "midi";
+               default:    return "unknown"; // reeeally shouldn't ever happen
                }
        }
+    
+       const char* to_i18n_string () const;
 
        inline operator uint32_t() const { return (uint32_t)_symbol; }
 
@@ -123,7 +117,6 @@ private:
 };
 
 
-
 } // namespace ARDOUR
 
 #endif // __ardour_data_type_h__