X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fdata_type.h;h=2a4514a5cf2110dd066b257937ffd2704cd4ad13;hb=0622a0cc3068a06d328119e90b7d9c5f5a84df32;hp=07ba7c60ef3dd45e351c5d5104b04713aa7f3582;hpb=92e412661772e6b9c83109b7ee4996f4c040d3f4;p=ardour.git

diff --git a/libs/ardour/ardour/data_type.h b/libs/ardour/ardour/data_type.h
index 07ba7c60ef..2a4514a5cf 100644
--- 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,20 +21,20 @@
 #define __ardour_data_type_h__
 
 #include <string>
-#include <jack/jack.h>
+#include <stdint.h>
+#include <glib.h>
 
-#include "i18n.h"
+#include "ardour/libardour_visibility.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
  * other type representations, simple comparison between then, etc.  This code
  * is deliberately 'ugly' so other code doesn't have to be.
  */
-class DataType
+class LIBARDOUR_API DataType
 {
 public:
 	/** Numeric symbol for this DataType.
@@ -63,40 +63,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
-		}
-	}
-
-	const char* to_i18n_string() const {
-		switch (_symbol) {
-			case AUDIO: return _("audio");
-			case MIDI: return _("MIDI");
-			default: return _("unknown");
+		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; }
 
@@ -133,7 +119,6 @@ private:
 };
 
 
-
 } // namespace ARDOUR
 
 #endif // __ardour_data_type_h__