fix two regressions

This commit is contained in:
Fischlurch 2010-12-12 01:53:23 +01:00
parent 8a54e00b6b
commit c4282560ce
4 changed files with 13 additions and 3 deletions

View file

@ -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"; }

View file

@ -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

View file

@ -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));
}
};

View file

@ -69,6 +69,7 @@ namespace lib {
throw to.getVal();
swap (from,to);
from.setVal(0); // remove the old Dummy from accounting (checksum)
}
};