Changeset 620

Timestamp:

09/06/07 13:09:35 (13 years ago)

Author:

wagi

Message:

- one tokenize function is enough. currently in serialize.h defined, this might change
- saveCache code workover. The cache is now created in ~/.ffado/cache. It is actived since it should break
things. Otherwise it needs fixing.

Files:

• trunk/libffado/src/bebob/bebob_avdevice.cpp (modified) (2 diffs)
• trunk/libffado/src/genericavc/avc_vendormodel.cpp (modified) (4 diffs)
• trunk/libffado/src/libutil/serialize.cpp (modified) (2 diffs)
• trunk/libffado/src/libutil/serialize.h (modified) (1 diff)

trunk/libffado/src/bebob/bebob_avdevice.cpp

@@ -446 +446 @@
-    Glib::ustring cachePath;
-    char* pCachePath;
-libffado/
+
-        debugError( "Could not create path string for cache pool (trying '/var/cache/libffado' instead)\n" );
-        cachePath == "/var/cache/libffado/";
@@ -487 +487 @@
-AvDevice::saveCache()
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/libffado/src/genericavc/avc_vendormodel.cpp

@@ -23 +23 @@
-
-#include "genericavc/avc_vendormodel.h"
+#include "libutil/serialize.h"
-
-#include <fstream>
@@ -34 +35 @@
-using namespace std;
-
-static void
-tokenize(const string& str,
-         vector<string>& tokens,
-         const string& delimiters = " ")
-{
-    // Skip delimiters at beginning.
-    string::size_type lastPos = str.find_first_not_of(delimiters, 0);
-    // Find first "non-delimiter".
-    string::size_type pos     = str.find_first_of(delimiters, lastPos);
-
-    while (string::npos != pos || string::npos != lastPos)
-    {
-        // Found a token, add it to the vector.
-        tokens.push_back(str.substr(lastPos, pos - lastPos));
-        // Skip delimiters.  Note the "not_of"
-        lastPos = str.find_first_not_of(delimiters, pos);
-        // Find next "non-delimiter"
-        pos = str.find_first_of(delimiters, lastPos);
-    }
-}
-
-//-------------------------------------------------
-
-GenericAVC::VendorModelEntry::VendorModelEntry()
-    : vendor_id( 0 )
@@ -89 +67 @@
-{
-    bool equal=true;
-
+
-    equal &= (vendor_id   == rhs.vendor_id);
-    equal &= (model_id    == rhs.model_id);
@@ -216 +194 @@
-    if ( it != m_vendorModelEntries.end() )
-        return *it;
-
+
-    struct VendorModelEntry invalid;
-    return invalid;

trunk/libffado/src/libutil/serialize.cpp

@@ -26 +26 @@
-using namespace std;
-
-void tokenize(const string& str,
-              vector<string>& tokens,
-              const string& delimiters = " ")
-{
-    // Skip delimiters at beginning.
-    string::size_type lastPos = str.find_first_not_of(delimiters, 0);
-    // Find first "non-delimiter".
-    string::size_type pos     = str.find_first_of(delimiters, lastPos);
-
-    while (string::npos != pos || string::npos != lastPos) {
-        // Found a token, add it to the vector.
-        tokens.push_back(str.substr(lastPos, pos - lastPos));
-        // Skip delimiters.  Note the "not_of"
-        lastPos = str.find_first_not_of(delimiters, pos);
-        // Find next "non-delimiter"
-        pos = str.find_first_of(delimiters, lastPos);
-    }
-}
-
-/////////////////////////////////
-
-IMPL_DEBUG_MODULE( Util::XMLSerialize,   XMLSerialize,   DEBUG_LEVEL_NORMAL );
@@ -302 +282 @@
-    return nodeSet.size() > 0;
-}
+
+void
+tokenize(const string& str,
+         vector<string>& tokens,
+         const string& delimiters)
+{
+    // Skip delimiters at beginning.
+    string::size_type lastPos = str.find_first_not_of(delimiters, 0);
+    // Find first "non-delimiter".
+    string::size_type pos     = str.find_first_of(delimiters, lastPos);
+
+    while (string::npos != pos || string::npos != lastPos)
+    {
+        // Found a token, add it to the vector.
+        tokens.push_back(str.substr(lastPos, pos - lastPos));
+        // Skip delimiters.  Note the "not_of"
+        lastPos = str.find_first_not_of(delimiters, pos);
+        // Find next "non-delimiter"
+        pos = str.find_first_of(delimiters, lastPos);
+    }
+}

trunk/libffado/src/libutil/serialize.h

@@ -122 +122 @@
-}
-
+void tokenize(const std::string& str, std::vector<std::string>& tokens, const std::string& delimiters = " ");
+
-#endif