From c4282560ce03679f96c79e5f9f373a0feb69c4e6 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sun, 12 Dec 2010 01:53:23 +0100
Subject: [PATCH] fix two regressions

---
 src/proc/asset/struct-scheme.hpp                      | 9 +++++++++
 src/proc/control/styperegistry.hpp                    | 4 ++--
 tests/components/proc/mobject/output-mapping-test.cpp | 2 +-
 tests/lib/scoped-holder-transfer-test.cpp             | 1 +
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/proc/asset/struct-scheme.hpp b/src/proc/asset/struct-scheme.hpp
index c8e0d09a4..dd6f6f512 100644
--- a/src/proc/asset/struct-scheme.hpp
+++ b/src/proc/asset/struct-scheme.hpp
@@ -52,6 +52,9 @@ namespace session {
   class Clip;
   
 }}
+namespace lumiera {
+  class StreamType;
+}
 
 namespace asset{
   
@@ -104,6 +107,12 @@ namespace asset{
         static Symbol catFolder()  { return "pipes";}
         static Symbol idSymbol()   { return "pipe"; }
       };
+    template<> struct StructTraits<lumiera::StreamType>
+      {
+        static Symbol namePrefix() { return "type"; }
+        static Symbol catFolder()  { return "stream-types";}
+        static Symbol idSymbol()   { return "stype"; }
+      };
     template<> struct StructTraits<const ProcPatt>
       {
         static Symbol namePrefix() { return "patt";           }
diff --git a/src/proc/control/styperegistry.hpp b/src/proc/control/styperegistry.hpp
index 5979582d2..63c33e841 100644
--- a/src/proc/control/styperegistry.hpp
+++ b/src/proc/control/styperegistry.hpp
@@ -23,7 +23,7 @@
 
 /** @file styperegistry.hpp
  ** This is part of the \i implementation of the stream type manager (include).
- ** Only used in stypemanager.cpp and accompaning unit tests.
+ ** Only used in stypemanager.cpp and accompanying unit tests.
  ** 
  ** @see control::STypeManager
  ** @see lumiera::StreamType
@@ -62,7 +62,7 @@ namespace control {
   
   
   /**
-   * @internal Helper for organizing preconfigured default objects.
+   * @internal Helper for organising preconfigured default objects.
    * Maintaines a collection of objects known or encountered as "default"
    * for a given type. This collection is ordered by "degree of constriction",
    * which is implemented by counting the number of predicates in the query
diff --git a/tests/components/proc/mobject/output-mapping-test.cpp b/tests/components/proc/mobject/output-mapping-test.cpp
index 5f4a5be1a..18dd9eb60 100644
--- a/tests/components/proc/mobject/output-mapping-test.cpp
+++ b/tests/components/proc/mobject/output-mapping-test.cpp
@@ -76,7 +76,7 @@ namespace test  {
             {
               PPipe srcP = Pipe::lookup (sourcePipeID);
               format queryPattern ("id(master_%1%), stream(%1%), ord(%2%)");
-              return Query<Pipe> (str(queryPattern % srcP->getStreamID() % seqNr));
+              return Query<Pipe> (str(queryPattern % srcP->getStreamID().getSym() % seqNr));
             }
         };
       
diff --git a/tests/lib/scoped-holder-transfer-test.cpp b/tests/lib/scoped-holder-transfer-test.cpp
index ace319736..7bd65a530 100644
--- a/tests/lib/scoped-holder-transfer-test.cpp
+++ b/tests/lib/scoped-holder-transfer-test.cpp
@@ -69,6 +69,7 @@ namespace lib {
               throw to.getVal();
             
             swap (from,to);
+            from.setVal(0); // remove the old Dummy from accounting (checksum) 
           }
           
         };