diff --git a/doc/devel/draw/Builder.Fixture-1.svg b/doc/devel/draw/Builder.Fixture-1.svg new file mode 100644 index 000000000..c7bb4e9d2 --- /dev/null +++ b/doc/devel/draw/Builder.Fixture-1.svg @@ -0,0 +1,4091 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + Structure of the Fixture + + + Ichthyostega + + + Lumiera: how the Fixture data structure is organised + 2010 + + + + + + + + + + + + + + + + List of Model Ports + + + + + exitnodes + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Segmentation-1 + Segmtn-2 + Eplicitplacem + diff --git a/doc/devel/draw/Builder.SegmentationSteps-1.svg b/doc/devel/draw/Builder.SegmentationSteps-1.svg new file mode 100644 index 000000000..9694920cf --- /dev/null +++ b/doc/devel/draw/Builder.SegmentationSteps-1.svg @@ -0,0 +1,3333 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + Steps towards building a Segmentation + + + Ichthyostega + + + explanation of Builder structures: How the Segmentation of the Lumiera low-level-model (render nodes graph) is derived from the high-level-model + 2010 + + + + + + + + + + + + + + + + + + Binding + + + + + + + + + + + Sequence-α + + + + + + Timeline-1 + + + Fixture + + + + + + + + + + + + + + + + + + global Pipes + + + + + + + + + + + + + x + + + + + + + + + + + + + + Clip-A + + + + + + + Meta-Clip + + + + + + + + + + Sequence-β + Segmentation + + + + + + + Clip-B + + + + + + + + Binding + + + Timeline-2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Clip-A + + + + + + + Clip-B + + + + + + + + + + + + Clip-B + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + x + + + + + + + + + + + + + + + + + x + + + + + + + + + + + + + + + + + x + + + + + + + + + + + + + + + + + x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binding + + + + x + + + + x + + + + x + + + + x + + explicit Placement + exit node + ModelPort-1 + + + + + + + + x + + + ModelPort-2 + + + + + + x + + + + + + diff --git a/doc/devel/uml/fig129413.png b/doc/devel/uml/fig129413.png index df8722ad2..581c0bf46 100644 Binary files a/doc/devel/uml/fig129413.png and b/doc/devel/uml/fig129413.png differ diff --git a/src/backend/backend.c b/src/backend/backend.c index fa007c404..0f2c62b8a 100644 --- a/src/backend/backend.c +++ b/src/backend/backend.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/backend.h b/src/backend/backend.h index f1e68c85b..163c8fc7c 100644 --- a/src/backend/backend.h +++ b/src/backend/backend.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/enginefacade.cpp b/src/backend/enginefacade.cpp index 93b2dedc8..d99ad83fa 100644 --- a/src/backend/enginefacade.cpp +++ b/src/backend/enginefacade.cpp @@ -1,23 +1,23 @@ /* EngineFacade - access point for communicating with the render engine - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/backend/enginefacade.hpp b/src/backend/enginefacade.hpp index 05680d39b..7cbf698e8 100644 --- a/src/backend/enginefacade.hpp +++ b/src/backend/enginefacade.hpp @@ -1,23 +1,23 @@ /* ENGINEFACADE.hpp - access point for communicating with the render engine - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/backend/file.c b/src/backend/file.c index 3303cae5d..b636bdf29 100644 --- a/src/backend/file.c +++ b/src/backend/file.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/file.h b/src/backend/file.h index d70525004..8b8b94ca5 100644 --- a/src/backend/file.h +++ b/src/backend/file.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/filedescriptor.c b/src/backend/filedescriptor.c index ee0366dcb..a1bfcd15f 100644 --- a/src/backend/filedescriptor.c +++ b/src/backend/filedescriptor.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/filedescriptor.h b/src/backend/filedescriptor.h index 89306cab8..8f73bfb2c 100644 --- a/src/backend/filedescriptor.h +++ b/src/backend/filedescriptor.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/filedescriptorregistry.c b/src/backend/filedescriptorregistry.c index 5dc186a3e..c31623a78 100644 --- a/src/backend/filedescriptorregistry.c +++ b/src/backend/filedescriptorregistry.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/filedescriptorregistry.h b/src/backend/filedescriptorregistry.h index c3a03da83..2faea51f9 100644 --- a/src/backend/filedescriptorregistry.h +++ b/src/backend/filedescriptorregistry.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/filehandle.c b/src/backend/filehandle.c index 37944ba26..409d6ed32 100644 --- a/src/backend/filehandle.c +++ b/src/backend/filehandle.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/filehandle.h b/src/backend/filehandle.h index 6ad9c5832..1290a52e8 100644 --- a/src/backend/filehandle.h +++ b/src/backend/filehandle.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/filehandlecache.c b/src/backend/filehandlecache.c index c130fbd39..abf77e49e 100644 --- a/src/backend/filehandlecache.c +++ b/src/backend/filehandlecache.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/filehandlecache.h b/src/backend/filehandlecache.h index 29a023b17..ca130cfbd 100644 --- a/src/backend/filehandlecache.h +++ b/src/backend/filehandlecache.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/fileheader.c b/src/backend/fileheader.c index 5bbe8c4e5..9b7e44959 100644 --- a/src/backend/fileheader.c +++ b/src/backend/fileheader.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/fileheader.h b/src/backend/fileheader.h index 03058181c..a14abd97f 100644 --- a/src/backend/fileheader.h +++ b/src/backend/fileheader.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/mediaaccessfacade.cpp b/src/backend/mediaaccessfacade.cpp index f3308f4a7..e9feab29f 100644 --- a/src/backend/mediaaccessfacade.cpp +++ b/src/backend/mediaaccessfacade.cpp @@ -1,23 +1,23 @@ /* MediaAccessFacade - functions for querying media file and channels. - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/backend/mediaaccessfacade.hpp b/src/backend/mediaaccessfacade.hpp index 3d009c6fe..261e84a61 100644 --- a/src/backend/mediaaccessfacade.hpp +++ b/src/backend/mediaaccessfacade.hpp @@ -1,23 +1,23 @@ /* MEDIAACCESSFACADE.hpp - functions for querying media file and channels. - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/backend/mmap.c b/src/backend/mmap.c index 37523c9f0..f31c05154 100644 --- a/src/backend/mmap.c +++ b/src/backend/mmap.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/mmap.h b/src/backend/mmap.h index 155ec0d06..77f4672d0 100644 --- a/src/backend/mmap.h +++ b/src/backend/mmap.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/mmapcache.c b/src/backend/mmapcache.c index cda0493c7..dc91b2baa 100644 --- a/src/backend/mmapcache.c +++ b/src/backend/mmapcache.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/mmapcache.h b/src/backend/mmapcache.h index 5b3704512..2b5345696 100644 --- a/src/backend/mmapcache.h +++ b/src/backend/mmapcache.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/mmapings.c b/src/backend/mmapings.c index 376519f9e..a751b1b89 100644 --- a/src/backend/mmapings.c +++ b/src/backend/mmapings.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/mmapings.h b/src/backend/mmapings.h index 28b567d93..39cf7aa9f 100644 --- a/src/backend/mmapings.h +++ b/src/backend/mmapings.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/netnodefacade.cpp b/src/backend/netnodefacade.cpp index 24d97b8b2..99f64e1bb 100644 --- a/src/backend/netnodefacade.cpp +++ b/src/backend/netnodefacade.cpp @@ -1,23 +1,23 @@ /* NetNodeFacade - access point for maintaining a renderfarm node - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/backend/netnodefacade.hpp b/src/backend/netnodefacade.hpp index afeee3b59..17ceb60de 100644 --- a/src/backend/netnodefacade.hpp +++ b/src/backend/netnodefacade.hpp @@ -1,23 +1,23 @@ /* NETNODEFACADE.hpp - access point for maintaining a renderfarm node - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/backend/resourcecollector.c b/src/backend/resourcecollector.c index 7ef6a48de..ec9dce348 100644 --- a/src/backend/resourcecollector.c +++ b/src/backend/resourcecollector.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/resourcecollector.h b/src/backend/resourcecollector.h index 1d41e3e44..6a90ddb7a 100644 --- a/src/backend/resourcecollector.h +++ b/src/backend/resourcecollector.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/scriptrunnerfacade.cpp b/src/backend/scriptrunnerfacade.cpp index 9ecf4f13f..a36d70fea 100644 --- a/src/backend/scriptrunnerfacade.cpp +++ b/src/backend/scriptrunnerfacade.cpp @@ -1,23 +1,23 @@ /* ScriptRunnerFacade - access point for running a script within Lumiera application context - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/backend/scriptrunnerfacade.hpp b/src/backend/scriptrunnerfacade.hpp index b0c1f74ec..d54087497 100644 --- a/src/backend/scriptrunnerfacade.hpp +++ b/src/backend/scriptrunnerfacade.hpp @@ -1,23 +1,23 @@ /* SCRIPTRUNNERFACADE.hpp - access point for running a script within Lumiera application context - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/backend/thread-wrapper.hpp b/src/backend/thread-wrapper.hpp index 1a6c4be49..c45fd4e75 100644 --- a/src/backend/thread-wrapper.hpp +++ b/src/backend/thread-wrapper.hpp @@ -1,24 +1,24 @@ /* THREADWRAPPER.hpp - thin convenience wrapper for starting lumiera threads - + Copyright (C) Lumiera.org 2008 - 2010 Hermann Vosseler Christian Thaeter - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/backend/threadpool-init.cpp b/src/backend/threadpool-init.cpp index 0f4bdaf90..604a6a8ac 100644 --- a/src/backend/threadpool-init.cpp +++ b/src/backend/threadpool-init.cpp @@ -1,23 +1,23 @@ /* ThreadpoolInit - pull up the Thread management automagically at application initialisation - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/backend/threadpool-init.hpp b/src/backend/threadpool-init.hpp index aebdb00aa..05fe29370 100644 --- a/src/backend/threadpool-init.hpp +++ b/src/backend/threadpool-init.hpp @@ -1,24 +1,24 @@ /* THREADPOOL-INIT.hpp - pull up the Thread management automagically at application initialisation - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file threadpool-init.hpp diff --git a/src/backend/threadpool.c b/src/backend/threadpool.c index 0e144e31c..b0ac7c0b3 100644 --- a/src/backend/threadpool.c +++ b/src/backend/threadpool.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/threadpool.h b/src/backend/threadpool.h index 28bb21020..6f80c8bb9 100644 --- a/src/backend/threadpool.h +++ b/src/backend/threadpool.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/threads.c b/src/backend/threads.c index f4e379354..1261fe134 100644 --- a/src/backend/threads.c +++ b/src/backend/threads.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backend/threads.h b/src/backend/threads.h index 1eee2d536..6e755be48 100644 --- a/src/backend/threads.h +++ b/src/backend/threads.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/appstate.cpp b/src/common/appstate.cpp index dfcab9834..20d2c6e96 100644 --- a/src/common/appstate.cpp +++ b/src/common/appstate.cpp @@ -1,23 +1,23 @@ /* AppState - application initialisation and behaviour - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/common/appstate.hpp b/src/common/appstate.hpp index 1f16f0630..6472b5102 100644 --- a/src/common/appstate.hpp +++ b/src/common/appstate.hpp @@ -1,23 +1,23 @@ /* APPSTATE.hpp - application initialisation and behaviour - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file appstate.hpp diff --git a/src/common/config.c b/src/common/config.c index 88961ddc6..a767cce96 100644 --- a/src/common/config.c +++ b/src/common/config.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/config.h b/src/common/config.h index 7cf0ff2df..4fa462f25 100644 --- a/src/common/config.h +++ b/src/common/config.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/config_interface.c b/src/common/config_interface.c index a40a8ab03..9f83b3e56 100644 --- a/src/common/config_interface.c +++ b/src/common/config_interface.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/config_interface.h b/src/common/config_interface.h index d4eca205a..0e605ca30 100644 --- a/src/common/config_interface.h +++ b/src/common/config_interface.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/config_lookup.c b/src/common/config_lookup.c index f2bca1ff1..0c0a776a4 100644 --- a/src/common/config_lookup.c +++ b/src/common/config_lookup.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/config_lookup.h b/src/common/config_lookup.h index aa11e8dff..eadf96b39 100644 --- a/src/common/config_lookup.h +++ b/src/common/config_lookup.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/config_typed.c b/src/common/config_typed.c index b916cdb61..68083931f 100644 --- a/src/common/config_typed.c +++ b/src/common/config_typed.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/config_wordlist.c b/src/common/config_wordlist.c index 0762a74a7..a528286f4 100644 --- a/src/common/config_wordlist.c +++ b/src/common/config_wordlist.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/configentry.c b/src/common/configentry.c index 0b09f76c3..495690c04 100644 --- a/src/common/configentry.c +++ b/src/common/configentry.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/configentry.h b/src/common/configentry.h index 92d63ec46..c2c1eadd8 100644 --- a/src/common/configentry.h +++ b/src/common/configentry.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/configfacade.cpp b/src/common/configfacade.cpp index b0860e08e..08aa04903 100644 --- a/src/common/configfacade.cpp +++ b/src/common/configfacade.cpp @@ -1,23 +1,23 @@ /* ConfigFacade - C++ convenience wrapper and startup of the config system - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/common/configitem.c b/src/common/configitem.c index c69d804d8..e2a22c98c 100644 --- a/src/common/configitem.c +++ b/src/common/configitem.c @@ -7,8 +7,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/configitem.h b/src/common/configitem.h index 942f77ef8..3c3823422 100644 --- a/src/common/configitem.h +++ b/src/common/configitem.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/configrules.cpp b/src/common/configrules.cpp index b4d4ea00a..b42e5591a 100644 --- a/src/common/configrules.cpp +++ b/src/common/configrules.cpp @@ -1,24 +1,24 @@ /* ConfigRules - interface for rule based configuration - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/common/configrules.hpp b/src/common/configrules.hpp index 473b82155..841858883 100644 --- a/src/common/configrules.hpp +++ b/src/common/configrules.hpp @@ -1,23 +1,23 @@ /* CONFIGRULES.hpp - interface for rule based configuration - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/common/external/libgavl.cpp b/src/common/external/libgavl.cpp index 8cb37a12f..b60caecea 100644 --- a/src/common/external/libgavl.cpp +++ b/src/common/external/libgavl.cpp @@ -1,23 +1,23 @@ /* ImplFacadeGAVL - facade for integrating the GAVL media handling library - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/common/external/libgavl.hpp b/src/common/external/libgavl.hpp index 505fc4325..ac6a00b03 100644 --- a/src/common/external/libgavl.hpp +++ b/src/common/external/libgavl.hpp @@ -1,23 +1,23 @@ /* LILBGAVL.hpp - facade for integrating the GAVL media handling library - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/common/guifacade.cpp b/src/common/guifacade.cpp index e786dba40..aff7febb8 100644 --- a/src/common/guifacade.cpp +++ b/src/common/guifacade.cpp @@ -1,23 +1,23 @@ /* GuiFacade - access point for communicating with the Lumiera GTK GUI - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/common/instancehandle.hpp b/src/common/instancehandle.hpp index 9b9a12bd9..d6c98e546 100644 --- a/src/common/instancehandle.hpp +++ b/src/common/instancehandle.hpp @@ -1,23 +1,23 @@ /* INSTANCEHANDLE.hpp - automatically handling interface lifecycle - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file instancehandle.hpp diff --git a/src/common/interface.c b/src/common/interface.c index a8d91c40f..71cf71e96 100644 --- a/src/common/interface.c +++ b/src/common/interface.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/interface.h b/src/common/interface.h index d50af3233..3a8e2fb5c 100644 --- a/src/common/interface.h +++ b/src/common/interface.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/interfacedescriptor.h b/src/common/interfacedescriptor.h index 121c0711e..c6aab3043 100644 --- a/src/common/interfacedescriptor.h +++ b/src/common/interfacedescriptor.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/interfaceproxy.cpp b/src/common/interfaceproxy.cpp index 1970cce21..e403e40a5 100644 --- a/src/common/interfaceproxy.cpp +++ b/src/common/interfaceproxy.cpp @@ -1,23 +1,23 @@ /* InterfaceProxy - definition of forwarding proxies for the facade interfaces - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/common/interfaceregistry.c b/src/common/interfaceregistry.c index 1637e48df..121bf6408 100644 --- a/src/common/interfaceregistry.c +++ b/src/common/interfaceregistry.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/interfaceregistry.h b/src/common/interfaceregistry.h index bc4f11440..677ef6c89 100644 --- a/src/common/interfaceregistry.h +++ b/src/common/interfaceregistry.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/option.cpp b/src/common/option.cpp index 84b28b942..d01afc88d 100644 --- a/src/common/option.cpp +++ b/src/common/option.cpp @@ -1,23 +1,23 @@ /* Option - handle cmdline for starting the Lumiera application - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/common/option.hpp b/src/common/option.hpp index c44a6b35e..a6ccc4ab9 100644 --- a/src/common/option.hpp +++ b/src/common/option.hpp @@ -1,23 +1,23 @@ /* OPTION.hpp - handle cmdline for starting the Lumiera application - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/common/plugin.c b/src/common/plugin.c index 0b9a515a5..2638af5d1 100644 --- a/src/common/plugin.c +++ b/src/common/plugin.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/plugin.h b/src/common/plugin.h index df75cd012..bd77b3806 100644 --- a/src/common/plugin.h +++ b/src/common/plugin.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/plugin_dynlib.c b/src/common/plugin_dynlib.c index 6c30afe85..7e8618628 100644 --- a/src/common/plugin_dynlib.c +++ b/src/common/plugin_dynlib.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/common/query/fake-configrules.cpp b/src/common/query/fake-configrules.cpp index b2f187dea..a095a4acf 100644 --- a/src/common/query/fake-configrules.cpp +++ b/src/common/query/fake-configrules.cpp @@ -1,23 +1,23 @@ /* FakeConfigRules - dummy implementation of the config rules system - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/common/query/fake-configrules.hpp b/src/common/query/fake-configrules.hpp index 7cdf1df37..bbc9f91ca 100644 --- a/src/common/query/fake-configrules.hpp +++ b/src/common/query/fake-configrules.hpp @@ -1,23 +1,23 @@ /* FAKE-CONFIGRULES.hpp - dummy implementation of the config rules system - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/common/subsys.cpp b/src/common/subsys.cpp index 68850f4c8..2a9b2446c 100644 --- a/src/common/subsys.cpp +++ b/src/common/subsys.cpp @@ -1,23 +1,23 @@ /* Subsys - interface for describing an application part to be handled by main() - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/common/subsys.hpp b/src/common/subsys.hpp index ee0e229ad..363b17e51 100644 --- a/src/common/subsys.hpp +++ b/src/common/subsys.hpp @@ -1,23 +1,23 @@ /* SUBSYS.hpp - interface for describing an application part to be handled by main() - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file subsys.hpp diff --git a/src/common/subsystem-runner.hpp b/src/common/subsystem-runner.hpp index 8e7edcffc..89a90245d 100644 --- a/src/common/subsystem-runner.hpp +++ b/src/common/subsystem-runner.hpp @@ -1,23 +1,23 @@ /* SUBSYSTEMRUNNER.hpp - helper for controlling execution of several dependent subsystems - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/gui/controller/controller.cpp b/src/gui/controller/controller.cpp index 2d7deefc9..c31ca787d 100644 --- a/src/gui/controller/controller.cpp +++ b/src/gui/controller/controller.cpp @@ -1,23 +1,23 @@ /* controllerk.cpp - Implementation of the timeline track object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "controller.hpp" diff --git a/src/gui/controller/controller.hpp b/src/gui/controller/controller.hpp index 594f5e19e..29d3684df 100644 --- a/src/gui/controller/controller.hpp +++ b/src/gui/controller/controller.hpp @@ -1,23 +1,23 @@ /* controller.hpp - Declaration of the controller object - + Copyright (C) Lumiera.org 2009, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file controller/controller.hpp ** This file contains the definition of the controller object diff --git a/src/gui/controller/playback-controller.cpp b/src/gui/controller/playback-controller.cpp index bfb623860..12727c86b 100644 --- a/src/gui/controller/playback-controller.cpp +++ b/src/gui/controller/playback-controller.cpp @@ -1,23 +1,23 @@ /* playback-controller.cpp - Implementation of the playback controller object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/gui/controller/playback-controller.hpp b/src/gui/controller/playback-controller.hpp index 7ef5ce4fb..e403bc528 100644 --- a/src/gui/controller/playback-controller.hpp +++ b/src/gui/controller/playback-controller.hpp @@ -1,23 +1,23 @@ /* playback-controller.hpp - Declaration of the playback controller object - + Copyright (C) Lumiera.org 2009, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file controller/playback-controller.hpp ** This file contains the definition of the playback controller object diff --git a/src/gui/dialogs/dialog.hpp b/src/gui/dialogs/dialog.hpp index 454ddee6a..c72949b3b 100644 --- a/src/gui/dialogs/dialog.hpp +++ b/src/gui/dialogs/dialog.hpp @@ -1,23 +1,23 @@ /* dialog.hpp - Definitions of globals for dialogs - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file render.hpp ** This file contains definitions of globals for dialogs diff --git a/src/gui/dialogs/name-chooser.cpp b/src/gui/dialogs/name-chooser.cpp index c44c7adad..c61527be8 100644 --- a/src/gui/dialogs/name-chooser.cpp +++ b/src/gui/dialogs/name-chooser.cpp @@ -1,23 +1,23 @@ /* name-chooser.cpp - Definition of the name chooser dialog object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "../gtk-lumiera.hpp" diff --git a/src/gui/dialogs/name-chooser.hpp b/src/gui/dialogs/name-chooser.hpp index c848820e3..0794e6427 100644 --- a/src/gui/dialogs/name-chooser.hpp +++ b/src/gui/dialogs/name-chooser.hpp @@ -1,23 +1,23 @@ /* name-chooser.hpp - Definition of the name chooser dialog object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file name-chooser.hpp ** This file contains the definition of the name chooser dialog diff --git a/src/gui/dialogs/preferences-dialog.cpp b/src/gui/dialogs/preferences-dialog.cpp index dae928143..4db367360 100644 --- a/src/gui/dialogs/preferences-dialog.cpp +++ b/src/gui/dialogs/preferences-dialog.cpp @@ -1,23 +1,23 @@ /* preferences-dialog.cpp - Implementation of the application preferences dialog - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "../gtk-lumiera.hpp" diff --git a/src/gui/dialogs/preferences-dialog.hpp b/src/gui/dialogs/preferences-dialog.hpp index 6e9ce2087..62a37ed07 100644 --- a/src/gui/dialogs/preferences-dialog.hpp +++ b/src/gui/dialogs/preferences-dialog.hpp @@ -1,23 +1,23 @@ /* preferences-dialog.hpp - Definition of the application preferences dialog - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file render.hpp ** This file contains the definition of the application preferences dialog diff --git a/src/gui/dialogs/render.cpp b/src/gui/dialogs/render.cpp index 88a8c41ff..6178c014c 100644 --- a/src/gui/dialogs/render.cpp +++ b/src/gui/dialogs/render.cpp @@ -1,23 +1,23 @@ /* render.cpp - Definition of the main workspace window object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "../gtk-lumiera.hpp" diff --git a/src/gui/dialogs/render.hpp b/src/gui/dialogs/render.hpp index 51989a25e..8d586c398 100644 --- a/src/gui/dialogs/render.hpp +++ b/src/gui/dialogs/render.hpp @@ -1,23 +1,23 @@ /* render.hpp - Definition of the render output dialog - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file render.hpp ** This file contains the definition of the render output dialog diff --git a/src/gui/display-interface-proxy.hpp b/src/gui/display-interface-proxy.hpp index 8ae035124..e0fd15031 100644 --- a/src/gui/display-interface-proxy.hpp +++ b/src/gui/display-interface-proxy.hpp @@ -1,23 +1,23 @@ /* Display(Proxy) - service providing access to a display for outputting frames - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/gui/display-service.cpp b/src/gui/display-service.cpp index 1c20dd4de..96600bf3b 100644 --- a/src/gui/display-service.cpp +++ b/src/gui/display-service.cpp @@ -1,23 +1,23 @@ /* DisplayService - service providing access to a display for outputting frames - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/gui/display-service.hpp b/src/gui/display-service.hpp index 2a84f9c12..1dec2c192 100644 --- a/src/gui/display-service.hpp +++ b/src/gui/display-service.hpp @@ -1,23 +1,23 @@ /* DISPLAY-SERVICE.hpp - service providing access to a display for outputting frames - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file display-service.hpp diff --git a/src/gui/gtk-lumiera.cpp b/src/gui/gtk-lumiera.cpp index 65b448f40..3b8f34859 100644 --- a/src/gui/gtk-lumiera.cpp +++ b/src/gui/gtk-lumiera.cpp @@ -1,23 +1,23 @@ /* gtk-lumiera.cpp - The entry point for the GTK GUI application - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include diff --git a/src/gui/gtk-lumiera.hpp b/src/gui/gtk-lumiera.hpp index c1b5a773a..bc26c1d96 100644 --- a/src/gui/gtk-lumiera.hpp +++ b/src/gui/gtk-lumiera.hpp @@ -1,23 +1,23 @@ /* gtk-lumiera.hpp - Application wide global definitions - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file gtk-lumiera.hpp ** This file contains application wide global definitions diff --git a/src/gui/guifacade.hpp b/src/gui/guifacade.hpp index d7bf7f542..27de18a35 100644 --- a/src/gui/guifacade.hpp +++ b/src/gui/guifacade.hpp @@ -1,23 +1,23 @@ /* GUIFACADE.hpp - access point for communicating with the Lumiera GTK GUI - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file guifacade.hpp diff --git a/src/gui/guistart.cpp b/src/gui/guistart.cpp index e345f9047..d8c5513d8 100644 --- a/src/gui/guistart.cpp +++ b/src/gui/guistart.cpp @@ -1,25 +1,25 @@ /* GuiStart - entry point for the lumiera GUI loaded as shared module - + Copyright (C) Lumiera.org 2007-2008, Joel Holdsworth Christian Thaeter Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/gui/model/clip-track.cpp b/src/gui/model/clip-track.cpp index 5f8907599..30407a1f8 100644 --- a/src/gui/model/clip-track.cpp +++ b/src/gui/model/clip-track.cpp @@ -1,23 +1,23 @@ /* clip-track.cpp - Implementation of a clip containing track object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "clip-track.hpp" diff --git a/src/gui/model/clip-track.hpp b/src/gui/model/clip-track.hpp index c3c7e0e2f..5e8ea354c 100644 --- a/src/gui/model/clip-track.hpp +++ b/src/gui/model/clip-track.hpp @@ -1,23 +1,23 @@ /* clip-track.hpp - Declaration of a clip containing track object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** * @file widgets/timeline/clip-track.hpp diff --git a/src/gui/model/clip.cpp b/src/gui/model/clip.cpp index 802543991..2815ea7fe 100644 --- a/src/gui/model/clip.cpp +++ b/src/gui/model/clip.cpp @@ -1,23 +1,23 @@ /* timeline-track.cpp - Implementation of the timeline clip object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "clip.hpp" diff --git a/src/gui/model/clip.hpp b/src/gui/model/clip.hpp index 89f7d89d7..df9d67d1c 100644 --- a/src/gui/model/clip.hpp +++ b/src/gui/model/clip.hpp @@ -1,23 +1,23 @@ /* timeline-clip.hpp - Declaration of the timeline clip object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file widgets/timeline/timeline-clip.hpp ** This file contains the definition of timeline clip object diff --git a/src/gui/model/group-track.cpp b/src/gui/model/group-track.cpp index 73ac08114..067821d82 100644 --- a/src/gui/model/group-track.cpp +++ b/src/gui/model/group-track.cpp @@ -1,23 +1,23 @@ /* group-track.cpp - Implementation of the timeline group track object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "group-track.hpp" diff --git a/src/gui/model/group-track.hpp b/src/gui/model/group-track.hpp index ae3f48b63..6dc15db31 100644 --- a/src/gui/model/group-track.hpp +++ b/src/gui/model/group-track.hpp @@ -1,23 +1,23 @@ /* group-track.hpp - Declaration of the timeline group track object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file widgets/timeline/group-track.hpp ** This file contains the definition of group track timeline objects diff --git a/src/gui/model/parent-track.cpp b/src/gui/model/parent-track.cpp index f7122fe46..874c7e9d5 100644 --- a/src/gui/model/parent-track.cpp +++ b/src/gui/model/parent-track.cpp @@ -1,23 +1,23 @@ /* parent-track-.cpp - Implementation of the ParentTrack class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "parent-track.hpp" diff --git a/src/gui/model/parent-track.hpp b/src/gui/model/parent-track.hpp index bc26be80f..6d5b0481a 100644 --- a/src/gui/model/parent-track.hpp +++ b/src/gui/model/parent-track.hpp @@ -1,23 +1,23 @@ /* parent-track.hpp - Definition of the ParentTrack class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file parent-track.hpp ** This file contains the definition of ParentTrack, a class which diff --git a/src/gui/model/project.cpp b/src/gui/model/project.cpp index cc7dd6b84..92dda0758 100644 --- a/src/gui/model/project.cpp +++ b/src/gui/model/project.cpp @@ -1,23 +1,23 @@ /* project.cpp - Implementation of the Project class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include diff --git a/src/gui/model/project.hpp b/src/gui/model/project.hpp index f70029f88..42fb8d611 100644 --- a/src/gui/model/project.hpp +++ b/src/gui/model/project.hpp @@ -1,23 +1,23 @@ /* project.hpp - Definition of the Project class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file project.hpp ** This file contains the definition of Project, a class which diff --git a/src/gui/model/sequence.cpp b/src/gui/model/sequence.cpp index 361724125..6cb0269a9 100644 --- a/src/gui/model/sequence.cpp +++ b/src/gui/model/sequence.cpp @@ -1,23 +1,23 @@ /* sequence.hpp - Implementation of the Sequence class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "sequence.hpp" diff --git a/src/gui/model/sequence.hpp b/src/gui/model/sequence.hpp index 717368a9c..ae4f59a2f 100644 --- a/src/gui/model/sequence.hpp +++ b/src/gui/model/sequence.hpp @@ -1,23 +1,23 @@ /* sequence.hpp - Definition of the Sequence class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file sequence.hpp ** This file contains the definition of Sequence, a class which diff --git a/src/gui/model/track.cpp b/src/gui/model/track.cpp index d94926229..6d5cf2a65 100644 --- a/src/gui/model/track.cpp +++ b/src/gui/model/track.cpp @@ -1,23 +1,23 @@ /* track.cpp - Implementation of the Track class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "track.hpp" diff --git a/src/gui/model/track.hpp b/src/gui/model/track.hpp index c59d06875..6dc5d2b71 100644 --- a/src/gui/model/track.hpp +++ b/src/gui/model/track.hpp @@ -1,23 +1,23 @@ /* track.hpp - Definition of the Track class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file track.hpp ** This file contains the definition of Track, a class which diff --git a/src/gui/notification-interface-proxy.hpp b/src/gui/notification-interface-proxy.hpp index 361e01865..79500e8df 100644 --- a/src/gui/notification-interface-proxy.hpp +++ b/src/gui/notification-interface-proxy.hpp @@ -1,23 +1,23 @@ /* Notification(Proxy) - public service allowing to push informations into the GUI - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/gui/notification-service.cpp b/src/gui/notification-service.cpp index 080d1461d..0cfd3c826 100644 --- a/src/gui/notification-service.cpp +++ b/src/gui/notification-service.cpp @@ -1,23 +1,23 @@ /* NotificationService - public service allowing to push informations into the GUI - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/gui/notification-service.hpp b/src/gui/notification-service.hpp index c6e862be8..d7e2e218b 100644 --- a/src/gui/notification-service.hpp +++ b/src/gui/notification-service.hpp @@ -1,23 +1,23 @@ /* NOTIFICATION-SERVICE.hpp - public service allowing to push informations into the GUI - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file notification-service.hpp diff --git a/src/gui/output/displayer.cpp b/src/gui/output/displayer.cpp index 482db826e..251279a9a 100644 --- a/src/gui/output/displayer.cpp +++ b/src/gui/output/displayer.cpp @@ -1,25 +1,25 @@ /* displayer.cpp - Implements the base class for displaying video - + Copyright (C) Lumiera.org 2000, Arne Schirmacher 2001-2007, Dan Dennedy 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "../gtk-lumiera.hpp" diff --git a/src/gui/output/displayer.hpp b/src/gui/output/displayer.hpp index 5dc576565..1ec3ed6be 100644 --- a/src/gui/output/displayer.hpp +++ b/src/gui/output/displayer.hpp @@ -1,25 +1,25 @@ /* displayer.hpp - Defines the base class for displaying video - + Copyright (C) Lumiera.org 2000, Arne Schirmacher 2001-2007, Dan Dennedy 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file displayer.hpp ** This file contains the defintion of Displayer; the base class diff --git a/src/gui/output/gdkdisplayer.cpp b/src/gui/output/gdkdisplayer.cpp index 523ed2bb5..1d6f96214 100644 --- a/src/gui/output/gdkdisplayer.cpp +++ b/src/gui/output/gdkdisplayer.cpp @@ -1,25 +1,25 @@ /* gdkdisplayer.cpp - Implements the class for displaying video via GDK - + Copyright (C) Lumiera.org 2000, Arne Schirmacher 2001-2007, Dan Dennedy 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "../gtk-lumiera.hpp" diff --git a/src/gui/output/gdkdisplayer.hpp b/src/gui/output/gdkdisplayer.hpp index 76bb66d0f..291a20503 100644 --- a/src/gui/output/gdkdisplayer.hpp +++ b/src/gui/output/gdkdisplayer.hpp @@ -1,25 +1,25 @@ /* gdkdisplayer.hpp - Defines the class for displaying video via GDK - + Copyright (C) Lumiera.org 2000, Arne Schirmacher 2001-2007, Dan Dennedy 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file gdkdisplayer.hpp ** This file contains the definition of XvDisplayer, the XVideo diff --git a/src/gui/output/xvdisplayer.cpp b/src/gui/output/xvdisplayer.cpp index 5799f93dc..4c0780101 100644 --- a/src/gui/output/xvdisplayer.cpp +++ b/src/gui/output/xvdisplayer.cpp @@ -1,25 +1,25 @@ /* xvdisplayer.cpp - Implements the base class for XVideo display - + Copyright (C) Lumiera.org 2000, Arne Schirmacher 2001-2007, Dan Dennedy 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "../gtk-lumiera.hpp" @@ -62,7 +62,7 @@ XvDisplayer::XvDisplayer( Gtk::Widget *drawing_area, int width, int height ) : for ( unsigned int n = 0; gotPort == false && n < count; ++n ) { // Diagnostics - INFO(gui, "%s, %u, %u", adaptorInfo[ n ].name, + INFO(gui, "%s, %lu, %lu", adaptorInfo[ n ].name, adaptorInfo[ n ].base_id, adaptorInfo[ n ].num_ports - 1); for ( unsigned int port = adaptorInfo[ n ].base_id; diff --git a/src/gui/output/xvdisplayer.hpp b/src/gui/output/xvdisplayer.hpp index afc25c670..9c7e58208 100644 --- a/src/gui/output/xvdisplayer.hpp +++ b/src/gui/output/xvdisplayer.hpp @@ -1,25 +1,25 @@ /* xvdisplayer.hpp - Defines the base class for XVideo display - + Copyright (C) Lumiera.org 2000, Arne Schirmacher 2001-2007, Dan Dennedy 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file xvdisplayer.hpp ** This file contains the definition of XvDisplayer, the XVideo diff --git a/src/gui/panels/panel.cpp b/src/gui/panels/panel.cpp index 4d782d619..4db7a2ff2 100644 --- a/src/gui/panels/panel.cpp +++ b/src/gui/panels/panel.cpp @@ -1,23 +1,23 @@ /* panel.cpp - Implementation of Panel, the base class for docking panels - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "panel.hpp" diff --git a/src/gui/panels/panel.hpp b/src/gui/panels/panel.hpp index a46233169..5b0ed2afe 100644 --- a/src/gui/panels/panel.hpp +++ b/src/gui/panels/panel.hpp @@ -1,23 +1,23 @@ /* panel.hpp - Definition of Panel, the base class for docking panels - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file panel.hpp ** This file contains the definition of Panel; the base class diff --git a/src/gui/panels/resources-panel.cpp b/src/gui/panels/resources-panel.cpp index 1180ddd58..bd37cf195 100644 --- a/src/gui/panels/resources-panel.cpp +++ b/src/gui/panels/resources-panel.cpp @@ -1,23 +1,23 @@ /* assets-panel.cpp - Implementation of the assets panel - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "../gtk-lumiera.hpp" diff --git a/src/gui/panels/resources-panel.hpp b/src/gui/panels/resources-panel.hpp index 5c725dc3c..20021a920 100644 --- a/src/gui/panels/resources-panel.hpp +++ b/src/gui/panels/resources-panel.hpp @@ -1,23 +1,23 @@ /* assets-panel.hpp - Definition of the assets panel - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file assets-panel.hpp ** This file contains the definition of the assets panel diff --git a/src/gui/panels/timeline-panel.cpp b/src/gui/panels/timeline-panel.cpp index a93e49251..756fef16e 100644 --- a/src/gui/panels/timeline-panel.cpp +++ b/src/gui/panels/timeline-panel.cpp @@ -1,23 +1,23 @@ /* timeline-panel.cpp - Implementation of the timeline panel - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include diff --git a/src/gui/panels/timeline-panel.hpp b/src/gui/panels/timeline-panel.hpp index eaec9e02b..73c60b7a0 100644 --- a/src/gui/panels/timeline-panel.hpp +++ b/src/gui/panels/timeline-panel.hpp @@ -1,23 +1,23 @@ /* timeline-panel.hpp - Definition of the timeline panel - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file timeline-panel.hpp ** This file contains the definition of the timeline panel diff --git a/src/gui/panels/viewer-panel.cpp b/src/gui/panels/viewer-panel.cpp index 94c055a00..01a94934f 100644 --- a/src/gui/panels/viewer-panel.cpp +++ b/src/gui/panels/viewer-panel.cpp @@ -1,23 +1,23 @@ /* viewer-panel.cpp - Implementation of the viewer panel - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "../gtk-lumiera.hpp" diff --git a/src/gui/panels/viewer-panel.hpp b/src/gui/panels/viewer-panel.hpp index a51b3997f..fd234a823 100644 --- a/src/gui/panels/viewer-panel.hpp +++ b/src/gui/panels/viewer-panel.hpp @@ -1,23 +1,23 @@ /* viewer-panel.hpp - Definition of the viewer panel - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file viewer-panel.hpp ** This file contains the definition of the viewer panel diff --git a/src/gui/util/rectangle.cpp b/src/gui/util/rectangle.cpp index 72c678a2b..e8797784c 100644 --- a/src/gui/util/rectangle.cpp +++ b/src/gui/util/rectangle.cpp @@ -1,23 +1,23 @@ /* rectangle.cpp - Implements utility functions for GDK rects - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "rectangle.hpp" diff --git a/src/gui/util/rectangle.hpp b/src/gui/util/rectangle.hpp index bd72adb2d..ae77d2305 100644 --- a/src/gui/util/rectangle.hpp +++ b/src/gui/util/rectangle.hpp @@ -1,23 +1,23 @@ /* rectangle.hpp - Declares utility functions for GDK rects - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ /** @file rectangle.hpp ** This file contains the declaration of the utility functions for diff --git a/src/gui/widgets/button-bar.cpp b/src/gui/widgets/button-bar.cpp index 9e121be48..ccd3c1919 100644 --- a/src/gui/widgets/button-bar.cpp +++ b/src/gui/widgets/button-bar.cpp @@ -1,23 +1,23 @@ /* button-bar.cpp - Implementation of the button bar widget - + Copyright (C) Lumiera.org 2009, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "button-bar.hpp" diff --git a/src/gui/widgets/button-bar.hpp b/src/gui/widgets/button-bar.hpp index d9a0b2d79..237f0270c 100644 --- a/src/gui/widgets/button-bar.hpp +++ b/src/gui/widgets/button-bar.hpp @@ -1,23 +1,23 @@ /* button-bar.hpp - Declaration of the button bar widget - + Copyright (C) Lumiera.org 2009, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file button-bar.hpp ** This file contains the definition of the button bar widget diff --git a/src/gui/widgets/menu-button.cpp b/src/gui/widgets/menu-button.cpp index 6c78d5c67..a5e7629b6 100644 --- a/src/gui/widgets/menu-button.cpp +++ b/src/gui/widgets/menu-button.cpp @@ -1,23 +1,23 @@ /* menu-button.cpp - Implementation of the menu button widget - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "menu-button.hpp" diff --git a/src/gui/widgets/menu-button.hpp b/src/gui/widgets/menu-button.hpp index 0ebca1b0b..fe32f677d 100644 --- a/src/gui/widgets/menu-button.hpp +++ b/src/gui/widgets/menu-button.hpp @@ -1,23 +1,23 @@ /* menu-button.hpp - Declaration of the menu button widget - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file menu-button.hpp ** This file contains the definition of menu button widget diff --git a/src/gui/widgets/mini-button.hpp b/src/gui/widgets/mini-button.hpp index 7edf510ad..9b6c39565 100644 --- a/src/gui/widgets/mini-button.hpp +++ b/src/gui/widgets/mini-button.hpp @@ -1,23 +1,23 @@ /* mini-button.hpp - Declaration of the mini button widget - + Copyright (C) Lumiera.org 2009, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file mini-button.hpp ** This file contains the definition of mini button widget diff --git a/src/gui/widgets/panel-bar.cpp b/src/gui/widgets/panel-bar.cpp index 251c9a7cf..7b41a4d32 100644 --- a/src/gui/widgets/panel-bar.cpp +++ b/src/gui/widgets/panel-bar.cpp @@ -1,23 +1,23 @@ /* panel-bar.hpp - Declaration of the panel bar widget - + Copyright (C) Lumiera.org 2009, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "panel-bar.hpp" diff --git a/src/gui/widgets/panel-bar.hpp b/src/gui/widgets/panel-bar.hpp index 30e08c91e..d9f9d99e1 100644 --- a/src/gui/widgets/panel-bar.hpp +++ b/src/gui/widgets/panel-bar.hpp @@ -1,23 +1,23 @@ /* panel-bar.hpp - Declaration of the panel bar widget - + Copyright (C) Lumiera.org 2009, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file panel-bar.hpp ** This file contains the definition of timeline widget diff --git a/src/gui/widgets/timeline-widget.cpp b/src/gui/widgets/timeline-widget.cpp index 721467536..eabf25514 100644 --- a/src/gui/widgets/timeline-widget.cpp +++ b/src/gui/widgets/timeline-widget.cpp @@ -1,23 +1,23 @@ /* timeline-widget.cpp - Implementation of the timeline widget - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "timeline-widget.hpp" diff --git a/src/gui/widgets/timeline-widget.hpp b/src/gui/widgets/timeline-widget.hpp index 41e368947..2278f5ca9 100644 --- a/src/gui/widgets/timeline-widget.hpp +++ b/src/gui/widgets/timeline-widget.hpp @@ -1,23 +1,23 @@ /* timeline-widget.hpp - Declaration of the timeline widget - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file timeline-widget.hpp ** This file contains the definition of timeline widget diff --git a/src/gui/widgets/timeline/timeline-arrow-tool.cpp b/src/gui/widgets/timeline/timeline-arrow-tool.cpp index c211e3ace..d985cf7bf 100644 --- a/src/gui/widgets/timeline/timeline-arrow-tool.cpp +++ b/src/gui/widgets/timeline/timeline-arrow-tool.cpp @@ -1,23 +1,23 @@ /* timeline-arrow-tool.cpp - Implementation of the ArrowTool class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "timeline-arrow-tool.hpp" diff --git a/src/gui/widgets/timeline/timeline-arrow-tool.hpp b/src/gui/widgets/timeline/timeline-arrow-tool.hpp index 74d6f8e5c..be21b19c5 100644 --- a/src/gui/widgets/timeline/timeline-arrow-tool.hpp +++ b/src/gui/widgets/timeline/timeline-arrow-tool.hpp @@ -1,23 +1,23 @@ /* timeline-arrow-tool.hpp - Declaration of the ArrowTool class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file timeline-arrow-tool.hpp ** This file contains the definition of the arrow tool class diff --git a/src/gui/widgets/timeline/timeline-body.cpp b/src/gui/widgets/timeline/timeline-body.cpp index 44eb9a472..eac93ba09 100644 --- a/src/gui/widgets/timeline/timeline-body.cpp +++ b/src/gui/widgets/timeline/timeline-body.cpp @@ -1,23 +1,23 @@ /* timeline.cpp - Implementation of the timeline widget - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include diff --git a/src/gui/widgets/timeline/timeline-body.hpp b/src/gui/widgets/timeline/timeline-body.hpp index e218ae3a4..46dfb2303 100644 --- a/src/gui/widgets/timeline/timeline-body.hpp +++ b/src/gui/widgets/timeline/timeline-body.hpp @@ -1,23 +1,23 @@ /* timeline-body.hpp - Declaration of the timeline body widget - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file timeline-body.hpp ** This file contains the definition of timeline body widget diff --git a/src/gui/widgets/timeline/timeline-clip-track.cpp b/src/gui/widgets/timeline/timeline-clip-track.cpp index 0f0f2f1f5..2b2bbb875 100644 --- a/src/gui/widgets/timeline/timeline-clip-track.cpp +++ b/src/gui/widgets/timeline/timeline-clip-track.cpp @@ -1,23 +1,23 @@ /* timeline-clip-track.cpp - Implementation of the timeline clip track object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "timeline-clip-track.hpp" diff --git a/src/gui/widgets/timeline/timeline-clip-track.hpp b/src/gui/widgets/timeline/timeline-clip-track.hpp index 1ac781195..f6947fbe8 100644 --- a/src/gui/widgets/timeline/timeline-clip-track.hpp +++ b/src/gui/widgets/timeline/timeline-clip-track.hpp @@ -1,23 +1,23 @@ /* timeline-clip-track.hpp - Declaration of the timeline clip track object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** * @file widgets/timeline/timeline-clip-track.hpp diff --git a/src/gui/widgets/timeline/timeline-clip.cpp b/src/gui/widgets/timeline/timeline-clip.cpp index a6b6fb124..e4c031e52 100644 --- a/src/gui/widgets/timeline/timeline-clip.cpp +++ b/src/gui/widgets/timeline/timeline-clip.cpp @@ -1,23 +1,23 @@ /* timeline-track.cpp - Implementation of the timeline clip object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "timeline-clip.hpp" diff --git a/src/gui/widgets/timeline/timeline-clip.hpp b/src/gui/widgets/timeline/timeline-clip.hpp index 3dd8b0759..46cc751be 100644 --- a/src/gui/widgets/timeline/timeline-clip.hpp +++ b/src/gui/widgets/timeline/timeline-clip.hpp @@ -1,23 +1,23 @@ /* timeline-clip.hpp - Declaration of the timeline clip object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file widgets/timeline/timeline-clip.hpp ** This file contains the definition of timeline clip object diff --git a/src/gui/widgets/timeline/timeline-group-track.cpp b/src/gui/widgets/timeline/timeline-group-track.cpp index 56ad56c0a..6ecc20005 100644 --- a/src/gui/widgets/timeline/timeline-group-track.cpp +++ b/src/gui/widgets/timeline/timeline-group-track.cpp @@ -1,23 +1,23 @@ /* timeline-group-track.cpp - Implementation of the timeline group track object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "timeline-group-track.hpp" diff --git a/src/gui/widgets/timeline/timeline-group-track.hpp b/src/gui/widgets/timeline/timeline-group-track.hpp index 821acf9a8..62e4d8d53 100644 --- a/src/gui/widgets/timeline/timeline-group-track.hpp +++ b/src/gui/widgets/timeline/timeline-group-track.hpp @@ -1,23 +1,23 @@ /* timeline-group-track.hpp - Declaration of the timeline group track object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file widgets/timeline/timeline-group-track.hpp ** This file contains the definition of group track timeline objects diff --git a/src/gui/widgets/timeline/timeline-header-container.cpp b/src/gui/widgets/timeline/timeline-header-container.cpp index 5b6291ade..93f2e6aee 100644 --- a/src/gui/widgets/timeline/timeline-header-container.cpp +++ b/src/gui/widgets/timeline/timeline-header-container.cpp @@ -1,24 +1,24 @@ /* timeline-header-container.cpp - Implementation of the timeline header container widget - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include diff --git a/src/gui/widgets/timeline/timeline-header-container.hpp b/src/gui/widgets/timeline/timeline-header-container.hpp index 8243135d2..921394eff 100644 --- a/src/gui/widgets/timeline/timeline-header-container.hpp +++ b/src/gui/widgets/timeline/timeline-header-container.hpp @@ -1,24 +1,24 @@ /* timeline-header-container.hpp - Declaration of the timeline header container widget - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file timeline-header-container.hpp ** This file contains the definition of the header container diff --git a/src/gui/widgets/timeline/timeline-header-widget.cpp b/src/gui/widgets/timeline/timeline-header-widget.cpp index f51e026cf..ae5e85a98 100644 --- a/src/gui/widgets/timeline/timeline-header-widget.cpp +++ b/src/gui/widgets/timeline/timeline-header-widget.cpp @@ -1,24 +1,24 @@ /* timeline-header-widget.cpp - Implementation of the timeline header widget - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include diff --git a/src/gui/widgets/timeline/timeline-header-widget.hpp b/src/gui/widgets/timeline/timeline-header-widget.hpp index 3db843738..18dcfb78c 100644 --- a/src/gui/widgets/timeline/timeline-header-widget.hpp +++ b/src/gui/widgets/timeline/timeline-header-widget.hpp @@ -1,24 +1,24 @@ /* timeline-header-widget.hpp - Declaration of the timeline header widget - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file timeline-header-widget.hpp ** This file contains the definition of the header widget diff --git a/src/gui/widgets/timeline/timeline-ibeam-tool.cpp b/src/gui/widgets/timeline/timeline-ibeam-tool.cpp index 7e243ef7c..5e37d4b4d 100644 --- a/src/gui/widgets/timeline/timeline-ibeam-tool.cpp +++ b/src/gui/widgets/timeline/timeline-ibeam-tool.cpp @@ -1,23 +1,23 @@ /* timeline-ibeam-tool.cpp - Implementation of the IBeamTool class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "timeline-ibeam-tool.hpp" diff --git a/src/gui/widgets/timeline/timeline-ibeam-tool.hpp b/src/gui/widgets/timeline/timeline-ibeam-tool.hpp index 5d05b14ba..219a6dd49 100644 --- a/src/gui/widgets/timeline/timeline-ibeam-tool.hpp +++ b/src/gui/widgets/timeline/timeline-ibeam-tool.hpp @@ -1,23 +1,23 @@ /* timeline-ibeam-tool.hpp - Declaration of the ArrowTool class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file timeline-ibeam-tool.hpp ** This file contains the definition of ibeam tool class diff --git a/src/gui/widgets/timeline/timeline-layout-helper.cpp b/src/gui/widgets/timeline/timeline-layout-helper.cpp index 93531f800..c9ff0ed03 100644 --- a/src/gui/widgets/timeline/timeline-layout-helper.cpp +++ b/src/gui/widgets/timeline/timeline-layout-helper.cpp @@ -1,24 +1,24 @@ /* timeline-layout-helper.cpp - Implementation of the timeline layout helper class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include diff --git a/src/gui/widgets/timeline/timeline-layout-helper.hpp b/src/gui/widgets/timeline/timeline-layout-helper.hpp index 217f35d13..f8ac3f7bd 100644 --- a/src/gui/widgets/timeline/timeline-layout-helper.hpp +++ b/src/gui/widgets/timeline/timeline-layout-helper.hpp @@ -1,24 +1,24 @@ /* timeline-layout-helper.hpp - Declaration of the timeline layout helper class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file timeline-layout-helper.cpp ** This file contains the definition of the layout helpeer class diff --git a/src/gui/widgets/timeline/timeline-ruler.cpp b/src/gui/widgets/timeline/timeline-ruler.cpp index cce311007..cd5c9cdd3 100644 --- a/src/gui/widgets/timeline/timeline-ruler.cpp +++ b/src/gui/widgets/timeline/timeline-ruler.cpp @@ -1,23 +1,23 @@ /* timeline-ruler.cpp - Implementation of the time ruler widget - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include diff --git a/src/gui/widgets/timeline/timeline-ruler.hpp b/src/gui/widgets/timeline/timeline-ruler.hpp index e47038ab1..4e8bf2083 100644 --- a/src/gui/widgets/timeline/timeline-ruler.hpp +++ b/src/gui/widgets/timeline/timeline-ruler.hpp @@ -1,23 +1,23 @@ /* timeline-ruler.hpp - Declaration of the time ruler widget - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file timeline-ruler.hpp ** This file contains the declaration of the time ruler widget diff --git a/src/gui/widgets/timeline/timeline-state.cpp b/src/gui/widgets/timeline/timeline-state.cpp index e6a6e92c5..f8e712169 100644 --- a/src/gui/widgets/timeline/timeline-state.cpp +++ b/src/gui/widgets/timeline/timeline-state.cpp @@ -1,23 +1,23 @@ /* timeline-state.cpp - Implementation of the timeline state object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "timeline-state.hpp" diff --git a/src/gui/widgets/timeline/timeline-state.hpp b/src/gui/widgets/timeline/timeline-state.hpp index 431173240..2d9a11ea3 100644 --- a/src/gui/widgets/timeline/timeline-state.hpp +++ b/src/gui/widgets/timeline/timeline-state.hpp @@ -1,23 +1,23 @@ /* timeline-state.hpp - Declaration of the timeline state object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file widgets/timeline/timeline-state.hpp ** This file contains the definition of the timeline state object diff --git a/src/gui/widgets/timeline/timeline-tool.cpp b/src/gui/widgets/timeline/timeline-tool.cpp index 96991ef64..bc1092e53 100644 --- a/src/gui/widgets/timeline/timeline-tool.cpp +++ b/src/gui/widgets/timeline/timeline-tool.cpp @@ -1,23 +1,23 @@ /* timeline-tool.hpp - Implementation of the Tool class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "timeline-tool.hpp" diff --git a/src/gui/widgets/timeline/timeline-tool.hpp b/src/gui/widgets/timeline/timeline-tool.hpp index 9b5d8ea16..af9e61146 100644 --- a/src/gui/widgets/timeline/timeline-tool.hpp +++ b/src/gui/widgets/timeline/timeline-tool.hpp @@ -1,23 +1,23 @@ /* timeline-tool.hpp - Declaration of the Tool class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file timeline-tool.hpp ** This file contains the definition of base class for timeline diff --git a/src/gui/widgets/timeline/timeline-track.cpp b/src/gui/widgets/timeline/timeline-track.cpp index b6c69a698..810a7d84f 100644 --- a/src/gui/widgets/timeline/timeline-track.cpp +++ b/src/gui/widgets/timeline/timeline-track.cpp @@ -1,23 +1,23 @@ /* timeline-track.cpp - Implementation of the timeline track object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "timeline-track.hpp" diff --git a/src/gui/widgets/timeline/timeline-track.hpp b/src/gui/widgets/timeline/timeline-track.hpp index fbb6b56cc..8b1ed5099 100644 --- a/src/gui/widgets/timeline/timeline-track.hpp +++ b/src/gui/widgets/timeline/timeline-track.hpp @@ -1,23 +1,23 @@ /* timeline-track.hpp - Declaration of the timeline group track object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file widgets/timeline/timeline-track.hpp ** This file contains the definition of timeline track object diff --git a/src/gui/widgets/timeline/timeline-view-window.cpp b/src/gui/widgets/timeline/timeline-view-window.cpp index e5283a24a..6ea7ff242 100644 --- a/src/gui/widgets/timeline/timeline-view-window.cpp +++ b/src/gui/widgets/timeline/timeline-view-window.cpp @@ -1,23 +1,23 @@ /* timeline-window.hpp - Implementation of the timeline window object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "timeline-view-window.hpp" diff --git a/src/gui/widgets/timeline/timeline-view-window.hpp b/src/gui/widgets/timeline/timeline-view-window.hpp index 8689b6ce6..972f30edb 100644 --- a/src/gui/widgets/timeline/timeline-view-window.hpp +++ b/src/gui/widgets/timeline/timeline-view-window.hpp @@ -1,23 +1,23 @@ /* timeline-view-window.hpp - Declaration of the timeline window object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file widgets/timeline/timeline-view-window.hpp ** This file contains the definition of timeline view window helper diff --git a/src/gui/widgets/video-display-widget.cpp b/src/gui/widgets/video-display-widget.cpp index 4a31af101..5b6d59b1f 100644 --- a/src/gui/widgets/video-display-widget.cpp +++ b/src/gui/widgets/video-display-widget.cpp @@ -1,23 +1,23 @@ /* video-display-widget.cpp - Implementation of the video viewer widget - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include diff --git a/src/gui/widgets/video-display-widget.hpp b/src/gui/widgets/video-display-widget.hpp index 6587362cf..9eea972f2 100644 --- a/src/gui/widgets/video-display-widget.hpp +++ b/src/gui/widgets/video-display-widget.hpp @@ -1,23 +1,23 @@ /* video-display-widget.hpp - Declaration of the video viewer widget - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file video-display-widget.hpp ** This file contains the definition of video viewer widget diff --git a/src/gui/window-manager.cpp b/src/gui/window-manager.cpp index 0e6319816..2ede0c8ba 100644 --- a/src/gui/window-manager.cpp +++ b/src/gui/window-manager.cpp @@ -1,23 +1,23 @@ /* window-manager.cpp - Defines the global UI Manager class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "window-manager.hpp" diff --git a/src/gui/window-manager.hpp b/src/gui/window-manager.hpp index 341c25fcb..0724c04b3 100644 --- a/src/gui/window-manager.hpp +++ b/src/gui/window-manager.hpp @@ -1,23 +1,23 @@ /* window-manager.hpp - Defines the global UI Manager class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file window-manager.hpp ** This file contains the defintion of global UI Manager class. diff --git a/src/gui/workspace/actions.cpp b/src/gui/workspace/actions.cpp index af8d94952..cf0761964 100644 --- a/src/gui/workspace/actions.cpp +++ b/src/gui/workspace/actions.cpp @@ -1,23 +1,23 @@ /* Actions.cpp - Definition of the main workspace window object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "actions.hpp" diff --git a/src/gui/workspace/actions.hpp b/src/gui/workspace/actions.hpp index c6e843832..aa25fbee6 100644 --- a/src/gui/workspace/actions.hpp +++ b/src/gui/workspace/actions.hpp @@ -1,23 +1,23 @@ /* ACTIONS.hpp - Definition of a helper class for user actions - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file actions.hpp ** This file contains the definition of a helper class for the diff --git a/src/gui/workspace/panel-manager.cpp b/src/gui/workspace/panel-manager.cpp index 357f91860..3cabe8f45 100644 --- a/src/gui/workspace/panel-manager.cpp +++ b/src/gui/workspace/panel-manager.cpp @@ -1,23 +1,23 @@ /* panel-manager.cpp - Definition of the panel manager object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "panel-manager.hpp" diff --git a/src/gui/workspace/panel-manager.hpp b/src/gui/workspace/panel-manager.hpp index 012826184..9362b66aa 100644 --- a/src/gui/workspace/panel-manager.hpp +++ b/src/gui/workspace/panel-manager.hpp @@ -1,23 +1,23 @@ /* panel-manager.hpp - Definition of the panel manager object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file panel-manager.hpp ** This file contains the definition of the panel manager object. diff --git a/src/gui/workspace/workspace-window.cpp b/src/gui/workspace/workspace-window.cpp index 5a74c526f..e7b91a6a0 100644 --- a/src/gui/workspace/workspace-window.cpp +++ b/src/gui/workspace/workspace-window.cpp @@ -1,23 +1,23 @@ /* workspace-window.cpp - Definition of the main workspace window object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include diff --git a/src/gui/workspace/workspace-window.hpp b/src/gui/workspace/workspace-window.hpp index b00b009a6..a038728f1 100644 --- a/src/gui/workspace/workspace-window.hpp +++ b/src/gui/workspace/workspace-window.hpp @@ -1,23 +1,23 @@ /* workspace-window.hpp - Definition of the main workspace window object - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file workspace-window.hpp ** This file contains the definition of the main workspace window diff --git a/src/include/configfacade.hpp b/src/include/configfacade.hpp index 7e6c8307b..90a2528b2 100644 --- a/src/include/configfacade.hpp +++ b/src/include/configfacade.hpp @@ -1,23 +1,23 @@ /* CONFIGFACADE - C++ convenience wrapper and startup of the config system - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file configfacade.hpp diff --git a/src/include/display-facade.h b/src/include/display-facade.h index ef12fdb1d..d226fa6e5 100644 --- a/src/include/display-facade.h +++ b/src/include/display-facade.h @@ -1,23 +1,23 @@ /* DISPLAY-FACADE.h - accessing a display for outputting frames - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file display-facade.h diff --git a/src/include/display-handles.h b/src/include/display-handles.h index 467607427..8efb51ed9 100644 --- a/src/include/display-handles.h +++ b/src/include/display-handles.h @@ -1,23 +1,23 @@ /* DISPLAY-HANDLES.h - opaque handle types for playback and display - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file display-handles.hpp diff --git a/src/include/dummy-player-facade.h b/src/include/dummy-player-facade.h index 0447172d1..403ca2f35 100644 --- a/src/include/dummy-player-facade.h +++ b/src/include/dummy-player-facade.h @@ -1,23 +1,23 @@ /* DUMMY-PLAYER-FACADE.h - access point to a dummy test player - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/include/guinotification-facade.h b/src/include/guinotification-facade.h index ea575fb5f..8c0834d2c 100644 --- a/src/include/guinotification-facade.h +++ b/src/include/guinotification-facade.h @@ -1,23 +1,23 @@ /* GUINOTIFICATION-FACADE.h - access point for pushing informations into the GUI - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file guinotification-facade.h diff --git a/src/include/interfaceproxy.hpp b/src/include/interfaceproxy.hpp index 26d1761f1..ea5677042 100644 --- a/src/include/interfaceproxy.hpp +++ b/src/include/interfaceproxy.hpp @@ -1,23 +1,23 @@ /* INTERFACEPROXY - definition of forwarding proxies for the facade interfaces - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file interfaceproxy.hpp diff --git a/src/include/lifecycle.h b/src/include/lifecycle.h index 26e649569..3313e5bee 100644 --- a/src/include/lifecycle.h +++ b/src/include/lifecycle.h @@ -1,23 +1,23 @@ /* LIFECYCLE.h - interface for registering and triggering lifecycle callbacks - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file lifecycle.h diff --git a/src/include/logging.h b/src/include/logging.h index d2420b0f8..e2b9455ea 100644 --- a/src/include/logging.h +++ b/src/include/logging.h @@ -7,8 +7,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -132,6 +132,12 @@ NOBUG_CPP_DEFINE_FLAG_PARENT ( proc, progress); NOBUG_CPP_DEFINE_FLAG_PARENT ( command, proc); /** progress log for session datastructure */ NOBUG_CPP_DEFINE_FLAG_PARENT ( session, proc); +/** progress log for the builder and build process */ +NOBUG_CPP_DEFINE_FLAG_PARENT ( builder, proc); +/** progress log for running the engine */ +NOBUG_CPP_DEFINE_FLAG_PARENT ( engine, proc); +/** progress log for play- and render subsystem */ +NOBUG_CPP_DEFINE_FLAG_PARENT ( play, proc); /** progress log for the gui */ NOBUG_CPP_DEFINE_FLAG_PARENT ( gui, progress); /** progress log for the support lib */ @@ -158,13 +164,13 @@ NOBUG_CPP_DEFINE_FLAG_PARENT ( config, logging); /** base flag for software testing */ NOBUG_CPP_DEFINE_FLAG_PARENT ( test, logging); -/** base flag for syncronization logging */ +/** base flag for synchronisation logging */ NOBUG_CPP_DEFINE_FLAG_PARENT ( sync, logging); // do we need subsections here? backend_mutex_sync proc_mutex_sync etc? NOBUG_CPP_DEFINE_FLAG_PARENT ( mutex_sync, sync); //locking/unlocking mutexes NOBUG_CPP_DEFINE_FLAG_PARENT ( cond_sync, sync); //waiting and signalling condition vars /** base flag for memory related logging */ NOBUG_CPP_DEFINE_FLAG_PARENT ( memory, logging); -/** memory busines of the proc layer */ +/** proc layer memory handling */ NOBUG_CPP_DEFINE_FLAG_PARENT ( proc_mem, memory); NOBUG_CPP_DEFINE_FLAG_PARENT ( mobject_mem, proc_mem); NOBUG_CPP_DEFINE_FLAG_PARENT ( builder_mem, proc_mem); diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 74911c158..9837f7da3 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -35,7 +35,7 @@ liblumiera_la_LIBADD = \ liblumiera_la_SOURCES = \ $(liblumiera_la_srcdir)/advice/advice.cpp \ $(liblumiera_la_srcdir)/advice/binding.cpp \ - $(liblumiera_la_srcdir)/allocationcluster.cpp \ + $(liblumiera_la_srcdir)/allocation-cluster.cpp \ $(liblumiera_la_srcdir)/cmdline.cpp \ $(liblumiera_la_srcdir)/condition.c \ $(liblumiera_la_srcdir)/error.c \ @@ -69,8 +69,8 @@ noinst_HEADERS += \ $(liblumiera_la_srcdir)/advice.hpp \ $(liblumiera_la_srcdir)/advice/binding.hpp \ $(liblumiera_la_srcdir)/advice/index.hpp \ - $(liblumiera_la_srcdir)/allocationcluster.hpp \ - $(liblumiera_la_srcdir)/allocationcluster.hpp \ + $(liblumiera_la_srcdir)/allocation-cluster.hpp \ + $(liblumiera_la_srcdir)/allocation-cluster.hpp \ $(liblumiera_la_srcdir)/condition.h \ $(liblumiera_la_srcdir)/error.h \ $(liblumiera_la_srcdir)/error.hpp \ @@ -103,9 +103,9 @@ noinst_HEADERS += \ $(liblumiera_la_srcdir)/scoped-holder.hpp \ $(liblumiera_la_srcdir)/singleton-subclass.hpp \ $(liblumiera_la_srcdir)/singleton.hpp \ - $(liblumiera_la_srcdir)/singletonfactory.hpp \ - $(liblumiera_la_srcdir)/singletonpolicies.hpp \ - $(liblumiera_la_srcdir)/singletonpreconfigure.hpp \ + $(liblumiera_la_srcdir)/singleton-factory.hpp \ + $(liblumiera_la_srcdir)/singleton-policies.hpp \ + $(liblumiera_la_srcdir)/singleton-preconfigure.hpp \ $(liblumiera_la_srcdir)/sync-classlock.hpp \ $(liblumiera_la_srcdir)/sync.hpp \ $(liblumiera_la_srcdir)/sync.hpp \ diff --git a/src/lib/access-casted.hpp b/src/lib/access-casted.hpp index 503262294..9f51110f8 100644 --- a/src/lib/access-casted.hpp +++ b/src/lib/access-casted.hpp @@ -1,23 +1,23 @@ /* ACCESS-CASTED.hpp - util template to access a value using conversion or cast as appropriate - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/advice.hpp b/src/lib/advice.hpp index dd6e749eb..d83c33aa4 100644 --- a/src/lib/advice.hpp +++ b/src/lib/advice.hpp @@ -1,23 +1,23 @@ /* ADVICE.hpp - generic loosely coupled interaction guided by symbolic pattern - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/advice/advice.cpp b/src/lib/advice/advice.cpp index cbd70e764..2255de2b6 100644 --- a/src/lib/advice/advice.cpp +++ b/src/lib/advice/advice.cpp @@ -1,23 +1,23 @@ /* Advice - generic loosely coupled interaction guided by symbolic pattern - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/lib/advice/binding.cpp b/src/lib/advice/binding.cpp index c123f04d7..82bcc491b 100644 --- a/src/lib/advice/binding.cpp +++ b/src/lib/advice/binding.cpp @@ -1,23 +1,23 @@ /* Binding - pattern defining a specific attachment to the Advice system - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/lib/advice/binding.hpp b/src/lib/advice/binding.hpp index 23d2b5ae4..df9715907 100644 --- a/src/lib/advice/binding.hpp +++ b/src/lib/advice/binding.hpp @@ -1,23 +1,23 @@ /* BINDING.hpp - pattern defining a specific attachment to the Advice system - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/advice/index.hpp b/src/lib/advice/index.hpp index 7d3b07fc0..5f3fa249a 100644 --- a/src/lib/advice/index.hpp +++ b/src/lib/advice/index.hpp @@ -1,23 +1,23 @@ /* INDEX.hpp - data structure for organising advice solutions and matching - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/allocationcluster.cpp b/src/lib/allocation-cluster.cpp similarity index 98% rename from src/lib/allocationcluster.cpp rename to src/lib/allocation-cluster.cpp index ae283e62f..605e15a5c 100644 --- a/src/lib/allocationcluster.cpp +++ b/src/lib/allocation-cluster.cpp @@ -1,27 +1,27 @@ /* AllocationCluster - allocating and owning a pile of objects - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ -#include "lib/allocationcluster.hpp" +#include "lib/allocation-cluster.hpp" #include "lib/error.hpp" #include "lib/util.hpp" #include "lib/sync.hpp" diff --git a/src/lib/allocationcluster.hpp b/src/lib/allocation-cluster.hpp similarity index 95% rename from src/lib/allocationcluster.hpp rename to src/lib/allocation-cluster.hpp index 304405d58..12f9e9a9f 100644 --- a/src/lib/allocationcluster.hpp +++ b/src/lib/allocation-cluster.hpp @@ -1,26 +1,26 @@ /* - ALLOCATIONCLUSTER.hpp - allocating and owning a pile of objects - + ALLOCATION-CLUSTER.hpp - allocating and owning a pile of objects + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ -/** @file allocationcluster.hpp +/** @file allocation-cluster.hpp ** Memory management for the low-level model (render nodes network). ** The model is organised into temporal segments, which are considered ** to be structurally constant and uniform. The objects within each @@ -35,17 +35,17 @@ ** templates, and thus need to be in the header. This way they can ** exploit the type information available in call context. This ** information is passed to generic implementation functions - ** defined in allocationcluster.cpp . In a similar vein, the + ** defined in allocation-cluster.cpp . In a similar vein, the ** AllocationCluster::MemoryManger is just forward declared. ** - ** @see allocationclustertest.cpp + ** @see allocation-cluster-test.cpp ** @see builder::ToolFactory ** @see frameid.hpp */ -#ifndef LIB_ALLOCATIONCLUSTER_H -#define LIB_ALLOCATIONCLUSTER_H +#ifndef LIB_ALLOCATION_CLUSTER_H +#define LIB_ALLOCATION_CLUSTER_H #include #include @@ -54,7 +54,7 @@ #include "lib/error.hpp" #include "lib/sync-classlock.hpp" #include "lib/scoped-holder.hpp" -#include "lib/scopedholdertransfer.hpp" +#include "lib/scoped-holder-transfer.hpp" diff --git a/src/lib/bool-checkable.hpp b/src/lib/bool-checkable.hpp index 8ff9ab063..4f03c2773 100644 --- a/src/lib/bool-checkable.hpp +++ b/src/lib/bool-checkable.hpp @@ -1,23 +1,23 @@ /* BOOL-CHECKABLE.hpp - mixin template for defining a safe conversion to bool - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/cmdline.cpp b/src/lib/cmdline.cpp index 90335230e..8539909ec 100644 --- a/src/lib/cmdline.cpp +++ b/src/lib/cmdline.cpp @@ -1,23 +1,23 @@ /* Cmdline - abstraction of the usual commandline, a sequence of strings - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/lib/cmdline.hpp b/src/lib/cmdline.hpp index 1353a9d1d..88d6e2d5a 100644 --- a/src/lib/cmdline.hpp +++ b/src/lib/cmdline.hpp @@ -1,23 +1,23 @@ /* CMDLINE.hpp - abstraction of the usual commandline, a sequence of strings - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/condition.c b/src/lib/condition.c index 7c2d31d8e..2218f40ce 100644 --- a/src/lib/condition.c +++ b/src/lib/condition.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/condition.h b/src/lib/condition.h index db06d5441..70d1a2a03 100644 --- a/src/lib/condition.h +++ b/src/lib/condition.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/cuckoo.c b/src/lib/cuckoo.c index b2ad064c0..4b3a2cbee 100644 --- a/src/lib/cuckoo.c +++ b/src/lib/cuckoo.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/cuckoo.h b/src/lib/cuckoo.h index 84546d002..9fc5c2e75 100644 --- a/src/lib/cuckoo.h +++ b/src/lib/cuckoo.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/del-stash.hpp b/src/lib/del-stash.hpp index 11dd537c6..92dcef26a 100644 --- a/src/lib/del-stash.hpp +++ b/src/lib/del-stash.hpp @@ -1,23 +1,23 @@ /* DEL-STASH.hpp - collect and execute deleter functions - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/diagnostic-context.hpp b/src/lib/diagnostic-context.hpp index 0003c0677..28f97c5c1 100644 --- a/src/lib/diagnostic-context.hpp +++ b/src/lib/diagnostic-context.hpp @@ -1,14 +1,14 @@ /* DIAGNOSTIC-CONTEXT.hpp - thread local stack for explicitly collecting diagnostic context info - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/src/lib/element-tracker.hpp b/src/lib/element-tracker.hpp index 4513ae379..d7d6c1794 100644 --- a/src/lib/element-tracker.hpp +++ b/src/lib/element-tracker.hpp @@ -1,23 +1,23 @@ /* ELEMENT-TRACKER.hpp - registry for tracking instances automatically - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/error.c b/src/lib/error.c index 0de5f4b7a..d91a27359 100644 --- a/src/lib/error.c +++ b/src/lib/error.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/error.h b/src/lib/error.h index 1449c4fa2..f76a21591 100644 --- a/src/lib/error.h +++ b/src/lib/error.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/error.hpp b/src/lib/error.hpp index 4a841c629..af911ac7a 100644 --- a/src/lib/error.hpp +++ b/src/lib/error.hpp @@ -1,23 +1,23 @@ /* ERROR.hpp - Lumiera Exception Interface - + Copyright (C) Lumiera.org 2008-2010 Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/exception.cpp b/src/lib/exception.cpp index 8d11c8580..bd19d30f6 100644 --- a/src/lib/exception.cpp +++ b/src/lib/exception.cpp @@ -1,23 +1,23 @@ /* Error - Lumiera Exception Interface - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/lib/factory.hpp b/src/lib/factory.hpp index 6cefba752..28d37ad1a 100644 --- a/src/lib/factory.hpp +++ b/src/lib/factory.hpp @@ -1,23 +1,23 @@ /* FACTORY.hpp - template for object/smart-pointer factories - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/format.hpp b/src/lib/format.hpp index 0e75f6da2..4aa0a1743 100644 --- a/src/lib/format.hpp +++ b/src/lib/format.hpp @@ -1,23 +1,23 @@ /* FORMAT.hpp - helpers for formatting and diagnostics - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/frameid.hpp b/src/lib/frameid.hpp index 1e0f2af78..a8db83077 100644 --- a/src/lib/frameid.hpp +++ b/src/lib/frameid.hpp @@ -1,23 +1,23 @@ /* FRAMEID.hpp - distinct identification of a single data frame - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/functor-util.hpp b/src/lib/functor-util.hpp index 7efee7060..d47b86a9c 100644 --- a/src/lib/functor-util.hpp +++ b/src/lib/functor-util.hpp @@ -1,23 +1,23 @@ /* FUNCTOR-UTIL.hpp - collection of helpers for dealing with functors and signals - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/handle.hpp b/src/lib/handle.hpp index cb3b56e55..a1a01a919 100644 --- a/src/lib/handle.hpp +++ b/src/lib/handle.hpp @@ -1,14 +1,14 @@ /* HANDLE.hpp - opaque handle to an implementation entity, automatically managing lifecycle - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/src/lib/hash-indexed.hpp b/src/lib/hash-indexed.hpp index 81c0b37fa..d665dac81 100644 --- a/src/lib/hash-indexed.hpp +++ b/src/lib/hash-indexed.hpp @@ -1,23 +1,23 @@ /* HASH-INDEXED.hpp - generic hash based and typed ID - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/iter-adapter-stl.hpp b/src/lib/iter-adapter-stl.hpp index 13e183113..f974892ec 100644 --- a/src/lib/iter-adapter-stl.hpp +++ b/src/lib/iter-adapter-stl.hpp @@ -1,23 +1,23 @@ /* ITER-ADAPTER-STL.hpp - helpers for building simple forward iterators - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file iter-adapter-stl.hpp diff --git a/src/lib/iter-adapter.hpp b/src/lib/iter-adapter.hpp index 88968cca5..a8306a774 100644 --- a/src/lib/iter-adapter.hpp +++ b/src/lib/iter-adapter.hpp @@ -1,23 +1,23 @@ /* ITER-ADAPTER.hpp - helpers for building simple forward iterators - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file iter-adapter.hpp diff --git a/src/lib/iter-source.hpp b/src/lib/iter-source.hpp index ee3ec8228..7910ecd5c 100644 --- a/src/lib/iter-source.hpp +++ b/src/lib/iter-source.hpp @@ -1,23 +1,23 @@ /* ITER-SOURCE.hpp - an interface to build an opaque iterator-based data source - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file iter-source.hpp diff --git a/src/lib/iter-type-binding.hpp b/src/lib/iter-type-binding.hpp index a370e99fb..4580ac18c 100644 --- a/src/lib/iter-type-binding.hpp +++ b/src/lib/iter-type-binding.hpp @@ -1,23 +1,23 @@ /* ITER-TYPE-BINDING.hpp - control type variations for IterAdapter - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file iter-type-binding.hpp diff --git a/src/lib/itertools.hpp b/src/lib/itertools.hpp index 80092d61b..a4efc4829 100644 --- a/src/lib/itertools.hpp +++ b/src/lib/itertools.hpp @@ -1,23 +1,23 @@ /* ITERTOOLS.hpp - collection of tools for building and combining iterators - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file itertools.hpp diff --git a/src/lib/lifecycle.cpp b/src/lib/lifecycle.cpp index 939e3e252..2e23081ec 100644 --- a/src/lib/lifecycle.cpp +++ b/src/lib/lifecycle.cpp @@ -1,23 +1,23 @@ /* Lifecycle - registering and triggering lifecycle callbacks - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/lib/lifecycleregistry.hpp b/src/lib/lifecycleregistry.hpp index 4a426e2e6..a52ff65c4 100644 --- a/src/lib/lifecycleregistry.hpp +++ b/src/lib/lifecycleregistry.hpp @@ -1,24 +1,24 @@ /* LIFECYCLEREGISTRY.hpp - registry for application lifecycle callbacks - + Copyright (C) Lumiera.org 2008, Christian Thaeter Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file lifecycleregistry.hpp diff --git a/src/lib/llist.h b/src/lib/llist.h index d6511ebaf..d5599a007 100644 --- a/src/lib/llist.h +++ b/src/lib/llist.h @@ -8,8 +8,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/lockerror.c b/src/lib/lockerror.c index bad423698..d115f8d7f 100644 --- a/src/lib/lockerror.c +++ b/src/lib/lockerror.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/lockerror.h b/src/lib/lockerror.h index 27ff5dbe3..3c5293272 100644 --- a/src/lib/lockerror.h +++ b/src/lib/lockerror.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/logging.cpp b/src/lib/logging.cpp index b2a62dfce..91c1af570 100644 --- a/src/lib/logging.cpp +++ b/src/lib/logging.cpp @@ -7,8 +7,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/luid.c b/src/lib/luid.c index c8d766094..2776cda84 100644 --- a/src/lib/luid.c +++ b/src/lib/luid.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/luid.h b/src/lib/luid.h index 0986e5580..d24614a37 100644 --- a/src/lib/luid.h +++ b/src/lib/luid.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/lumitime-fmt.hpp b/src/lib/lumitime-fmt.hpp index bb8066ebe..20b24f951 100644 --- a/src/lib/lumitime-fmt.hpp +++ b/src/lib/lumitime-fmt.hpp @@ -1,23 +1,23 @@ /* LUMITIME-FMT.hpp - output and formatting of time(code) values - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/lumitime.cpp b/src/lib/lumitime.cpp index fb798d476..bae855539 100644 --- a/src/lib/lumitime.cpp +++ b/src/lib/lumitime.cpp @@ -1,23 +1,23 @@ /* Time - convenience wrapper for working with gavl_time in C++ - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ @@ -47,41 +47,45 @@ namespace lumiera { ) : t_(lumiera_build_time (millis,secs,mins,hours)) { } - - + int Time::getMillis() const { - return (t_ / (GAVL_TIME_SCALE / 1000)) % 1000; + return lumiera_time_millis(t_); } int Time::getSecs() const { - return (t_ / (GAVL_TIME_SCALE / 1 )) % 60; + return lumiera_time_seconds(t_); } int Time::getMins() const { - return (t_ / (60 * GAVL_TIME_SCALE)) % 60; + return lumiera_time_minutes(t_); } int Time::getHours() const { - return (t_ / (gavl_time_t(60) * 60 * GAVL_TIME_SCALE)); + return lumiera_time_hours(t_); } + int + Time::getFrames() const + { + // TODO + return 0; + } + Time::operator string() const { return string (lumiera_tmpbuf_print_time (t_)); } - - } // namespace lumiera diff --git a/src/lib/lumitime.hpp b/src/lib/lumitime.hpp index 9f13d48f8..5fe942218 100644 --- a/src/lib/lumitime.hpp +++ b/src/lib/lumitime.hpp @@ -1,23 +1,23 @@ /* LUMITIME.hpp - convenience wrapper for working with gavl_time in C++ - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ @@ -85,8 +85,8 @@ namespace lumiera { int getSecs () const; int getMins () const; int getHours () const; - - + int getFrames () const; + operator std::string () const; operator gavl_time_t () const { return t_; } diff --git a/src/lib/meta/configflags.hpp b/src/lib/meta/configflags.hpp index 82d49bfc5..16c81a7bb 100644 --- a/src/lib/meta/configflags.hpp +++ b/src/lib/meta/configflags.hpp @@ -1,23 +1,23 @@ /* CONFIGFLAGS.hpp - Building classes based on configuration cases - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/meta/duck-detector.hpp b/src/lib/meta/duck-detector.hpp index 9ee864880..0091a894f 100644 --- a/src/lib/meta/duck-detector.hpp +++ b/src/lib/meta/duck-detector.hpp @@ -1,23 +1,23 @@ /* DUCK-DETECTOR.hpp - helpers for statically detecting properties of a type - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/meta/function-closure.hpp b/src/lib/meta/function-closure.hpp index 936534af9..374c75883 100644 --- a/src/lib/meta/function-closure.hpp +++ b/src/lib/meta/function-closure.hpp @@ -1,23 +1,23 @@ /* FUNCTION-CLOSURE.hpp - metaprogramming tools for closing a function over given arguments - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/meta/function-erasure.hpp b/src/lib/meta/function-erasure.hpp index 388e799cb..6e04effc2 100644 --- a/src/lib/meta/function-erasure.hpp +++ b/src/lib/meta/function-erasure.hpp @@ -1,23 +1,23 @@ /* FUNCTION-ERASURE.hpp - wrapping a functor object for inline storage while hiding the signature - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/meta/function.hpp b/src/lib/meta/function.hpp index 57faab310..fa7c38c55 100644 --- a/src/lib/meta/function.hpp +++ b/src/lib/meta/function.hpp @@ -1,23 +1,23 @@ /* FUNCTION.hpp - metaprogramming utilities for transforming function types - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/meta/generator.hpp b/src/lib/meta/generator.hpp index b248888d2..c3dfa76f4 100644 --- a/src/lib/meta/generator.hpp +++ b/src/lib/meta/generator.hpp @@ -1,14 +1,14 @@ /* GENERATOR.hpp - metaprogramming utilities for generating classes and interfaces - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/src/lib/meta/maybe-compare.hpp b/src/lib/meta/maybe-compare.hpp index 385e90bd3..3c96cdf01 100644 --- a/src/lib/meta/maybe-compare.hpp +++ b/src/lib/meta/maybe-compare.hpp @@ -1,23 +1,23 @@ /* MAYBE-COMPARE.hpp - guarded invocation of comparisons - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/meta/trait-special.hpp b/src/lib/meta/trait-special.hpp index 1fbb4b157..e6a302a7b 100644 --- a/src/lib/meta/trait-special.hpp +++ b/src/lib/meta/trait-special.hpp @@ -1,23 +1,23 @@ /* TRAIT-SPECIAL.hpp - supplement, not so commonly used definitions and specialisations - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/meta/trait.hpp b/src/lib/meta/trait.hpp index eb6d208ef..84250866f 100644 --- a/src/lib/meta/trait.hpp +++ b/src/lib/meta/trait.hpp @@ -1,23 +1,23 @@ /* TRAIT.hpp - type handling and type detection helpers - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/meta/tuple.hpp b/src/lib/meta/tuple.hpp index 27f8538c1..39e9e53dd 100644 --- a/src/lib/meta/tuple.hpp +++ b/src/lib/meta/tuple.hpp @@ -1,23 +1,23 @@ /* TUPLE.hpp - metaprogramming utilities for type tuples and data tuples - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/meta/typelist-util.hpp b/src/lib/meta/typelist-util.hpp index a55ca639f..cf66a791a 100644 --- a/src/lib/meta/typelist-util.hpp +++ b/src/lib/meta/typelist-util.hpp @@ -1,23 +1,23 @@ /* TYPELIST-UTIL.hpp - Utils for working with lists-of-types - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/meta/typelist.hpp b/src/lib/meta/typelist.hpp index b3e44138d..5d0e11bc0 100644 --- a/src/lib/meta/typelist.hpp +++ b/src/lib/meta/typelist.hpp @@ -1,14 +1,14 @@ /* TYPELIST.hpp - typelist meta programming facilities - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/src/lib/meta/typeseq-util.hpp b/src/lib/meta/typeseq-util.hpp index 23ffbdc77..398d09d53 100644 --- a/src/lib/meta/typeseq-util.hpp +++ b/src/lib/meta/typeseq-util.hpp @@ -1,23 +1,23 @@ /* TYPESEQ-UTIL.hpp - basic metaprogramming utilities for type sequences - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/meta/util.hpp b/src/lib/meta/util.hpp index f824ee6b6..e6bb82209 100644 --- a/src/lib/meta/util.hpp +++ b/src/lib/meta/util.hpp @@ -1,23 +1,23 @@ /* UTIL.hpp - metaprogramming helpers and utilities - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/mpool.c b/src/lib/mpool.c index b713006c8..abcc8a810 100644 --- a/src/lib/mpool.c +++ b/src/lib/mpool.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/mpool.h b/src/lib/mpool.h index f2384bf94..3d9ec4e13 100644 --- a/src/lib/mpool.h +++ b/src/lib/mpool.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/mrucache.c b/src/lib/mrucache.c index d591d5f56..272d66a3e 100644 --- a/src/lib/mrucache.c +++ b/src/lib/mrucache.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/mrucache.h b/src/lib/mrucache.h index 8a8c5fbe9..a96f02282 100644 --- a/src/lib/mrucache.h +++ b/src/lib/mrucache.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/multifact-arg.hpp b/src/lib/multifact-arg.hpp index dfb452765..c68117c2c 100644 --- a/src/lib/multifact-arg.hpp +++ b/src/lib/multifact-arg.hpp @@ -1,23 +1,23 @@ /* MULTIFACT-ARG.hpp - variant of family-of-object factory, accepting fabrication arguments - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file multifact.hpp diff --git a/src/lib/multifact.hpp b/src/lib/multifact.hpp index 6e77b5d6e..b598a198d 100644 --- a/src/lib/multifact.hpp +++ b/src/lib/multifact.hpp @@ -1,23 +1,23 @@ /* MULTIFACT.hpp - flexible family-of-object factory template - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file multifact.hpp diff --git a/src/lib/mutex.c b/src/lib/mutex.c index baaa39b07..11977c372 100644 --- a/src/lib/mutex.c +++ b/src/lib/mutex.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/mutex.h b/src/lib/mutex.h index ec9215e04..cfcba113d 100644 --- a/src/lib/mutex.h +++ b/src/lib/mutex.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/nobug-init.cpp b/src/lib/nobug-init.cpp index 59c4edf6c..18d1f95d0 100644 --- a/src/lib/nobug-init.cpp +++ b/src/lib/nobug-init.cpp @@ -1,23 +1,23 @@ /* NoBugInit - pull up NoBug automagically in static initialisation - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/lib/nobug-init.hpp b/src/lib/nobug-init.hpp index a34fa8577..8d340b855 100644 --- a/src/lib/nobug-init.hpp +++ b/src/lib/nobug-init.hpp @@ -1,24 +1,24 @@ /* NOBUG-INIT.hpp - pull up NoBug automagically in static initialisation - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file nobug-init.hpp diff --git a/src/lib/null-value.hpp b/src/lib/null-value.hpp index 5b102d110..050bd3fcc 100644 --- a/src/lib/null-value.hpp +++ b/src/lib/null-value.hpp @@ -1,23 +1,23 @@ /* NULL-VALUE.hpp - maintain per-type NIL values in static memory - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/observable-list.hpp b/src/lib/observable-list.hpp index dd06d0979..467fa7020 100644 --- a/src/lib/observable-list.hpp +++ b/src/lib/observable-list.hpp @@ -1,23 +1,23 @@ /* observable-list.hpp - Defines the observable std::list class - + Copyright (C) Lumiera.org 2008, Joel Holdsworth - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file observable-list.hpp ** This file contains the definition of the observable list class diff --git a/src/lib/opaque-holder.hpp b/src/lib/opaque-holder.hpp index 407a4c685..3cc52a607 100644 --- a/src/lib/opaque-holder.hpp +++ b/src/lib/opaque-holder.hpp @@ -1,23 +1,23 @@ /* OPAQUE-HOLDER.hpp - buffer holding an object inline while hiding the concrete type - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file opaque-holder.hpp diff --git a/src/lib/optional-ref.hpp b/src/lib/optional-ref.hpp index 9c4825825..71ce7393d 100644 --- a/src/lib/optional-ref.hpp +++ b/src/lib/optional-ref.hpp @@ -1,14 +1,14 @@ /* OPTIONAL-REF.hpp - optional and switchable reference - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/src/lib/p.hpp b/src/lib/p.hpp index 4ac393a18..4fef50a36 100644 --- a/src/lib/p.hpp +++ b/src/lib/p.hpp @@ -1,23 +1,23 @@ /* P.hpp - customised shared_ptr with ordering and type relationships - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file p.hpp diff --git a/src/lib/ppmpl.h b/src/lib/ppmpl.h index f2cf20665..db47b9920 100644 --- a/src/lib/ppmpl.h +++ b/src/lib/ppmpl.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/psplay.c b/src/lib/psplay.c index 1f788a644..e28840476 100644 --- a/src/lib/psplay.c +++ b/src/lib/psplay.c @@ -8,8 +8,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/psplay.h b/src/lib/psplay.h index 70c450fe3..4858db8cd 100644 --- a/src/lib/psplay.h +++ b/src/lib/psplay.h @@ -8,8 +8,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/query.cpp b/src/lib/query.cpp index ab143cd0b..e6ff8e918 100644 --- a/src/lib/query.cpp +++ b/src/lib/query.cpp @@ -1,23 +1,23 @@ /* Query - interface for capability queries - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/lib/query.hpp b/src/lib/query.hpp index 283292b24..a9ef96614 100644 --- a/src/lib/query.hpp +++ b/src/lib/query.hpp @@ -1,23 +1,23 @@ /* QUERY.hpp - interface for capability queries - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ @@ -28,7 +28,7 @@ #include #include -#include +#include /////////////////////////////////////////TICKET #166 Oh RLY ... need to do away with this #include "lib/symbol.hpp" @@ -64,7 +64,7 @@ namespace lumiera { { public: explicit Query (string const& predicate="") : string(predicate) {} - explicit Query (format& pattern) : string(str(pattern)) {} +// explicit Query (format& pattern) : string(str(pattern)) {} //////////////TICKET #166 outch... that needs to disappear const string asKey() const { diff --git a/src/lib/reccondition.c b/src/lib/reccondition.c index 01feab0ee..b7d0730d5 100644 --- a/src/lib/reccondition.c +++ b/src/lib/reccondition.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/reccondition.h b/src/lib/reccondition.h index 418d8556b..a2a734a69 100644 --- a/src/lib/reccondition.h +++ b/src/lib/reccondition.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/recmutex.c b/src/lib/recmutex.c index ca3c2f37c..dc631f25b 100644 --- a/src/lib/recmutex.c +++ b/src/lib/recmutex.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/recmutex.h b/src/lib/recmutex.h index 18dff4acf..0088b8ae6 100644 --- a/src/lib/recmutex.h +++ b/src/lib/recmutex.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/ref-array-impl.hpp b/src/lib/ref-array-impl.hpp index 02eff2d54..7a8b84c82 100644 --- a/src/lib/ref-array-impl.hpp +++ b/src/lib/ref-array-impl.hpp @@ -1,23 +1,23 @@ /* REF-ARRAY-IMPL.hpp - some implementations of the ref-array interface - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file ref-array-impl.hpp diff --git a/src/lib/ref-array.hpp b/src/lib/ref-array.hpp index ccf565406..ddbc06da1 100644 --- a/src/lib/ref-array.hpp +++ b/src/lib/ref-array.hpp @@ -1,23 +1,23 @@ /* REF-ARRAY.hpp - abstraction providing array-like access to a list of references - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/result.hpp b/src/lib/result.hpp index 8cc77beb9..ae4f7b187 100644 --- a/src/lib/result.hpp +++ b/src/lib/result.hpp @@ -1,23 +1,23 @@ /* RESULT.hpp - intermediary token representing the result of an operation - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/rwlock.c b/src/lib/rwlock.c index 03d70b7e3..8e293543f 100644 --- a/src/lib/rwlock.c +++ b/src/lib/rwlock.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/rwlock.h b/src/lib/rwlock.h index 79b019660..9890cd1ef 100644 --- a/src/lib/rwlock.h +++ b/src/lib/rwlock.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/safeclib.c b/src/lib/safeclib.c index ae621501d..980353273 100644 --- a/src/lib/safeclib.c +++ b/src/lib/safeclib.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/safeclib.h b/src/lib/safeclib.h index 7a79b5021..60ae3c5ad 100644 --- a/src/lib/safeclib.h +++ b/src/lib/safeclib.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/scopedholdertransfer.hpp b/src/lib/scoped-holder-transfer.hpp similarity index 95% rename from src/lib/scopedholdertransfer.hpp rename to src/lib/scoped-holder-transfer.hpp index 3d600e61a..e1ee6d5c9 100644 --- a/src/lib/scopedholdertransfer.hpp +++ b/src/lib/scoped-holder-transfer.hpp @@ -1,29 +1,29 @@ /* - SCOPEDHOLDERVECTOR.hpp - using ScopedHolder within a STL vector - + SCOPED-HOLDER-TRANSFER.hpp - using ScopedHolder within a STL vector + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ -#ifndef LIB_SCOPEDHOLDERVECTOR_H -#define LIB_SCOPEDHOLDERVECTOR_H +#ifndef LIB_SCOPEDHOLDER_TRANSFER_H +#define LIB_SCOPEDHOLDER_TRANSFER_H #include "lib/error.hpp" #include diff --git a/src/lib/scoped-holder.hpp b/src/lib/scoped-holder.hpp index 4e2c82627..f8eaf74d2 100644 --- a/src/lib/scoped-holder.hpp +++ b/src/lib/scoped-holder.hpp @@ -1,23 +1,23 @@ /* SCOPED-HOLDER.hpp - general purpose wrapper for dealing with ownership problems - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file scoped-holder.hpp @@ -47,7 +47,7 @@ ** friend function. ** ** @see scoped-holder-test.cpp - ** @see scopedholdertransfer.hpp use in std::vector + ** @see scoped-holder-transfer.hpp use in std::vector ** @see AllocationCluster usage example ** @see scoped-ptrvect.hpp simple pointer-holding collection */ diff --git a/src/lib/scoped-ptrvect.hpp b/src/lib/scoped-ptrvect.hpp index d21e2333a..8bb713082 100644 --- a/src/lib/scoped-ptrvect.hpp +++ b/src/lib/scoped-ptrvect.hpp @@ -1,23 +1,23 @@ /* SCOPED-PTRVECT.hpp - simple noncopyable lifecycle managing collection of pointers - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file scoped-ptrvect.hpp @@ -171,7 +171,7 @@ namespace lib { private: - /** @internal element access, including null check */ + /** @internal element access, including range and null check */ T* get (size_type i) { diff --git a/src/lib/sectionlock.h b/src/lib/sectionlock.h index 61225e84b..0eb6cd93b 100644 --- a/src/lib/sectionlock.h +++ b/src/lib/sectionlock.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/singletonfactory.hpp b/src/lib/singleton-factory.hpp similarity index 90% rename from src/lib/singletonfactory.hpp rename to src/lib/singleton-factory.hpp index 737ebe8b4..5f5070aa4 100644 --- a/src/lib/singletonfactory.hpp +++ b/src/lib/singleton-factory.hpp @@ -1,14 +1,14 @@ /* - SINGLETONFACTORY.hpp - template for implementing the singleton pattern - + SINGLETON-FACTORY.hpp - template for implementing the singleton pattern + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -31,11 +31,11 @@ This code is heavily inspired by -#ifndef LIB_SINGLETONFACTORY_H -#define LIB_SINGLETONFACTORY_H +#ifndef LIB_SINGLETON_FACTORY_H +#define LIB_SINGLETON_FACTORY_H -#include "lib/singletonpolicies.hpp" // several Policies usable together with SingletonFactory +#include "lib/singleton-policies.hpp" // several Policies usable together with SingletonFactory #include "lib/nobug-init.hpp" #include "include/logging.h" @@ -45,9 +45,9 @@ This code is heavily inspired by namespace lib { /** - * A configurable Template for implementing Singletons. + * A configurable Template for implementing Singletons. * Actually this is a Factory object, which could be placed into a static field - * of the Singleton (target) class or used directly. + * of the Singleton (target) class or used directly. * @note internally uses static fields, so all factory instances share pInstance_ * @note there is an ongoing discussion regarding Double Checked Locking pattern, * which in this case boils down to the question: does \c pthread_mutex_lock/unlock @@ -71,7 +71,7 @@ namespace lib { static PType pInstance_; static bool isDead_; - + public: /** Interface to be used by SingletonFactory's clients. @@ -84,7 +84,7 @@ namespace lib { if (!pInstance_) { ThreadLock guard SIDEEFFECT; - + if (!pInstance_) { if (isDead_) @@ -114,15 +114,15 @@ namespace lib { isDead_ = true; } }; - - // Storage for SingletonFactory's static fields... + + // Storage for SingletonFactory's static fields... template < class SI, template class C, template class L > - typename SingletonFactory::PType + typename SingletonFactory::PType SingletonFactory::pInstance_; template diff --git a/src/lib/singleton-policies.hpp b/src/lib/singleton-policies.hpp new file mode 100644 index 000000000..7c688c829 --- /dev/null +++ b/src/lib/singleton-policies.hpp @@ -0,0 +1,138 @@ +/* + SINGLETON-POLICIES.hpp - how to manage creation, lifecycle and multithreading + + Copyright (C) Lumiera.org + 2008, Hermann Vosseler + + 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 Software Foundation; either version 2 of + the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +==================================================================== +This code is heavily inspired by + The Loki Library (loki-lib/trunk/include/loki/Singleton.h) + Copyright (c) 2001 by Andrei Alexandrescu + This Loki code accompanies the book: + Alexandrescu, Andrei. "Modern C++ Design: Generic Programming + and Design Patterns Applied". + Copyright (c) 2001. Addison-Wesley. ISBN 0201704315 + +*/ + + + +#ifndef LIB_SINGLETON_POLICIES_H +#define LIB_SINGLETON_POLICIES_H + +#include "lib/nobug-init.hpp" +#include "lib/error.hpp" + +#include + + +namespace lib { +namespace singleton { + + + /* === several Policies usable in conjunction with lib::Singleton === */ + + /** + * Policy placing the Singleton instance into a statically allocated buffer + */ + template + struct StaticCreate + { + static S* create () + { +#if NOBUG_MODE_ALPHA + static uint callCount = 0; + ASSERT ( 0 == callCount++ ); +#endif + static char buff[sizeof(S)]; + return new(buff) S(); + } + static void destroy (S* pSi) + { + pSi-> ~S(); + } + }; + + + /** + * Policy for creating the Singleton instance heap allocated + */ + template + struct HeapCreate + { + static S* create () { return new S; } + static void destroy (S* pS) { delete pS; } + }; + + + + + + typedef void (*DelFunc)(void); + using std::vector; + + /** + * Policy relying on the compiler/runtime system for Singleton Lifecycle + */ + template + struct AutoDestroy + { + /** implements the Singleton removal by calling + * the provided deleter function(s) at application shutdown, + * relying on the runtime system calling destructors of static + * objects. Because this Policy class can be shared between + * several Singletons, we need to memorise all registered + * deleter functions for calling them at shutdown. + */ + static void + scheduleDelete (DelFunc kill_the_singleton) + { + class DeleteTrigger + { + vector dels_; + + public: + void schedule (DelFunc del) + { + dels_.push_back(del); + } + ~DeleteTrigger() + { + vector::iterator i = dels_.begin(); + for ( ; i != dels_.end(); ++i ) + (*i)(); // invoke deleter function + } + }; + + REQUIRE (kill_the_singleton); + static DeleteTrigger finally; + finally.schedule (kill_the_singleton); + } + + static void + onDeadReference () + { + throw lumiera::error::Logic ("Trying to access the a Singleton instance that has " + "already been released or finished its lifecycle."); + } + }; + + + + +}} // namespace lib::singleton +#endif diff --git a/src/lib/singletonpreconfigure.hpp b/src/lib/singleton-preconfigure.hpp similarity index 90% rename from src/lib/singletonpreconfigure.hpp rename to src/lib/singleton-preconfigure.hpp index a657a0ec9..5101c634e 100644 --- a/src/lib/singletonpreconfigure.hpp +++ b/src/lib/singleton-preconfigure.hpp @@ -1,26 +1,26 @@ /* - SINGLETONPRECONFIGURE - declare the configuration of some Singleton types in advance - + SINGLETON-PRECONFIGURE - declare the configuration of some Singleton types in advance + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ -/** @file singletonpreconfigure.hpp +/** @file singleton-preconfigure.hpp ** Pre-configuration of some Singleton types, done by template specialisation. ** Typically the client code just includes singleton.h and uses the Singleton ** type. But in some cases, we want to configure specific (dependency injection) @@ -37,12 +37,12 @@ ** @note we declare the specialisations into the target namespace ** ** @see SingletonFactory - ** @see singletontestmocktest.hpp + ** @see SingletonTestMock_test */ -#ifndef LIB_SINGLETONPRECONFIGURE_H -#define LIB_SINGLETONPRECONFIGURE_H +#ifndef LIB_SINGLETON_PRECONFIGURE_H +#define LIB_SINGLETON_PRECONFIGURE_H #include "lib/test/mockinjector.hpp" diff --git a/src/lib/singleton-ref.hpp b/src/lib/singleton-ref.hpp index 8fc9c289c..089ae8579 100644 --- a/src/lib/singleton-ref.hpp +++ b/src/lib/singleton-ref.hpp @@ -1,23 +1,23 @@ /* SINGLETON-REF.hpp - helper template providing singleton-like access for implementation code - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file singleton-ref.hpp diff --git a/src/lib/singleton-subclass.hpp b/src/lib/singleton-subclass.hpp index ce120278a..386fc9f59 100644 --- a/src/lib/singleton-subclass.hpp +++ b/src/lib/singleton-subclass.hpp @@ -1,23 +1,23 @@ /* SINGLETON-SUBCLASS.hpp - variant of the singleton (factory) creating a subclass - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file singleton-subclass.hpp diff --git a/src/lib/singleton.hpp b/src/lib/singleton.hpp index 731c441ac..f7af5ddba 100644 --- a/src/lib/singleton.hpp +++ b/src/lib/singleton.hpp @@ -1,42 +1,42 @@ /* SINGLETON.hpp - configuration header for singleton factory - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file singleton.hpp ** Factory for creating Singleton instances. ** This configuration header just pulls in some other implementation headers in ** the right order. The basic class template for creating singletons resides in - ** singletonfactory.hpp, besides we need policy classes defining how to create + ** singleton-factory.hpp, besides we need policy classes defining how to create ** the singleton objects and how to manage singleton lifecycle. Finally, ** we want to preconfigure singleton factories for some important facilities; ** e.g. sometimes we want to include a hook for injecting Test Mock instances. ** - ** You'll find the default Policies in singletonfactory.hpp and the default - ** definition of type lumiera::singleton in singletonpreconfigure.hpp + ** You'll find the default Policies in singleton-factory.hpp and the default + ** definition of type lumiera::singleton in singleton-preconfigure.hpp ** ** @see SingletonFactory ** @see singleton::StaticCreate ** @see singleton::AutoDestroy ** @see singletontest.hpp - ** @see singletontestmocktest.hpp + ** @see SingletonTestMock_test */ @@ -44,9 +44,9 @@ #define LIB_SINGLETON_H -#include "lib/singletonpolicies.hpp" -#include "lib/singletonfactory.hpp" -#include "lib/singletonpreconfigure.hpp" +#include "lib/singleton-policies.hpp" +#include "lib/singleton-factory.hpp" +#include "lib/singleton-preconfigure.hpp" #endif diff --git a/src/lib/singletonpolicies.hpp b/src/lib/singletonpolicies.hpp deleted file mode 100644 index b8333334d..000000000 --- a/src/lib/singletonpolicies.hpp +++ /dev/null @@ -1,138 +0,0 @@ -/* - SINGLETONPOLICIES.hpp - how to manage creation, lifecycle and multithreading - - Copyright (C) Lumiera.org - 2008, Hermann Vosseler - - 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -==================================================================== -This code is heavily inspired by - The Loki Library (loki-lib/trunk/include/loki/Singleton.h) - Copyright (c) 2001 by Andrei Alexandrescu - This Loki code accompanies the book: - Alexandrescu, Andrei. "Modern C++ Design: Generic Programming - and Design Patterns Applied". - Copyright (c) 2001. Addison-Wesley. ISBN 0201704315 - -*/ - - - -#ifndef LIB_SINGLETONPOLICIES_H -#define LIB_SINGLETONPOLICIES_H - -#include "lib/nobug-init.hpp" -#include "lib/error.hpp" - -#include - - -namespace lib { - namespace singleton { - - - /* === several Policies usable in conjunction with lib::Singleton === */ - - /** - * Policy placing the Singleton instance into a statically allocated buffer - */ - template - struct StaticCreate - { - static S* create () - { -#ifdef DEBUG - static uint callCount = 0; - ASSERT ( 0 == callCount++ ); -#endif - static char buff[sizeof(S)]; - return new(buff) S(); - } - static void destroy (S* pSi) - { - pSi-> ~S(); - } - }; - - - /** - * Policy for creating the Singleton instance heap allocated - */ - template - struct HeapCreate - { - static S* create () { return new S; } - static void destroy (S* pS) { delete pS; } - }; - - - - - - typedef void (*DelFunc)(void); - using std::vector; - - /** - * Policy relying on the compiler/runtime system for Singleton Lifecycle - */ - template - struct AutoDestroy - { - /** implements the Singleton removal by calling - * the provided deleter function(s) at application shutdown, - * relying on the runtime system calling destructors of static - * objects. Because this Policy class can be shared between - * several Singletons, we need to memorise all registered - * deleter functions for calling them at shutdown. - */ - static void - scheduleDelete (DelFunc kill_the_singleton) - { - class DeleteTrigger - { - vector dels_; - - public: - void schedule (DelFunc del) - { - dels_.push_back(del); - } - ~DeleteTrigger() - { - vector::iterator i = dels_.begin(); - for ( ; i != dels_.end(); ++i ) - (*i)(); // invoke deleter func - } - }; - - REQUIRE (kill_the_singleton); - static DeleteTrigger finally; - finally.schedule (kill_the_singleton); - } - - static void - onDeadReference () - { - throw lumiera::error::Logic ("Trying to access the a Singleton instance that has " - "already been released or finished its lifecycle."); - } - }; - - - - -}} // namespace lib::singleton -#endif diff --git a/src/lib/streamtype.cpp b/src/lib/streamtype.cpp index 5d90af0c0..410227567 100644 --- a/src/lib/streamtype.cpp +++ b/src/lib/streamtype.cpp @@ -1,23 +1,23 @@ /* StreamType - classification of media stream types - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/lib/streamtype.hpp b/src/lib/streamtype.hpp index 6dc5747fc..745f50d86 100644 --- a/src/lib/streamtype.hpp +++ b/src/lib/streamtype.hpp @@ -1,23 +1,23 @@ /* STREAMTYPE.hpp - classification of media stream types - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file streamtype.hpp @@ -37,6 +37,7 @@ #include "lib/symbol.hpp" #include "lib/query.hpp" +#include "proc/asset/entry-id.hpp" #include @@ -47,7 +48,7 @@ namespace lumiera { /** - * + * TODO write type comment */ struct StreamType : boost::noncopyable { @@ -72,6 +73,8 @@ namespace lumiera { class ImplFacade; class ImplConstraint; + typedef asset::EntryID ID; + Prototype const& prototype; ImplFacade * implType; /////////////TODO: really by ptr??? @@ -149,9 +152,9 @@ namespace lumiera { * and use it to create a new framebuffer */ virtual DataBuffer* createFrame () const =0; - /** similarily create a impl type which complies to this constraint + /** Similarly create a impl type which complies to this constraint * as well as to the additional constraints (e.g. frame size). - * Create a new framebuffer of the resutling type */ + * Create a new frame buffer of the resulting type */ virtual DataBuffer* createFrame (ImplConstraint const& furtherConstraints) const =0; //TODO: do we need functions to represent and describe this constraint? diff --git a/src/lib/sub-id.hpp b/src/lib/sub-id.hpp index 98df7c4e7..fa47f42f5 100644 --- a/src/lib/sub-id.hpp +++ b/src/lib/sub-id.hpp @@ -1,23 +1,23 @@ /* SUB-ID.hpp - extensible symbolic identifier - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/symbol-impl.cpp b/src/lib/symbol-impl.cpp index 3d06dcc35..9e09b4254 100644 --- a/src/lib/symbol-impl.cpp +++ b/src/lib/symbol-impl.cpp @@ -1,23 +1,23 @@ /* Symbol(impl) - helpers for working with literal string IDs - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ /** @file symbol-impl.hpp diff --git a/src/lib/symbol.hpp b/src/lib/symbol.hpp index fcc9041ce..5c1f4d298 100644 --- a/src/lib/symbol.hpp +++ b/src/lib/symbol.hpp @@ -1,23 +1,23 @@ /* SYMBOL.hpp - symbolic constant datatype - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file symbol.hpp diff --git a/src/lib/sync-classlock.hpp b/src/lib/sync-classlock.hpp index cdee70048..60ffba9bd 100644 --- a/src/lib/sync-classlock.hpp +++ b/src/lib/sync-classlock.hpp @@ -1,15 +1,15 @@ /* SYNC-CLASSLOCK.hpp - special case of object based locking tied directly to a type - + Copyright (C) Lumiera.org 2008, Christian Thaeter Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -29,7 +29,7 @@ ** ** @note simply using the ClassLock may cause a Monitor object (with a mutex) to be ** created at static initialisation and destroyed on application shutdown. - ** @see singletonfactory.hpp usage example + ** @see singleton-factory.hpp usage example */ diff --git a/src/lib/sync.hpp b/src/lib/sync.hpp index 56d4c29af..c6ceafc40 100644 --- a/src/lib/sync.hpp +++ b/src/lib/sync.hpp @@ -1,15 +1,15 @@ /* SYNC.hpp - generic helper for object based locking and synchronisation - + Copyright (C) Lumiera.org 2008, Christian Thaeter Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/src/lib/test/mockinjector.hpp b/src/lib/test/mockinjector.hpp index 594ac2727..dbc47d3ed 100644 --- a/src/lib/test/mockinjector.hpp +++ b/src/lib/test/mockinjector.hpp @@ -1,23 +1,23 @@ /* MOCKINJECTOR.hpp - replacement singleton factory for injecting Test-Mock objects - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ @@ -26,7 +26,7 @@ #define LUMIERA_TEST_MOCKINJECTOR_H -#include "lib/singletonfactory.hpp" +#include "lib/singleton-factory.hpp" #include diff --git a/src/lib/test/run.hpp b/src/lib/test/run.hpp index ff61cf30c..b47a46e4c 100644 --- a/src/lib/test/run.hpp +++ b/src/lib/test/run.hpp @@ -1,24 +1,24 @@ /* RUN.hpp - helper class for grouping, registering and invoking testcases - + Copyright (C) Lumiera.org 2008, Christian Thaeter Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file run.hpp diff --git a/src/lib/test/suite.cpp b/src/lib/test/suite.cpp index cef0bda42..b109b755d 100644 --- a/src/lib/test/suite.cpp +++ b/src/lib/test/suite.cpp @@ -1,23 +1,23 @@ /* Suite - helper class for running collections of tests - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/lib/test/suite.hpp b/src/lib/test/suite.hpp index d640050f6..953642150 100644 --- a/src/lib/test/suite.hpp +++ b/src/lib/test/suite.hpp @@ -1,23 +1,23 @@ /* SUITE.hpp - helper class for running collections of tests - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file suite.hpp diff --git a/src/lib/test/test-coll.hpp b/src/lib/test/test-coll.hpp index 09578d5fb..907c19309 100644 --- a/src/lib/test/test-coll.hpp +++ b/src/lib/test/test-coll.hpp @@ -1,23 +1,23 @@ /* TEST-COLL.hpp - containers and collections with test data - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/test/test-helper.cpp b/src/lib/test/test-helper.cpp index 0c67ca7fd..8c8a7dda0 100644 --- a/src/lib/test/test-helper.cpp +++ b/src/lib/test/test-helper.cpp @@ -1,23 +1,23 @@ /* Test-Helper - collection of functions supporting unit testing - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/lib/test/test-helper.hpp b/src/lib/test/test-helper.hpp index 5ad305977..a115e3a1f 100644 --- a/src/lib/test/test-helper.hpp +++ b/src/lib/test/test-helper.hpp @@ -1,23 +1,23 @@ /* TEST-HELPER.hpp - collection of functions supporting unit testing - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/test/testoption.cpp b/src/lib/test/testoption.cpp index b0807ab63..3a84ee4f8 100644 --- a/src/lib/test/testoption.cpp +++ b/src/lib/test/testoption.cpp @@ -1,23 +1,23 @@ /* TestOption - handle cmdline for invoking Testsuite - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/lib/test/testoption.hpp b/src/lib/test/testoption.hpp index d9b31521a..efa9ea2cd 100644 --- a/src/lib/test/testoption.hpp +++ b/src/lib/test/testoption.hpp @@ -1,23 +1,23 @@ /* TESTOPTION.hpp - handle cmdline for invoking Testsuite - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/thread-local.hpp b/src/lib/thread-local.hpp index d0cdb06a4..cfb854ae8 100644 --- a/src/lib/thread-local.hpp +++ b/src/lib/thread-local.hpp @@ -1,14 +1,14 @@ /* THREAD-LOCAL.hpp - support using thread local data - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/src/lib/time.c b/src/lib/time.c index 9fcc15b4f..5af40d640 100644 --- a/src/lib/time.c +++ b/src/lib/time.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,12 +23,16 @@ #include "lib/time.h" #include "lib/tmpbuf.h" +/* GAVL_TIME_SCALE is the correct factor or dividend when using gavl_time_t for + * units of whole seconds from gavl_time_t. Since we want to use milliseconds, + * we need to multiply or divide by 1000 to get correct results. */ +#define GAVL_TIME_SCALE_MS (GAVL_TIME_SCALE / 1000) + char* lumiera_tmpbuf_print_time (gavl_time_t time) { int milliseconds, seconds, minutes, hours; int negative; - if(time < 0) { @@ -37,7 +41,7 @@ lumiera_tmpbuf_print_time (gavl_time_t time) } else negative = 0; - time /= GAVL_TIME_SCALE / 1000; + time /= GAVL_TIME_SCALE_MS; milliseconds = time % 1000; time /= 1000; seconds = time % 60; @@ -53,16 +57,37 @@ lumiera_tmpbuf_print_time (gavl_time_t time) return buffer; } - gavl_time_t -lumiera_build_time (long millis, uint secs, uint mins, uint hours) +lumiera_build_time(long millis, uint secs, uint mins, uint hours) { gavl_time_t time = millis + 1000 * secs + 1000 * 60 * mins + 1000 * 60 * 60 * hours; - time *= GAVL_TIME_SCALE / 1000; + time *= GAVL_TIME_SCALE_MS; return time; } +int +lumiera_time_hours(gavl_time_t time) +{ + return time / GAVL_TIME_SCALE_MS / 1000 / 60 / 60; +} +int +lumiera_time_minutes(gavl_time_t time) +{ + return (time / GAVL_TIME_SCALE_MS / 1000 / 60) % 60; +} + +int +lumiera_time_seconds(gavl_time_t time) +{ + return (time / GAVL_TIME_SCALE_MS / 1000) % 60; +} + +int +lumiera_time_millis(gavl_time_t time) +{ + return (time / GAVL_TIME_SCALE_MS) % 1000; +} diff --git a/src/lib/time.h b/src/lib/time.h index 5a6034a20..f812c1b9d 100644 --- a/src/lib/time.h +++ b/src/lib/time.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -34,12 +34,31 @@ char* lumiera_tmpbuf_print_time (gavl_time_t time); - /** * Builds a time value by summing up the given components. */ gavl_time_t lumiera_build_time (long millis, uint secs, uint mins, uint hours); +/** + * Get the hour part of given time. + */ +int lumiera_time_hours(gavl_time_t time); + +/** + * Get the minute part of given time. + */ +int lumiera_time_minutes(gavl_time_t time); + +/** + * Get the seconds part of given time. + */ +int lumiera_time_seconds(gavl_time_t time); + +/** + * Get the milliseconds part of given time. + */ +int lumiera_time_millis(gavl_time_t time); + #endif diff --git a/src/lib/tmpbuf.c b/src/lib/tmpbuf.c index 9ac442d2b..d2ef81a7c 100644 --- a/src/lib/tmpbuf.c +++ b/src/lib/tmpbuf.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/tmpbuf.h b/src/lib/tmpbuf.h index da1f0f09a..95fc62564 100644 --- a/src/lib/tmpbuf.h +++ b/src/lib/tmpbuf.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/typed-allocation-manager.hpp b/src/lib/typed-allocation-manager.hpp index 1a4887121..188f120dc 100644 --- a/src/lib/typed-allocation-manager.hpp +++ b/src/lib/typed-allocation-manager.hpp @@ -1,23 +1,23 @@ /* TYPED-ALLOCATION-MANAGER.hpp - abstract backbone to build custom memory managers - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/typed-counter.hpp b/src/lib/typed-counter.hpp index 8b7ca90a7..252faaab5 100644 --- a/src/lib/typed-counter.hpp +++ b/src/lib/typed-counter.hpp @@ -1,23 +1,23 @@ /* TYPED-COUNTER.hpp - maintain a set of type based contexts - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/util-foreach.hpp b/src/lib/util-foreach.hpp index bfb6f9514..9270c3a06 100644 --- a/src/lib/util-foreach.hpp +++ b/src/lib/util-foreach.hpp @@ -1,23 +1,23 @@ /* UTIL-FOREACH.hpp - helpers for doing something for each element - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/util.cpp b/src/lib/util.cpp index f5229fc86..b11c232fc 100644 --- a/src/lib/util.cpp +++ b/src/lib/util.cpp @@ -1,23 +1,23 @@ /* util.cpp - helper functions implementation - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/lib/util.hpp b/src/lib/util.hpp index 3d3abf038..1383e6244 100644 --- a/src/lib/util.hpp +++ b/src/lib/util.hpp @@ -1,23 +1,23 @@ /* UTIL.hpp - collection of small helper functions used "everywhere" - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/variant.hpp b/src/lib/variant.hpp index ebaac670a..7a964c5db 100644 --- a/src/lib/variant.hpp +++ b/src/lib/variant.hpp @@ -1,23 +1,23 @@ /* VARIANT.hpp - simple variant wrapper (typesafe union) - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/vcall.h b/src/lib/vcall.h index bcd3b5190..16bf81b2d 100644 --- a/src/lib/vcall.h +++ b/src/lib/vcall.h @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/lib/visitor-dispatcher.hpp b/src/lib/visitor-dispatcher.hpp index 26e99f9aa..35f566193 100644 --- a/src/lib/visitor-dispatcher.hpp +++ b/src/lib/visitor-dispatcher.hpp @@ -1,23 +1,23 @@ /* VISITOR-DISPATCHER.hpp - visitor implementation details - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/visitor-policies.hpp b/src/lib/visitor-policies.hpp index 63e6324cf..164b7d1b2 100644 --- a/src/lib/visitor-policies.hpp +++ b/src/lib/visitor-policies.hpp @@ -1,23 +1,23 @@ /* VISITOR-POLICIES.hpp - Acyclic Visitor library - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lib/visitor.hpp b/src/lib/visitor.hpp index a36ca00e1..b2a67e447 100644 --- a/src/lib/visitor.hpp +++ b/src/lib/visitor.hpp @@ -1,14 +1,14 @@ /* VISITOR.hpp - Generic Visitor library implementation - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/src/lib/wrapper.hpp b/src/lib/wrapper.hpp index d31a0983a..8a7761263 100644 --- a/src/lib/wrapper.hpp +++ b/src/lib/wrapper.hpp @@ -1,14 +1,14 @@ /* WRAPPER.hpp - some smart wrapping and reference managing helper templates - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/src/lib/wrapperptr.hpp b/src/lib/wrapperptr.hpp index ed4b43b82..1032045b0 100644 --- a/src/lib/wrapperptr.hpp +++ b/src/lib/wrapperptr.hpp @@ -1,23 +1,23 @@ /* WRAPPERPTR.hpp - variant record able to hold a pointer to some smart-ptr/wrapper types, providing conversions - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/lumiera/main.cpp b/src/lumiera/main.cpp index f5555e927..a1f73e53e 100644 --- a/src/lumiera/main.cpp +++ b/src/lumiera/main.cpp @@ -8,8 +8,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/pre.hpp b/src/pre.hpp index 6b12ea67f..1170769b9 100644 --- a/src/pre.hpp +++ b/src/pre.hpp @@ -1,25 +1,25 @@ /* PRE.hpp - precompiled header collection - + Copyright (C) Lumiera.org 2008, Christian Thaeter Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file pre.hpp diff --git a/src/pre_a.hpp b/src/pre_a.hpp index 1bac10969..153fbb01a 100644 --- a/src/pre_a.hpp +++ b/src/pre_a.hpp @@ -1,25 +1,25 @@ /* PRE_A.hpp - precompiled header (including assets) - + Copyright (C) Lumiera.org 2008, Christian Thaeter Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file pre.hpp diff --git a/src/proc/Makefile.am b/src/proc/Makefile.am index d2a185dbf..4d0cdc17f 100644 --- a/src/proc/Makefile.am +++ b/src/proc/Makefile.am @@ -109,7 +109,8 @@ liblumiprocmobjectbuilder_la_SOURCES = \ $(liblumiprocmobjectbuilder_la_srcdir)/assembler.cpp \ $(liblumiprocmobjectbuilder_la_srcdir)/conmanager.cpp \ $(liblumiprocmobjectbuilder_la_srcdir)/nodecreatortool.cpp \ - $(liblumiprocmobjectbuilder_la_srcdir)/segmentationtool.cpp \ + $(liblumiprocmobjectbuilder_la_srcdir)/segmentation.cpp \ + $(liblumiprocmobjectbuilder_la_srcdir)/segmentation-tool.cpp \ $(liblumiprocmobjectbuilder_la_srcdir)/toolfactory.cpp @@ -154,7 +155,7 @@ liblumiprocmobjectsession_la_SOURCES = \ $(liblumiprocmobjectsession_la_srcdir)/clip.cpp \ $(liblumiprocmobjectsession_la_srcdir)/compoundclip.cpp \ $(liblumiprocmobjectsession_la_srcdir)/constraint.cpp \ - $(liblumiprocmobjectsession_la_srcdir)/defsmanager.cpp \ + $(liblumiprocmobjectsession_la_srcdir)/defs-manager.cpp \ $(liblumiprocmobjectsession_la_srcdir)/effect.cpp \ $(liblumiprocmobjectsession_la_srcdir)/fixedlocation.cpp \ $(liblumiprocmobjectsession_la_srcdir)/fixture.cpp \ @@ -219,7 +220,8 @@ noinst_HEADERS += \ $(liblumiproc_la_srcdir)/mobject/builder/assembler.hpp \ $(liblumiproc_la_srcdir)/mobject/builder/buildertool.hpp \ $(liblumiproc_la_srcdir)/mobject/builder/conmanager.hpp \ - $(liblumiproc_la_srcdir)/mobject/builder/segmentationtool.hpp \ + $(liblumiproc_la_srcdir)/mobject/builder/segmentation.hpp \ + $(liblumiproc_la_srcdir)/mobject/builder/segmentation-tool.hpp \ $(liblumiproc_la_srcdir)/mobject/builder/toolfactory.hpp \ $(liblumiproc_la_srcdir)/mobject/builderfacade.hpp \ $(liblumiproc_la_srcdir)/mobject/explicitplacement.hpp \ @@ -235,8 +237,8 @@ noinst_HEADERS += \ $(liblumiproc_la_srcdir)/mobject/session/clip.hpp \ $(liblumiproc_la_srcdir)/mobject/session/compoundclip.hpp \ $(liblumiproc_la_srcdir)/mobject/session/constraint.hpp \ - $(liblumiproc_la_srcdir)/mobject/session/defsmanager.hpp \ - $(liblumiproc_la_srcdir)/mobject/session/defsregistry.hpp \ + $(liblumiproc_la_srcdir)/mobject/session/defs-manager.hpp \ + $(liblumiproc_la_srcdir)/mobject/session/defs-registry.hpp \ $(liblumiproc_la_srcdir)/mobject/session/effect.hpp \ $(liblumiproc_la_srcdir)/mobject/session/fixedlocation.hpp \ $(liblumiproc_la_srcdir)/mobject/session/fixture.hpp \ diff --git a/src/proc/asset.cpp b/src/proc/asset.cpp index 36a4d7c49..81e5ab5f9 100644 --- a/src/proc/asset.cpp +++ b/src/proc/asset.cpp @@ -1,23 +1,23 @@ /* Asset - Superinterface: bookkeeping view of "things" present in the session - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/asset.hpp b/src/proc/asset.hpp index def4a02ee..bef9463ac 100644 --- a/src/proc/asset.hpp +++ b/src/proc/asset.hpp @@ -1,23 +1,23 @@ /* ASSET.hpp - Superinterface: bookkeeping view of "things" present in the session - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file asset.hpp @@ -103,11 +103,13 @@ namespace asset { template class ID { + HashVal hash_; public: - const HashVal hash; - ID (HashVal id) : hash(id) {} - ID (const KIND& asset) : hash(asset.getID()) {} - operator HashVal() const { return hash; } + ID (HashVal id) : hash_(id) {} + ID (const KIND& asset) : hash_(asset.getID()) {} + operator HashVal() const { return hash_; } + + static ID INVALID; }; class DB; @@ -303,53 +305,59 @@ namespace asset { - /* ====== ordering of Assets and Asset-Pointers ====== */ - - /** ordering of Assets is based on the ordering - * of Ident tuples, which are supposed to be unique. - * By using our customised lumiera::P as smart ptr, - * comparison on P ptrs will be automatically - * forwarded to the Asset comparison operators. - * @note version info is irrelevant */ - inline int - Asset::Ident::compare (Asset::Ident const& oi) const - { - int res; - if (0 != (res=category.compare (oi.category))) return res; - if (0 != (res=org.compare (oi.org))) return res; - return name.compare (oi.name); - } - - - /** promote subtype-ptr to PAsset, e.g. for comparing */ - template - inline const PcAsset - pAsset (shared_ptr const& subPtr) - { - return static_pointer_cast (subPtr); - } - - - /** type trait for detecting a shared-ptr-to-asset */ - template - struct is_pAsset : boost::false_type {}; - - template - struct is_pAsset > - : boost::is_base_of {}; - - - /** convenient for debugging */ - inline string str (PcAsset const& a) - { - if (a) - return string (*a.get()); - else - return "Asset(NULL)"; - } - - - + /* ====== ordering of Assets and Asset-Pointers ====== */ + + /** ordering of Assets is based on the ordering + * of Ident tuples, which are supposed to be unique. + * By using our customised lumiera::P as smart ptr, + * comparison on P ptrs will be automatically + * forwarded to the Asset comparison operators. + * @note version info is irrelevant */ + inline int + Asset::Ident::compare (Asset::Ident const& oi) const + { + int res; + if (0 != (res=category.compare (oi.category))) return res; + if (0 != (res=org.compare (oi.org))) return res; + return name.compare (oi.name); + } + + + /** promote subtype-ptr to PAsset, e.g. for comparing */ + template + inline const PcAsset + pAsset (shared_ptr const& subPtr) + { + return static_pointer_cast (subPtr); + } + + + /** type trait for detecting a shared-ptr-to-asset */ + template + struct is_pAsset : boost::false_type {}; + + template + struct is_pAsset > + : boost::is_base_of {}; + + + /** marker constant denoting a NIL asset */ + template + ID ID::INVALID = ID(0); + + + /** convenient for debugging */ + inline string str (PcAsset const& a) + { + if (a) + return string (*a.get()); + else + return "Asset(NULL)"; + } + + + + } // namespace asset diff --git a/src/proc/asset/buildinstruct.hpp b/src/proc/asset/buildinstruct.hpp index 1b1129762..715e40954 100644 --- a/src/proc/asset/buildinstruct.hpp +++ b/src/proc/asset/buildinstruct.hpp @@ -1,23 +1,23 @@ /* BUILDINSTRUCT.hpp - Instructions for building some configuration of render nodes. - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/category.cpp b/src/proc/asset/category.cpp index e285bf011..8e98a68dd 100644 --- a/src/proc/asset/category.cpp +++ b/src/proc/asset/category.cpp @@ -1,23 +1,23 @@ /* Category - tree like classification of Assets - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/asset/category.hpp b/src/proc/asset/category.hpp index 71a24eac4..aa263ee7d 100644 --- a/src/proc/asset/category.hpp +++ b/src/proc/asset/category.hpp @@ -1,23 +1,23 @@ /* CATEGORY.hpp - tree like classification of Assets - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/clip.cpp b/src/proc/asset/clip.cpp index ebfb2fa8d..aa651de74 100644 --- a/src/proc/asset/clip.cpp +++ b/src/proc/asset/clip.cpp @@ -1,23 +1,23 @@ /* Clip(Asset) - bookkeeping (asset) view of a media clip. - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/asset/clip.hpp b/src/proc/asset/clip.hpp index 8534b32ba..d3b1a3aaa 100644 --- a/src/proc/asset/clip.hpp +++ b/src/proc/asset/clip.hpp @@ -1,23 +1,23 @@ /* CLIP.hpp - bookkeeping (asset) view of a media clip. - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/codec.cpp b/src/proc/asset/codec.cpp index e98608375..8810ea0da 100644 --- a/src/proc/asset/codec.cpp +++ b/src/proc/asset/codec.cpp @@ -1,23 +1,23 @@ /* Codec(Asset) - description of some media data decoder or encoder facility - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/asset/codec.hpp b/src/proc/asset/codec.hpp index e46fcf5dd..b7d7e5e34 100644 --- a/src/proc/asset/codec.hpp +++ b/src/proc/asset/codec.hpp @@ -1,23 +1,23 @@ /* CODEC.hpp - description of some media data decoder or encoder facility - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/compoundmedia.cpp b/src/proc/asset/compoundmedia.cpp index 1a00458b6..e77416247 100644 --- a/src/proc/asset/compoundmedia.cpp +++ b/src/proc/asset/compoundmedia.cpp @@ -1,23 +1,23 @@ /* CompoundMedia - multichannel media - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/asset/compoundmedia.hpp b/src/proc/asset/compoundmedia.hpp index 987632408..22fdb6922 100644 --- a/src/proc/asset/compoundmedia.hpp +++ b/src/proc/asset/compoundmedia.hpp @@ -1,23 +1,23 @@ /* COMPOUNDMEDIA.hpp - multichannel media - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/dataset.hpp b/src/proc/asset/dataset.hpp index 31fcb8982..e488302c2 100644 --- a/src/proc/asset/dataset.hpp +++ b/src/proc/asset/dataset.hpp @@ -1,23 +1,23 @@ /* DATASET.hpp - meta asset describing a collection of control data - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/db.hpp b/src/proc/asset/db.hpp index 1676c96da..b2d9b073f 100644 --- a/src/proc/asset/db.hpp +++ b/src/proc/asset/db.hpp @@ -1,23 +1,23 @@ /* DB.hpp - registry holding known Asset instances. - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/effect.cpp b/src/proc/asset/effect.cpp index cf795dc08..999b5c118 100644 --- a/src/proc/asset/effect.cpp +++ b/src/proc/asset/effect.cpp @@ -1,23 +1,23 @@ /* Effect(Asset) - Effect or media processing component - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/asset/effect.hpp b/src/proc/asset/effect.hpp index a9b470b17..e2e8c3fd4 100644 --- a/src/proc/asset/effect.hpp +++ b/src/proc/asset/effect.hpp @@ -1,23 +1,23 @@ /* EFFECT.hpp - Effect or media processing component - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/entry-id.hpp b/src/proc/asset/entry-id.hpp index 3f736892e..b7ff98cce 100644 --- a/src/proc/asset/entry-id.hpp +++ b/src/proc/asset/entry-id.hpp @@ -1,23 +1,23 @@ /* ENTRY-ID.hpp - plain symbolic and hash ID used for accounting - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ @@ -241,7 +241,7 @@ namespace asset { } friend ostream& operator<< (ostream& os, EntryID const& id) { return os << string(id); } - friend bool operator< (EntryID const& i1, EntryID const& i2) { return i1.getSym() < i2.getSym(); } + friend bool operator< (EntryID const& i1, EntryID const& i2) { return i1.getSym() < i2.getSym(); } }; diff --git a/src/proc/asset/inventory.hpp b/src/proc/asset/inventory.hpp index 7286f3324..2853e2697 100644 --- a/src/proc/asset/inventory.hpp +++ b/src/proc/asset/inventory.hpp @@ -1,23 +1,23 @@ /* INVENTORY.hpp - viewing an Typed-ID registration group as meta asset - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/media.cpp b/src/proc/asset/media.cpp index 4f3ffddc4..53cd1f1fd 100644 --- a/src/proc/asset/media.cpp +++ b/src/proc/asset/media.cpp @@ -1,23 +1,23 @@ /* Media(Asset) - key abstraction: media-like assets - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/asset/media.hpp b/src/proc/asset/media.hpp index ba6b10558..d3b2c9024 100644 --- a/src/proc/asset/media.hpp +++ b/src/proc/asset/media.hpp @@ -1,23 +1,23 @@ /* MEDIA.hpp - key abstraction: media-like assets - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/meta.cpp b/src/proc/asset/meta.cpp index ecb918ed1..795ea0e74 100644 --- a/src/proc/asset/meta.cpp +++ b/src/proc/asset/meta.cpp @@ -1,23 +1,23 @@ /* Meta(Asset) - key abstraction: metadata and organisational asset - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/asset/meta.hpp b/src/proc/asset/meta.hpp index 5a5ac592f..cd94b26e5 100644 --- a/src/proc/asset/meta.hpp +++ b/src/proc/asset/meta.hpp @@ -1,23 +1,23 @@ /* META.hpp - key abstraction: metadata and organisational asset - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/pipe.cpp b/src/proc/asset/pipe.cpp index 2188a8138..4a766cb36 100644 --- a/src/proc/asset/pipe.cpp +++ b/src/proc/asset/pipe.cpp @@ -1,23 +1,23 @@ /* Pipe - structural asset denoting a processing pipe to generate media output - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ @@ -38,7 +38,7 @@ namespace asset { * default wiring. */ Pipe::Pipe ( const Asset::Ident& idi - , string const& streamID + , string const& streamID ////////////////////////////////////////TICKET #648 , PProcPatt& wiring , string shortName , string longName diff --git a/src/proc/asset/pipe.hpp b/src/proc/asset/pipe.hpp index 922dec444..c60d310c4 100644 --- a/src/proc/asset/pipe.hpp +++ b/src/proc/asset/pipe.hpp @@ -1,23 +1,23 @@ /* PIPE.hpp - structural asset denoting a processing pipe generating media output - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ @@ -26,6 +26,7 @@ #include "proc/asset/struct.hpp" #include "proc/asset/procpatt.hpp" +#include "lib/streamtype.hpp" #include @@ -34,6 +35,7 @@ namespace asset { using lumiera::P; + using lumiera::StreamType; using std::string; class Pipe; @@ -45,7 +47,16 @@ namespace asset { { public: ID (HashVal id); - ID (const Pipe&); + ID (Pipe const&); + ID (PPipe const&); + + /** allows a Pipe-ID to stand in for a full Pipe Asset + * @throw error::Invalid when there is no corresponding Pipe */ + operator PPipe() const; + + /** allows to fetch the StreamType directly just from a Pipe-ID + * @throw error::Invalid when there is no corresponding Pipe */ + StreamType::ID streamType() const; }; @@ -59,7 +70,7 @@ namespace asset { : public Struct { PProcPatt wiringTemplate_; - const string streamID_; ///< @todo just a placeholder for now 10/10 + StreamType::ID streamID_; ////////////////////////////////////////TICKET #648 public: string shortDesc; @@ -78,7 +89,7 @@ namespace asset { public: string const& getPipeID() const { return ident.name; } - string const& getStreamID() const { return streamID_; } + StreamType::ID getStreamID() const { return streamID_; } ////////////////////////////////////////TICKET #648 PProcPatt const& getProcPatt() const { return wiringTemplate_; } @@ -95,9 +106,21 @@ namespace asset { // catch up with postponed definition of ID ctors... // - inline ID::ID(HashVal id) : ID (id) {}; - inline ID::ID(Pipe const& pipe) : ID (pipe.getID()) {}; + inline ID::ID(HashVal id) : ID (id) {}; + inline ID::ID(Pipe const& pipe) : ID (pipe.getID()) {}; + inline ID::ID(PPipe const& pipe) : ID (pipe->getID()) {}; + inline + ID::operator PPipe() const + { + return Pipe::lookup(*this); + } + + inline StreamType::ID + ID::streamType() const + { + return Pipe::lookup(*this)->getStreamID(); + } diff --git a/src/proc/asset/preview.cpp b/src/proc/asset/preview.cpp index f6aa426d6..d14d54a77 100644 --- a/src/proc/asset/preview.cpp +++ b/src/proc/asset/preview.cpp @@ -1,23 +1,23 @@ /* Preview(Asset) - alternative version of the media data, probably with lower resolution - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/asset/preview.hpp b/src/proc/asset/preview.hpp index 8aec81b5f..27bacd1b2 100644 --- a/src/proc/asset/preview.hpp +++ b/src/proc/asset/preview.hpp @@ -1,23 +1,23 @@ /* PREVIEW.hpp - alternative version of the media data, probably with lower resolution - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/proc.cpp b/src/proc/asset/proc.cpp index fe53bd336..8b6ecb178 100644 --- a/src/proc/asset/proc.cpp +++ b/src/proc/asset/proc.cpp @@ -1,23 +1,23 @@ /* Proc(Asset) - key abstraction: data-processing assets - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/asset/proc.hpp b/src/proc/asset/proc.hpp index 35618627b..cced6e638 100644 --- a/src/proc/asset/proc.hpp +++ b/src/proc/asset/proc.hpp @@ -1,23 +1,23 @@ /* PROC.hpp - key abstraction: data-processing assets - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/procpatt.cpp b/src/proc/asset/procpatt.cpp index 13d193c2c..8399f6ccb 100644 --- a/src/proc/asset/procpatt.cpp +++ b/src/proc/asset/procpatt.cpp @@ -1,23 +1,23 @@ /* ProcPatt - template for building some render processing network - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/asset/procpatt.hpp b/src/proc/asset/procpatt.hpp index bd9b025df..ff714617d 100644 --- a/src/proc/asset/procpatt.hpp +++ b/src/proc/asset/procpatt.hpp @@ -1,23 +1,23 @@ /* PROCPATT.hpp - template for building some render processing network - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/sequence.cpp b/src/proc/asset/sequence.cpp index 7d4f375e8..a84e2fd3b 100644 --- a/src/proc/asset/sequence.cpp +++ b/src/proc/asset/sequence.cpp @@ -1,23 +1,23 @@ /* Sequence - Compound of MObjects placed on a track tree. Building block of the Session - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/asset/sequence.hpp b/src/proc/asset/sequence.hpp index c1ce02704..91d851d59 100644 --- a/src/proc/asset/sequence.hpp +++ b/src/proc/asset/sequence.hpp @@ -1,23 +1,23 @@ /* SEQUENCE.hpp - Compound of MObjects placed on a track tree. Building block of the Session - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/struct-factory-impl.hpp b/src/proc/asset/struct-factory-impl.hpp index 93836e2b2..bfc702d18 100644 --- a/src/proc/asset/struct-factory-impl.hpp +++ b/src/proc/asset/struct-factory-impl.hpp @@ -1,23 +1,23 @@ /* STRUCT-FACTORY-IMPL.hpp - crating structural assets (impl details) - + Copyright (C) Lumiera.org 2008-2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/struct-scheme.hpp b/src/proc/asset/struct-scheme.hpp index c8e0d09a4..f39069101 100644 --- a/src/proc/asset/struct-scheme.hpp +++ b/src/proc/asset/struct-scheme.hpp @@ -1,23 +1,23 @@ /* STRUCT-SCHEME.hpp - naming and designation scheme for structural assets - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ @@ -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 + { + static Symbol namePrefix() { return "type"; } + static Symbol catFolder() { return "stream-types";} + static Symbol idSymbol() { return "stype"; } + }; template<> struct StructTraits { static Symbol namePrefix() { return "patt"; } diff --git a/src/proc/asset/struct.cpp b/src/proc/asset/struct.cpp index 9145c2ad8..1eeece4a9 100644 --- a/src/proc/asset/struct.cpp +++ b/src/proc/asset/struct.cpp @@ -1,23 +1,23 @@ /* Struct(Asset) - key abstraction: structural asset - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ @@ -148,7 +148,7 @@ namespace asset { normaliseID (pipeID); normaliseID (streamID); static format descriptor("pipe(%s), stream(%s)."); - Pipe* pP = impl_->fabricate (Query (descriptor % pipeID % streamID)); + Pipe* pP = impl_->fabricate (Query (str(descriptor % pipeID % streamID))); return AssetManager::instance().wrap (*pP); } diff --git a/src/proc/asset/struct.hpp b/src/proc/asset/struct.hpp index 9a9e84caa..bfd175fae 100644 --- a/src/proc/asset/struct.hpp +++ b/src/proc/asset/struct.hpp @@ -1,23 +1,23 @@ /* STRUCT.hpp - key abstraction: structural asset - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/timeline.cpp b/src/proc/asset/timeline.cpp index dbd663b3d..bb2f9e36e 100644 --- a/src/proc/asset/timeline.cpp +++ b/src/proc/asset/timeline.cpp @@ -1,23 +1,23 @@ /* Timeline - independent top-level element of the Session - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/asset/timeline.hpp b/src/proc/asset/timeline.hpp index 64fd4af32..7bf168e1e 100644 --- a/src/proc/asset/timeline.hpp +++ b/src/proc/asset/timeline.hpp @@ -1,23 +1,23 @@ /* TIMELINE.hpp - independent top-level element of the Session - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/typed-id.hpp b/src/proc/asset/typed-id.hpp index 0c9db1f12..a7edcc732 100644 --- a/src/proc/asset/typed-id.hpp +++ b/src/proc/asset/typed-id.hpp @@ -1,23 +1,23 @@ /* TYPED-ID.hpp - registration service for ID to type association - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/asset/typed-lookup.cpp b/src/proc/asset/typed-lookup.cpp index fdfeafd57..a7d9c3368 100644 --- a/src/proc/asset/typed-lookup.cpp +++ b/src/proc/asset/typed-lookup.cpp @@ -1,23 +1,23 @@ /* TypedLookup - implementing a registration service for ID to type association - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/asset/unknown.cpp b/src/proc/asset/unknown.cpp index 3fa2e4ae9..ca25adf74 100644 --- a/src/proc/asset/unknown.cpp +++ b/src/proc/asset/unknown.cpp @@ -1,23 +1,23 @@ /* Unknown - placeholder for unknown or unavailable media source - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/asset/unknown.hpp b/src/proc/asset/unknown.hpp index 0402f6bc7..fa3f5a291 100644 --- a/src/proc/asset/unknown.hpp +++ b/src/proc/asset/unknown.hpp @@ -1,23 +1,23 @@ /* UNKNOWN.hpp - placeholder for unknown or unavailable media source - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/assetmanager.cpp b/src/proc/assetmanager.cpp index ec7421b4a..0cf1a989c 100644 --- a/src/proc/assetmanager.cpp +++ b/src/proc/assetmanager.cpp @@ -1,23 +1,23 @@ /* AssetManager - Facade for the Asset subsystem - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/assetmanager.hpp b/src/proc/assetmanager.hpp index 51b7b416b..d5102eeb4 100644 --- a/src/proc/assetmanager.hpp +++ b/src/proc/assetmanager.hpp @@ -1,23 +1,23 @@ /* ASSETMANAGER.hpp - Facade for the Asset subsystem - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file assetmanager.hpp diff --git a/src/proc/common.hpp b/src/proc/common.hpp index 69cbce3e8..ebf5ca48f 100644 --- a/src/proc/common.hpp +++ b/src/proc/common.hpp @@ -1,25 +1,25 @@ /* COMMON.hpp - global definitions and common types for the Proc-Layer - + Copyright (C) Lumiera.org 2008, Christian Thaeter Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file common.hpp diff --git a/src/proc/control/argument-erasure.hpp b/src/proc/control/argument-erasure.hpp index c903605c9..1a9d15b60 100644 --- a/src/proc/control/argument-erasure.hpp +++ b/src/proc/control/argument-erasure.hpp @@ -1,23 +1,23 @@ /* ARGUMENT-ERASURE.hpp - helper for passing on a dynamic typed argument tuple - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/control/argument-tuple-accept.hpp b/src/proc/control/argument-tuple-accept.hpp index 189934b9f..5db90d0c8 100644 --- a/src/proc/control/argument-tuple-accept.hpp +++ b/src/proc/control/argument-tuple-accept.hpp @@ -1,23 +1,23 @@ /* ARGUMENT-TUPLE-ACCEPT.hpp - helper template providing a bind(...) member function - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/control/command-argument-holder.hpp b/src/proc/control/command-argument-holder.hpp index e4d4adfbe..e71a60a10 100644 --- a/src/proc/control/command-argument-holder.hpp +++ b/src/proc/control/command-argument-holder.hpp @@ -1,23 +1,23 @@ /* COMMAND-ARGUMENT-HOLDER.hpp - specifically typed container for storage of command arguments - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/control/command-closure.hpp b/src/proc/control/command-closure.hpp index be82e0649..90b29435c 100644 --- a/src/proc/control/command-closure.hpp +++ b/src/proc/control/command-closure.hpp @@ -1,23 +1,23 @@ /* COMMAND-CLOSURE.hpp - defining execution targets and parameters for commands - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/control/command-def.hpp b/src/proc/control/command-def.hpp index 058f06ce9..b3e777c4c 100644 --- a/src/proc/control/command-def.hpp +++ b/src/proc/control/command-def.hpp @@ -1,23 +1,23 @@ /* COMMAND-DEF.hpp - defining and binding a Proc-Layer command - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/control/command-impl-clone-builder.hpp b/src/proc/control/command-impl-clone-builder.hpp index 21848f2a8..cbc6ba378 100644 --- a/src/proc/control/command-impl-clone-builder.hpp +++ b/src/proc/control/command-impl-clone-builder.hpp @@ -1,23 +1,23 @@ /* COMMAND-IMPL-CLONE-BUILDER.hpp - Cloning command implementation without disclosing concrete type - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/control/command-impl.cpp b/src/proc/control/command-impl.cpp index b73573091..36406ced5 100644 --- a/src/proc/control/command-impl.cpp +++ b/src/proc/control/command-impl.cpp @@ -1,23 +1,23 @@ /* CommandImpl - Proc-Layer command implementation (top level) - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/control/command-impl.hpp b/src/proc/control/command-impl.hpp index f796c248a..7d3c18536 100644 --- a/src/proc/control/command-impl.hpp +++ b/src/proc/control/command-impl.hpp @@ -1,23 +1,23 @@ /* COMMAND-IMPL.hpp - Proc-Layer command implementation (top level) - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/control/command-invocation.hpp b/src/proc/control/command-invocation.hpp index 64cbbe44f..660814098 100644 --- a/src/proc/control/command-invocation.hpp +++ b/src/proc/control/command-invocation.hpp @@ -1,23 +1,23 @@ /* COMMAND-INVOCATION.hpp - shortcuts and helpers for calling Proc-Layer commands - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/control/command-mutation.hpp b/src/proc/control/command-mutation.hpp index 8152f093c..9a4f2d13d 100644 --- a/src/proc/control/command-mutation.hpp +++ b/src/proc/control/command-mutation.hpp @@ -1,23 +1,23 @@ /* COMMAND-MUTATION.hpp - functor encapsulating the actual operation of proc-Command - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/control/command-registry.hpp b/src/proc/control/command-registry.hpp index 4dbd225be..1a94ee13f 100644 --- a/src/proc/control/command-registry.hpp +++ b/src/proc/control/command-registry.hpp @@ -1,23 +1,23 @@ /* COMMAND-REGISTRY.hpp - proc-Command object registration and storage management - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/control/command-signature.hpp b/src/proc/control/command-signature.hpp index 150e3db0b..3c9df666f 100644 --- a/src/proc/control/command-signature.hpp +++ b/src/proc/control/command-signature.hpp @@ -1,23 +1,23 @@ /* COMMAND-SIGNATURE.hpp - deriving suitable command function signatures - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/control/command.cpp b/src/proc/control/command.cpp index 43906c704..291edfb7e 100644 --- a/src/proc/control/command.cpp +++ b/src/proc/control/command.cpp @@ -1,23 +1,23 @@ /* Command - Key abstraction for proc/edit operations and UNDO management - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/control/command.hpp b/src/proc/control/command.hpp index b23882863..86632febc 100644 --- a/src/proc/control/command.hpp +++ b/src/proc/control/command.hpp @@ -1,23 +1,23 @@ /* COMMAND.hpp - Key abstraction for proc/edit operations and UNDO management - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/control/handling-pattern.cpp b/src/proc/control/handling-pattern.cpp index b3d961418..b71cc6d4c 100644 --- a/src/proc/control/handling-pattern.cpp +++ b/src/proc/control/handling-pattern.cpp @@ -1,23 +1,23 @@ /* HandlingPattern - A skeleton for executing commands, including standard implementations - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/control/handling-pattern.hpp b/src/proc/control/handling-pattern.hpp index d4b4ae946..f414e25a1 100644 --- a/src/proc/control/handling-pattern.hpp +++ b/src/proc/control/handling-pattern.hpp @@ -1,23 +1,23 @@ /* HANDLILNG-PATTERN.hpp - A skeleton for executing commands, including standard implementations - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/control/handling-patterns.hpp b/src/proc/control/handling-patterns.hpp index d01ad6236..19d3d7d5f 100644 --- a/src/proc/control/handling-patterns.hpp +++ b/src/proc/control/handling-patterns.hpp @@ -1,23 +1,23 @@ /* HANDLILNG-PATTERNS.hpp - Collection of predefined command handling patterns - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/control/mediaimpllib.hpp b/src/proc/control/mediaimpllib.hpp index 6150c3f4e..0afa07b8a 100644 --- a/src/proc/control/mediaimpllib.hpp +++ b/src/proc/control/mediaimpllib.hpp @@ -1,23 +1,23 @@ /* MEDIAIMPLLIB.hpp - interface providing a facade to an media handling library - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/control/memento-tie.hpp b/src/proc/control/memento-tie.hpp index 3c78b99f7..af63d38d1 100644 --- a/src/proc/control/memento-tie.hpp +++ b/src/proc/control/memento-tie.hpp @@ -1,23 +1,23 @@ /* MEMENTO-TIE.hpp - capturing and providing state for undoing commands - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/control/pathmanager.cpp b/src/proc/control/pathmanager.cpp index 6c2288a28..0e3375083 100644 --- a/src/proc/control/pathmanager.cpp +++ b/src/proc/control/pathmanager.cpp @@ -1,23 +1,23 @@ /* PathManager - Manager for deciding the actual render strategy - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/control/pathmanager.hpp b/src/proc/control/pathmanager.hpp index c3057944f..63ea761c2 100644 --- a/src/proc/control/pathmanager.hpp +++ b/src/proc/control/pathmanager.hpp @@ -1,23 +1,23 @@ /* PATHMANAGER.hpp - Manager for deciding the actual render strategy - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/control/proc-dispatcher.cpp b/src/proc/control/proc-dispatcher.cpp index 2fcb6e251..b7bb53fc4 100644 --- a/src/proc/control/proc-dispatcher.cpp +++ b/src/proc/control/proc-dispatcher.cpp @@ -1,23 +1,23 @@ /* ProcDispatcher - Proc-Layer command dispatch and execution - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/control/proc-dispatcher.hpp b/src/proc/control/proc-dispatcher.hpp index d15021523..a4161aa42 100644 --- a/src/proc/control/proc-dispatcher.hpp +++ b/src/proc/control/proc-dispatcher.hpp @@ -1,23 +1,23 @@ /* PROC-DISPATCHER.hpp - Proc-Layer command dispatch and execution - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/control/stypemanager.cpp b/src/proc/control/stypemanager.cpp index 10131f130..8c4d50672 100644 --- a/src/proc/control/stypemanager.cpp +++ b/src/proc/control/stypemanager.cpp @@ -1,23 +1,23 @@ /* STypeManager - entry point for dealing with media stream types - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ @@ -79,6 +79,14 @@ namespace control { } + /** */ + StreamType const& + STypeManager::getType (StreamType::ID stID) + { + UNIMPLEMENTED ("get type just by symbolic ID (query defaults manager)"); + } + + StreamType const& STypeManager::getType (StreamType::Prototype const& protoType) { diff --git a/src/proc/control/stypemanager.hpp b/src/proc/control/stypemanager.hpp index 70003eef4..0f40408cc 100644 --- a/src/proc/control/stypemanager.hpp +++ b/src/proc/control/stypemanager.hpp @@ -1,23 +1,23 @@ /* STYPEMANAGER.hpp - entry point for dealing with media stream types - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ @@ -53,6 +53,8 @@ namespace control { * just a symbolic ID. Effectively this queries a default */ StreamType const& getType (Symbol sTypeID) ; + StreamType const& getType (StreamType::ID stID) ; + /** build or retrieve a complete StreamType implementing the given Prototype */ StreamType const& getType (StreamType::Prototype const& protoType) ; diff --git a/src/proc/control/styperegistry.hpp b/src/proc/control/styperegistry.hpp index 5979582d2..a5593f9c7 100644 --- a/src/proc/control/styperegistry.hpp +++ b/src/proc/control/styperegistry.hpp @@ -1,29 +1,29 @@ /* STYPEREGISTRY.hpp - implementation of the registry for stream type descriptors - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @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/src/proc/controllerfacade.cpp b/src/proc/controllerfacade.cpp index cff9e43d0..737f85589 100644 --- a/src/proc/controllerfacade.cpp +++ b/src/proc/controllerfacade.cpp @@ -1,23 +1,23 @@ /* ControllerFacade - Facade and service access point for the Proc Layer Controller - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/controllerfacade.hpp b/src/proc/controllerfacade.hpp index faa213e9b..e7f2c95c2 100644 --- a/src/proc/controllerfacade.hpp +++ b/src/proc/controllerfacade.hpp @@ -1,23 +1,23 @@ /* CONTROLLERFACADE.hpp - Facade and service access point for the Proc Layer Controller - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/engine/buffhandle.cpp b/src/proc/engine/buffhandle.cpp index 30ae603e2..24573990e 100644 --- a/src/proc/engine/buffhandle.cpp +++ b/src/proc/engine/buffhandle.cpp @@ -1,23 +1,23 @@ /* BuffHandle - Buffer handling support for the render engine - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/engine/buffhandle.hpp b/src/proc/engine/buffhandle.hpp index cdf1135e6..6cdca586c 100644 --- a/src/proc/engine/buffhandle.hpp +++ b/src/proc/engine/buffhandle.hpp @@ -1,23 +1,23 @@ /* BUFFHANDLE.hpp - Buffer handling support for the render engine - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file buffhandle.hpp diff --git a/src/proc/engine/bufftable.hpp b/src/proc/engine/bufftable.hpp index 7ec679f72..3682b51ff 100644 --- a/src/proc/engine/bufftable.hpp +++ b/src/proc/engine/bufftable.hpp @@ -1,23 +1,23 @@ /* BUFFTABLE.hpp - Table of buffer pointers to be used by the render nodes - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/engine/link.cpp b/src/proc/engine/link.cpp index aac01ed41..e3e9096c6 100644 --- a/src/proc/engine/link.cpp +++ b/src/proc/engine/link.cpp @@ -1,23 +1,23 @@ /* Link - forwarding, adapting or connecting ProcNode - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/engine/link.hpp b/src/proc/engine/link.hpp index d677fca9c..ac3f70f01 100644 --- a/src/proc/engine/link.hpp +++ b/src/proc/engine/link.hpp @@ -1,23 +1,23 @@ /* LINK.hpp - forwarding, adapting or connecting ProcNode - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/engine/mask.cpp b/src/proc/engine/mask.cpp index beecb86d3..e742a9a91 100644 --- a/src/proc/engine/mask.cpp +++ b/src/proc/engine/mask.cpp @@ -1,23 +1,23 @@ /* Mask - Video ProcNode for masking regions of the image (automatable) - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/engine/mask.hpp b/src/proc/engine/mask.hpp index ccbac5bcf..d2973550f 100644 --- a/src/proc/engine/mask.hpp +++ b/src/proc/engine/mask.hpp @@ -1,23 +1,23 @@ /* MASK.hpp - Video ProcNode for masking regions of the image (automatable) - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/engine/nodefactory.cpp b/src/proc/engine/nodefactory.cpp index d8dbfa01d..eb3ec1913 100644 --- a/src/proc/engine/nodefactory.cpp +++ b/src/proc/engine/nodefactory.cpp @@ -1,29 +1,29 @@ /* NodeFactory - Interface for creating processing nodes of various kinds - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "proc/engine/nodefactory.hpp" #include "proc/mobject/session/effect.hpp" -#include "lib/allocationcluster.hpp" +#include "lib/allocation-cluster.hpp" #include "proc/engine/nodewiring.hpp" diff --git a/src/proc/engine/nodefactory.hpp b/src/proc/engine/nodefactory.hpp index 4c3d9e679..49f605ca4 100644 --- a/src/proc/engine/nodefactory.hpp +++ b/src/proc/engine/nodefactory.hpp @@ -1,23 +1,23 @@ /* NODEFACTORY.hpp - Interface for creating processing nodes of various kinds - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/engine/nodeinvocation.hpp b/src/proc/engine/nodeinvocation.hpp index 1d57280f4..dd9b17ea4 100644 --- a/src/proc/engine/nodeinvocation.hpp +++ b/src/proc/engine/nodeinvocation.hpp @@ -1,23 +1,23 @@ /* NODEINVOCATION.hpp - Organise the invocation state within a single pull() call - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file nodeinvocation.hpp diff --git a/src/proc/engine/nodeoperation.hpp b/src/proc/engine/nodeoperation.hpp index cc8a29137..ce587862b 100644 --- a/src/proc/engine/nodeoperation.hpp +++ b/src/proc/engine/nodeoperation.hpp @@ -1,23 +1,23 @@ /* NODEOPERATION.hpp - Specify how the nodes call each other and how processing is organized - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file nodeoperation.hpp diff --git a/src/proc/engine/nodewiring-config.hpp b/src/proc/engine/nodewiring-config.hpp index 6271199fd..62ce24abc 100644 --- a/src/proc/engine/nodewiring-config.hpp +++ b/src/proc/engine/nodewiring-config.hpp @@ -1,23 +1,23 @@ /* NODEWIRING-CONFIG.hpp - Helper for representing and selecting the wiring case - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file nodewiring-config.hpp diff --git a/src/proc/engine/nodewiring-def.hpp b/src/proc/engine/nodewiring-def.hpp index 496195de1..ef0173820 100644 --- a/src/proc/engine/nodewiring-def.hpp +++ b/src/proc/engine/nodewiring-def.hpp @@ -1,23 +1,23 @@ /* NODEWIRING-DEF.hpp - Implementation of the node network and operation control - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file nodewiring-def.hpp diff --git a/src/proc/engine/nodewiring.cpp b/src/proc/engine/nodewiring.cpp index f59d620db..f1e989816 100644 --- a/src/proc/engine/nodewiring.cpp +++ b/src/proc/engine/nodewiring.cpp @@ -1,23 +1,23 @@ /* NodeWiring - Implementation of the node network and operation control - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/engine/nodewiring.hpp b/src/proc/engine/nodewiring.hpp index 7d2882d45..9f263ab06 100644 --- a/src/proc/engine/nodewiring.hpp +++ b/src/proc/engine/nodewiring.hpp @@ -1,23 +1,23 @@ /* NODEWIRING.hpp - Implementation of the node network and operation control - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ @@ -26,7 +26,7 @@ #include "proc/engine/procnode.hpp" -#include "lib/allocationcluster.hpp" +#include "lib/allocation-cluster.hpp" #include "proc/engine/nodewiring-def.hpp" //#include diff --git a/src/proc/engine/pluginadapter.cpp b/src/proc/engine/pluginadapter.cpp index fb57ae58a..7d6a16031 100644 --- a/src/proc/engine/pluginadapter.cpp +++ b/src/proc/engine/pluginadapter.cpp @@ -1,23 +1,23 @@ /* PluginAdapter - Adapter for integrating various Effect processors in the render pipeline - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/engine/pluginadapter.hpp b/src/proc/engine/pluginadapter.hpp index b771f1fbc..25dabab66 100644 --- a/src/proc/engine/pluginadapter.hpp +++ b/src/proc/engine/pluginadapter.hpp @@ -1,23 +1,23 @@ /* PLUGINADAPTER.hpp - Adapter for integrating various Effect processors in the render pipeline - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/engine/procnode.hpp b/src/proc/engine/procnode.hpp index 536085832..757524914 100644 --- a/src/proc/engine/procnode.hpp +++ b/src/proc/engine/procnode.hpp @@ -1,23 +1,23 @@ /* PROCNODE.hpp - Key abstraction of the Render Engine: a Processing Node - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file procnode.hpp diff --git a/src/proc/engine/projector.cpp b/src/proc/engine/projector.cpp index 14fcecabb..3b75702ed 100644 --- a/src/proc/engine/projector.cpp +++ b/src/proc/engine/projector.cpp @@ -1,23 +1,23 @@ /* Projector - video ProcNode for scaling and translating image data - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/engine/projector.hpp b/src/proc/engine/projector.hpp index 4e03c4cc2..b93552e4d 100644 --- a/src/proc/engine/projector.hpp +++ b/src/proc/engine/projector.hpp @@ -1,23 +1,23 @@ /* PROJECTOR.hpp - video ProcNode for scaling and translating image data - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/engine/render-invocation.cpp b/src/proc/engine/render-invocation.cpp index abd0ce338..90c9bf147 100644 --- a/src/proc/engine/render-invocation.cpp +++ b/src/proc/engine/render-invocation.cpp @@ -1,23 +1,23 @@ /* RenderInvocation - Interface for creating processing nodes of various kinds - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/engine/render-invocation.hpp b/src/proc/engine/render-invocation.hpp index 2138169cf..459eb3f93 100644 --- a/src/proc/engine/render-invocation.hpp +++ b/src/proc/engine/render-invocation.hpp @@ -1,23 +1,23 @@ /* RENDER-INVOCATION.hpp - initiate the rendering of a single frame - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file render-invocation.hpp diff --git a/src/proc/engine/renderengine.cpp b/src/proc/engine/renderengine.cpp index 25eb6257d..588d1276b 100644 --- a/src/proc/engine/renderengine.cpp +++ b/src/proc/engine/renderengine.cpp @@ -1,33 +1,33 @@ /* RenderEngine - a complete network of processing nodes usable for rendering - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "proc/engine/renderengine.hpp" namespace engine { - - + + /** */ - - - + + + } // namespace engine diff --git a/src/proc/engine/renderengine.hpp b/src/proc/engine/renderengine.hpp index 1c361c739..c3030271f 100644 --- a/src/proc/engine/renderengine.hpp +++ b/src/proc/engine/renderengine.hpp @@ -1,23 +1,23 @@ /* RENDERENGINE.hpp - a complete network of processing nodes usable for rendering - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ @@ -32,19 +32,26 @@ using std::list; -namespace engine - { - - +namespace engine { + + + /** + * @todo this is planned to become the frontend + * to the render node network, which can be considered + * at the lower end of the middle layer; the actual + * render operations are mostly implemented by the backend + * ////////TODO WIP as of 12/2010 + */ class RenderEngine : public RenderGraph { public: ///// TODO: find out about the public operations - // note: the play controller lives in the backend - + // note: the play controller lives in the proc-layer, + // but is a subsystem separate of the sesison. + private: list renderSegments; - + }; } // namespace engine diff --git a/src/proc/engine/rendergraph.cpp b/src/proc/engine/rendergraph.cpp index c2ab6e332..fefaf7c63 100644 --- a/src/proc/engine/rendergraph.cpp +++ b/src/proc/engine/rendergraph.cpp @@ -1,23 +1,23 @@ /* RenderGraph - render network corresponding to one segment of the timeline - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ @@ -26,17 +26,17 @@ #include "proc/state.hpp" namespace lumiera { - + /** storage for the unique node-ID counter */ ulong NodeID::currID (0); } namespace engine { - + /** */ - - - - + + + + } // namespace engine diff --git a/src/proc/engine/rendergraph.hpp b/src/proc/engine/rendergraph.hpp index 6fdb28217..718d3dfdb 100644 --- a/src/proc/engine/rendergraph.hpp +++ b/src/proc/engine/rendergraph.hpp @@ -1,23 +1,23 @@ /* RENDERGRAPH.hpp - render network corresponding to one segment of the timeline - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ @@ -29,25 +29,27 @@ -namespace engine - { - +namespace engine { + class ExitNode; - + + /** + * @todo likely to be reworked into the engine backbone /////////////TODO WIP as of 12/2010 + */ class RenderGraph { protected: ExitNode * output; - + /** begin of the timerange covered by this RenderGraph */ lumiera::Time start; - + /**end (exclusive) of the timerange */ lumiera::Time end; - + }; - - - + + + } // namespace engine #endif diff --git a/src/proc/engine/source.cpp b/src/proc/engine/source.cpp index 73da9add5..68cad7a62 100644 --- a/src/proc/engine/source.cpp +++ b/src/proc/engine/source.cpp @@ -1,23 +1,23 @@ /* Source - Representation of a Media source - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/engine/source.hpp b/src/proc/engine/source.hpp index 3573f3e0b..8587c3d67 100644 --- a/src/proc/engine/source.hpp +++ b/src/proc/engine/source.hpp @@ -1,23 +1,23 @@ /* SOURCE.hpp - Representation of a Media source - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/engine/stateproxy.cpp b/src/proc/engine/stateproxy.cpp index c8a07a429..cb32f3b57 100644 --- a/src/proc/engine/stateproxy.cpp +++ b/src/proc/engine/stateproxy.cpp @@ -1,23 +1,23 @@ /* StateProxy - Encapsulation of the state corresponding to a render calculation - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/engine/stateproxy.hpp b/src/proc/engine/stateproxy.hpp index 50e961ca1..7125790f7 100644 --- a/src/proc/engine/stateproxy.hpp +++ b/src/proc/engine/stateproxy.hpp @@ -1,23 +1,23 @@ /* STATEPROXY.hpp - Encapsulation of the state corresponding to a render calculation - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/engine/trafo.cpp b/src/proc/engine/trafo.cpp index 28c3db772..636e59e4e 100644 --- a/src/proc/engine/trafo.cpp +++ b/src/proc/engine/trafo.cpp @@ -1,23 +1,23 @@ /* Trafo - transforming processing Node - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/engine/trafo.hpp b/src/proc/engine/trafo.hpp index 166154674..cb1933619 100644 --- a/src/proc/engine/trafo.hpp +++ b/src/proc/engine/trafo.hpp @@ -1,23 +1,23 @@ /* TRAFO.hpp - transforming processing Node - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/facade.cpp b/src/proc/facade.cpp index 3c7d6f93b..6b44fbd36 100644 --- a/src/proc/facade.cpp +++ b/src/proc/facade.cpp @@ -1,23 +1,23 @@ /* Facade - access point for communicating with the Proc-Interface - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/facade.hpp b/src/proc/facade.hpp index b231359f3..88ac62e56 100644 --- a/src/proc/facade.hpp +++ b/src/proc/facade.hpp @@ -1,23 +1,23 @@ /* FACADE.hpp - access point for communicating with the Proc-Interface - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/builder/applicable-builder-target-types.hpp b/src/proc/mobject/builder/applicable-builder-target-types.hpp index 0f0a4d848..57c2e66f9 100644 --- a/src/proc/mobject/builder/applicable-builder-target-types.hpp +++ b/src/proc/mobject/builder/applicable-builder-target-types.hpp @@ -1,23 +1,23 @@ /* ApplicableBuilderTargetTypes - definition header specifying all types treated by builder tools - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file applicable-builder-target-types.hpp diff --git a/src/proc/mobject/builder/assembler.cpp b/src/proc/mobject/builder/assembler.cpp index 8542860f3..b4d05bb07 100644 --- a/src/proc/mobject/builder/assembler.cpp +++ b/src/proc/mobject/builder/assembler.cpp @@ -1,23 +1,23 @@ /* Assembler - building facility (implementation of the build process) - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/builder/assembler.hpp b/src/proc/mobject/builder/assembler.hpp index f0274f171..f874b99bd 100644 --- a/src/proc/mobject/builder/assembler.hpp +++ b/src/proc/mobject/builder/assembler.hpp @@ -1,23 +1,23 @@ /* ASSEMBLER.hpp - building facility (implementation of the build process) - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/builder/buildertool.hpp b/src/proc/mobject/builder/buildertool.hpp index 93086ac4c..9d51361d4 100644 --- a/src/proc/mobject/builder/buildertool.hpp +++ b/src/proc/mobject/builder/buildertool.hpp @@ -1,23 +1,23 @@ /* BUILDERTOOL.hpp - Interface, (visiting) tool for processing MObjects - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file buildertool.hpp @@ -62,7 +62,7 @@ namespace mobject { - + class Buildable; namespace builder { @@ -105,7 +105,7 @@ namespace mobject { * as we simply store a pointer within the BuilderTool instance. */ class BuilderTool - : public lumiera::visitor::Tool + : public lumiera::visitor::Tool { lumiera::WrapperPtr currentWrapper_; @@ -172,7 +172,9 @@ namespace mobject { using lumiera::typelist::Types; // convenience for the users of "Applicable" - } // namespace mobject::builder + }// namespace mobject::builder + + @@ -185,8 +187,15 @@ namespace mobject { - namespace builder { // to be found by ADL + namespace builder { + /** to be picked up by ADL: redirect tool invocation for double dispatch. + * The purpose of this function is to apply a visitor, while the actual target + * is managed by a generic wrapper (smart-ptr). This template function serves + * to generate forwarding functions, which pass on the \c apply() call to the + * actual embedded target, while passing on the fully wrapped object for later + * referral and usage too. + */ template inline Buildable::ReturnType apply (BuilderTool& tool, WRA& wrappedTargetObj) @@ -195,8 +204,7 @@ namespace mobject { wrappedTargetObj->apply (tool); // dispatch to suitable treat() function tool.forgetWrapper(); } - - } // namespace mobject::builder -} // namespace mobject + +}} // namespace mobject::builder #endif diff --git a/src/proc/mobject/builder/common.hpp b/src/proc/mobject/builder/common.hpp index e0503499b..ba09ec9ca 100644 --- a/src/proc/mobject/builder/common.hpp +++ b/src/proc/mobject/builder/common.hpp @@ -1,48 +1,37 @@ /* COMMON.hpp - common definitions for the Builder subsystem - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ #ifndef MOBJECT_BUILDER_COMMON_H #define MOBJECT_BUILDER_COMMON_H +#include "lib/error.hpp" #include "include/logging.h" namespace mobject { - namespace builder { +namespace builder { - // TODO NOBUG_DECLARE_FLAG (builder_mem); - - } // namespace builder - -} // namespace mobject +}} // namespace mobject::builder #endif - -/* -// Local Variables: -// mode: C -// c-file-style: "gnu" -// indent-tabs-mode: nil -// End: -*/ diff --git a/src/proc/mobject/builder/conmanager.cpp b/src/proc/mobject/builder/conmanager.cpp index 14e20a788..b13c19b67 100644 --- a/src/proc/mobject/builder/conmanager.cpp +++ b/src/proc/mobject/builder/conmanager.cpp @@ -1,23 +1,23 @@ /* ConManager - manages the creation of data/control connections when building the Renderengine - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/builder/conmanager.hpp b/src/proc/mobject/builder/conmanager.hpp index c992cbf59..db699d868 100644 --- a/src/proc/mobject/builder/conmanager.hpp +++ b/src/proc/mobject/builder/conmanager.hpp @@ -1,23 +1,23 @@ /* CONMANAGER.hpp - manages the creation of data/control connections when building the Renderengine - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/builder/fixture-change-detector.hpp b/src/proc/mobject/builder/fixture-change-detector.hpp new file mode 100644 index 000000000..bf836d7d1 --- /dev/null +++ b/src/proc/mobject/builder/fixture-change-detector.hpp @@ -0,0 +1,81 @@ +/* + FIXTURE-CHANGE-DETECTOR.hpp - isolating changed segments and tainted processes + + Copyright (C) Lumiera.org + 2010, Hermann Vosseler + + 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 Software Foundation; either version 2 of + the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +/** @file fixture-change-detector.hpp + ** Work out the part of the Fixture changed by a build process. + ** This facility helps to deal with ongoing render/playback processes, which might be + ** affected by the results of a build process. It's comprised of two distinct parts: + ** - a comparison tool allowing to spot equal and changed segments when considering + ** the old and the new version of the fixture before/after a build process. + ** - a registration service to establish a relation between play/render processes + ** and specific segments of the fixture. + ** Together, these allow to identify those ongoing processes which need to be cancelled + ** or restarted, because their results might be tainted by the changes induced by the + ** build process. Typically, these detection process runs just before commiting the + ** newly built fixture datastructure. + ** + ** @todo WIP-WIP-WIP as of 12/2010 + ** + ** @see Fixture + ** @see ModelPort + */ + + +#ifndef PROC_MOBJECT_BUILDER_FIXTURE_CHANGE_DETECTOR_H +#define PROC_MOBJECT_BUILDER_FIXTURE_CHANGE_DETECTOR_H + +#include "lib/error.hpp" +//#include "lib/optional-ref.hpp" +#include "proc/asset/pipe.hpp" +//#include "proc/asset/struct.hpp" +//#include "proc/mobject/model-port.hpp" + +//#include + +namespace mobject { +namespace builder { + + using asset::ID; + using asset::Pipe; +//using asset::Struct; + +//LUMIERA_ERROR_DECLARE (DUPLICATE_MODEL_PORT); ///< Attempt to define a new model port with an pipe-ID already denoting an existing port + + + /** + * TODO type comment + */ + class FixtureChangeDetector + : boost::noncopyable + { + + typedef ID PID; +// typedef ID StID; + + public: + + }; + + + +}} // namespace mobject::builder +#endif diff --git a/src/proc/mobject/builder/model-port-registry.cpp b/src/proc/mobject/builder/model-port-registry.cpp new file mode 100644 index 000000000..c3c16d7eb --- /dev/null +++ b/src/proc/mobject/builder/model-port-registry.cpp @@ -0,0 +1,302 @@ +/* + ModelPortRegistry - creating and organising and accessing model ports + + Copyright (C) Lumiera.org + 2010, Hermann Vosseler + + 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 Software Foundation; either version 2 of + the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +* *****************************************************/ + + +/** @file model-port-registry.cpp + ** Implementation details of model port descriptors and references. + ** Essentially the handling of the ModelPortRegistry datastructure is + ** kept an opaque implementation detail and confined entirely within + ** this translation unit. Both the client interface (ModelPort) and + ** the management interface (ModelPortRegistry) are backed by this + ** common translation unit. + ** + ** @see OutputDesignation + ** @see OutputMapping + ** @see Timeline + ** + */ + + +#include "lib/error.hpp" +#include "include/logging.h" +#include "lib/sync-classlock.hpp" +#include "proc/mobject/builderfacade.hpp" +#include "proc/mobject/model-port.hpp" +#include "proc/mobject/builder/model-port-registry.hpp" + +namespace mobject { + namespace builder { + + namespace error = lumiera::error; + + + typedef ModelPortRegistry::ModelPortDescriptor const& MPDescriptor; + typedef lib::ClassLock LockRegistry; + + + /** storage for the link to the global + Registry instance currently in charge */ + lib::OptionalRef ModelPortRegistry::theGlobalRegistry; + + + + /** globally deactivate access to model ports */ + void + ModelPortRegistry::shutdown () + { + INFO (builder, "disabling ModelPort registry...."); + LockRegistry global_lock; + theGlobalRegistry.clear(); + } + + + /** switch the implicit link to \em the global ModelPort registry + * to point to the given implementation instance. Typically used + * within the Builder subsystem lifecycle methods, or for + * temporarily exchanging the registry for unit tests + * @return the registry instance previously in use or \c NULL + */ + ModelPortRegistry* + ModelPortRegistry::setActiveInstance (ModelPortRegistry& newRegistry) + { + LockRegistry global_lock; + ModelPortRegistry *previous = theGlobalRegistry.isValid()? + &( theGlobalRegistry()) : 0; + INFO_IF (!previous, builder, "activating new ModelPort registry."); + WARN_IF ( previous, builder, "switching ModelPort registry instance."); + theGlobalRegistry.link_to (newRegistry); + return previous; + } + + + /** access the globally valid registry instance. + * @throw error::State if this global registry is + * already closed or not yet initialised. */ + ModelPortRegistry& + ModelPortRegistry::globalInstance() + { + LockRegistry global_lock; + if (theGlobalRegistry.isValid()) + return theGlobalRegistry(); + + throw error::State ("global model port registry is not accessible" + , LUMIERA_ERROR_BUILDER_LIFECYCLE); + } + + + + /** does the transaction currently being built + * already contain a model port registration for the given ID? + * @note this does \em not query registration state of the + * global registry; use #isRegistered for that...*/ + bool + ModelPortRegistry::contains (ID key) const + { + return bool(key) + && util::contains (transaction_, key); + } + + + /** @return true if the given pipe-ID actually denotes an + * existing, connected and usable model port. + * @note reflects the state of the publicly visible + * model port registry, \em not any model ports + * being registered within a pending transaction + * (ongoing build process). */ + bool + ModelPortRegistry::isRegistered (ID key) const + { + return bool(key) + && util::contains (currentReg_, key); + } + + + /** basic access operation: access the descriptor + * of a currently valid model port. + * @note no locking (but #accessDescriptor does lock!) + * @throw error::Logic if accessing a non registered port + * @throw error::State if accessing an invalid / disconnected port + */ + MPDescriptor + ModelPortRegistry::get (ID key) const + { + if (!key) + throw error::State ("This model port is disconnected or NIL" + , LUMIERA_ERROR_UNCONNECTED_MODEL_PORT); + if (!isRegistered (key)) + throw error::Logic ("Model port was never registered, or got unregistered meanwhile." + ,LUMIERA_ERROR_INVALID_MODEL_PORT); + + MPTable::const_iterator pos = currentReg_.find (key); + ASSERT (pos != currentReg_.end()); + ASSERT (pos->second.isValid()); + return pos->second; + } + + + /** access \em the globally valid model port for the given pipe. + * This (static) function locks and accesses the global model port registry + * to fetch the descriptor record. Typically invoked by client code + * through the ModelPort frontend + * @throw error::State when registry is down or the model port is disconnected + * @throw error::Logic when the given key wasn't registered for a model port */ + MPDescriptor + ModelPortRegistry::accessDescriptor (ID key) + { + LockRegistry global_lock; + return theGlobalRegistry().get(key); + } + + + /* === Mutations === */ + + /** create and register a new model port entry, + * within the pending transaction */ + MPDescriptor + ModelPortRegistry::definePort (ID pipe, ID element_exposing_this_port) + { + LockRegistry global_lock; + if (contains (pipe)) + throw error::Logic ("attempt to register a model port with a pipe-ID, " + "which has already been used to register a " + "model port within this transaction (build process)." + , LUMIERA_ERROR_DUPLICATE_MODEL_PORT); + return (transaction_[pipe] = ModelPortDescriptor(pipe, element_exposing_this_port)); + } + + + /** remove a model port entry from the pending transaction */ + void + ModelPortRegistry::remove (PID key) + { + LockRegistry global_lock; + transaction_.erase (key); + } + + + /** schedule removal of all registry contents. + * When the currently pending transaction is committed, + * all registered model ports will be removed */ + void + ModelPortRegistry::clear() + { + LockRegistry global_lock; + transaction_.clear(); + } + + + /** transactional switch for new/modified model ports. + * Promote the registered model ports from the currently + * pending transaction to become the globally valid model ports + * @note automatically starts a new transaction, initialised + * with the now published mappings. + */ + void + ModelPortRegistry::commit() + { + LockRegistry global_lock; + MPTable newTransaction(transaction_); + TRACE (builder, "committing new ModelPort list...."); + swap (currentReg_, transaction_); + swap (transaction_, newTransaction); + } + + + /** discard current transaction. + * The global port registration thus + * remains unaltered. */ + void + ModelPortRegistry::rollback() + { + LockRegistry global_lock; + TRACE (builder, "discarding changes to ModelPort list (rollback)...."); + MPTable newTransaction(currentReg_); + swap (transaction_, newTransaction); + } + + + + LUMIERA_ERROR_DEFINE (DUPLICATE_MODEL_PORT, "Attempt to define a new model port with an pipe-ID already denoting an existing port"); + + }// namespace builder + + + + + LUMIERA_ERROR_DEFINE (INVALID_MODEL_PORT, "Referral to unknown model port"); + LUMIERA_ERROR_DEFINE (UNCONNECTED_MODEL_PORT, "Attempt to operate on an existing but unconnected model port"); + + + ModelPort::ModelPort (ID refID) + : id_(refID) + { + builder::ModelPortRegistry::accessDescriptor (refID); + } + + + /** check if the global model port registration + * contains a mapping for the given pipe-ID*/ + bool + ModelPort::exists (ID key) + { + return builder::ModelPortRegistry::globalInstance().isRegistered (key); + } + + + /** access the Pipe (ID) of the global model port registered + * with the ID underlying this model port. + * @throw error::Logic if no model port is registered for this Pipe-ID + */ + ID + ModelPort::pipe() const + { + ENSURE (this->id_ == builder::ModelPortRegistry::accessDescriptor(this->id_).id()); + + return builder::ModelPortRegistry::accessDescriptor(this->id_).id(); + } + + + /** access the timeline (or similar structural element) holding + * a global pipe which corresponds to this model port + * @throw error::Logic if no model port is registered for this Pipe-ID + */ + ID + ModelPort::holder() const + { + return builder::ModelPortRegistry::accessDescriptor(this->id_).holder(); + } + + + /** convenience shortcut to access the stream type + * associated with the pipe-ID corresponding to this model port. + * @note no check if this model port actually is valid + * @throw error::Invalid in case of unknown/unregistered Pipe-ID + */ + StreamType::ID + ModelPort::streamType() const + { + return this->id_.streamType(); + } + + + +} // namespace mobject diff --git a/src/proc/mobject/builder/model-port-registry.hpp b/src/proc/mobject/builder/model-port-registry.hpp new file mode 100644 index 000000000..078c1928b --- /dev/null +++ b/src/proc/mobject/builder/model-port-registry.hpp @@ -0,0 +1,181 @@ +/* + MODEL-PORT-REGISTRY.hpp - creating and organising and accessing model ports + + Copyright (C) Lumiera.org + 2010, Hermann Vosseler + + 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 Software Foundation; either version 2 of + the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +/** @file model-port-registry.hpp + ** Mutation and management facility for model ports within the builder. + ** Model ports denote the points where output might possibly be produced. + ** While client code accesses model ports only as immutable descriptors handled + ** through an (opaque) reference, the builder is in charge of detecting and organising + ** any (new) model ports arising as the result of the build process. Changes to the set + ** of current model ports are to be activated with an atomic transactional switch. + ** + ** builder::ModelPortRegistry thus acts as management interface and factory for model ports. + ** A given instance of this registry can be promoted to be "the" model port registry reflecting + ** the current active model ports. Within the Lumiera application, the builder subsystem cares + ** for setting up such a registry, while all other parts of the system just access the current + ** model ports through the mobject::ModelPort frontend. + ** + ** @note the locking is rather coarse grained; basically we're using just one + ** single global lock for all ModelPortRegistry instances and all access/mutations, + ** as well as for accessing the globally valid Registry through the ModelPort frontend. + ** Assumed that usually there is just one Registry maintained by the builder, this is + ** likely to be sufficient. + ** + ** @see ModelPort + ** @see OutputDesignation + ** @see ModelPortRegistry_test + */ + + +#ifndef PROC_MOBJECT_BUILDER_MODEL_PORT_REGISTRY_H +#define PROC_MOBJECT_BUILDER_MODEL_PORT_REGISTRY_H + +#include "lib/error.hpp" +#include "lib/optional-ref.hpp" +#include "proc/asset/pipe.hpp" +#include "proc/asset/struct.hpp" +#include "proc/mobject/model-port.hpp" + +#include + +namespace mobject { +namespace builder { + + using asset::ID; + using asset::Pipe; + using asset::Struct; + + LUMIERA_ERROR_DECLARE (DUPLICATE_MODEL_PORT); ///< Attempt to define a new model port with an pipe-ID already denoting an existing port + + + /** + * Management facility for tracking model ports. + * ModelPort handles are exposed as frontend for usage + * by client code. Model ports are discovered by the builder + * when re-creating the low-level model; during such an ongoing + * build process, newly discovered ports are accumulated within + * a transaction, which then gets committed atomically when the + * new model is complete and ready for use. + */ + class ModelPortRegistry + : boost::noncopyable + { + + typedef ID PID; + typedef ID StID; + + public: + + /** @internal record to describe a model port */ + struct ModelPortDescriptor; + + + static void shutdown (); + + static ModelPortRegistry* + setActiveInstance (ModelPortRegistry& newRegistry); + + static ModelPortRegistry& + globalInstance(); + + static ModelPortDescriptor const& + accessDescriptor (PID); + + + ModelPortDescriptor const& + definePort (PID pipe, StID element_exposing_this_port); + + bool contains (PID) const; + bool isRegistered (PID) const; + + ModelPortDescriptor const& + get (PID) const; + + + void remove (PID); + void clear(); + + + /** activate pending model port changes. + * Any accumulated changes and newly defined model ports + * are promoted to become part of the current active configuration + * with a single atomic (transactional) switch. + */ + void commit(); + + /** discard pending changes. + * Silently drop model port definition changes since the last commit. + */ + void rollback(); + + + private: + static lib::OptionalRef theGlobalRegistry; + + typedef std::map MPTable; + + MPTable currentReg_; + MPTable transaction_; + }; + + + + + /** ModelPortDescriptor records are used as actual storage + * within the model port registration table; they are immutable + * value objects and never exposed to client code directly. + */ + class ModelPortRegistry::ModelPortDescriptor + { + PID id_; + StID holder_; + + protected: + ModelPortDescriptor (PID pipe, StID element_exposing_this_port) + : id_(pipe) + , holder_(element_exposing_this_port) + { } + + friend class ModelPortRegistry; + + public: + ModelPortDescriptor() + : id_(PID::INVALID) + , holder_(StID::INVALID) + { } + + // default copy operations permitted + + bool + isValid() const + { + return bool(id_); + } + + const PID id() const { return id_; } + const StID holder() const { return holder_; } + }; + + + +}} // namespace mobject::builder +#endif diff --git a/src/proc/mobject/builder/mould.hpp b/src/proc/mobject/builder/mould.hpp index 9a0108104..5db2ece7f 100644 --- a/src/proc/mobject/builder/mould.hpp +++ b/src/proc/mobject/builder/mould.hpp @@ -1,23 +1,23 @@ /* MOULD.hpp - builder tool kit for the basic building situations - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/builder/nodecreatortool.cpp b/src/proc/mobject/builder/nodecreatortool.cpp index 854d92dbc..9dcb639b7 100644 --- a/src/proc/mobject/builder/nodecreatortool.cpp +++ b/src/proc/mobject/builder/nodecreatortool.cpp @@ -1,23 +1,23 @@ /* NodeCreaterTool - central Tool implementing the Renderengine building - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/builder/nodecreatortool.hpp b/src/proc/mobject/builder/nodecreatortool.hpp index 6d2b5e9e8..fda4c95db 100644 --- a/src/proc/mobject/builder/nodecreatortool.hpp +++ b/src/proc/mobject/builder/nodecreatortool.hpp @@ -1,23 +1,23 @@ /* NODECREATERTOOL.hpp - central Tool implementing the Renderengine building - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/builder/operationpoint.cpp b/src/proc/mobject/builder/operationpoint.cpp index 5a6bbe3bf..e27ffc5b4 100644 --- a/src/proc/mobject/builder/operationpoint.cpp +++ b/src/proc/mobject/builder/operationpoint.cpp @@ -1,23 +1,23 @@ /* OperationPoint - abstraction representing the point where to apply a build instruction - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/builder/operationpoint.hpp b/src/proc/mobject/builder/operationpoint.hpp index 329dbcebc..49b5855bb 100644 --- a/src/proc/mobject/builder/operationpoint.hpp +++ b/src/proc/mobject/builder/operationpoint.hpp @@ -1,23 +1,23 @@ /* OPERATIONPOINT.hpp - abstraction representing the point where to apply a build instruction - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/builder/renderstate.hpp b/src/proc/mobject/builder/renderstate.hpp index 6e99a99b1..3da0e094b 100644 --- a/src/proc/mobject/builder/renderstate.hpp +++ b/src/proc/mobject/builder/renderstate.hpp @@ -1,23 +1,23 @@ /* RENDERSTATE.hpp - renderengine state management - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/builder/segmentation-tool.cpp b/src/proc/mobject/builder/segmentation-tool.cpp new file mode 100644 index 000000000..39b47380f --- /dev/null +++ b/src/proc/mobject/builder/segmentation-tool.cpp @@ -0,0 +1,79 @@ +/* + SegmentationTool - Tool for creating a partitioning of the current timeline + + Copyright (C) Lumiera.org + 2008, Hermann Vosseler + + 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 Software Foundation; either version 2 of + the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +* *****************************************************/ + + +#include "proc/mobject/builder/segmentation-tool.hpp" + + +using mobject::Buildable; +using mobject::session::Clip; +using mobject::session::Effect; + + +namespace mobject { +namespace builder { + + /////////////////////////////////TICKET #414 + + + SegmentationTool::SegmentationTool(mobject::session::Fixture&) + { + UNIMPLEMENTED ("create new SegmentationTool"); + } + + + void + SegmentationTool::treat (Buildable& something) + { + UNIMPLEMENTED ("??? when partitioning timeline"); + } + + + void + SegmentationTool::treat (Clip& clip) + { + UNIMPLEMENTED ("consider clip when partitioning timeline"); + } + + + void + SegmentationTool::treat (Effect& effect) + { + UNIMPLEMENTED ("note applied effect when partitioning timeline"); + } + + + void + SegmentationTool::onUnknown (Buildable& target) + { + UNIMPLEMENTED ("catch-all when partitioning timeline"); + } + + + bool + SegmentationTool::empty() const + { + UNIMPLEMENTED ("detect an empty segmentation"); + } + + +}} // namespace mobject::builder diff --git a/src/proc/mobject/builder/segmentation-tool.hpp b/src/proc/mobject/builder/segmentation-tool.hpp new file mode 100644 index 000000000..52bb1c5c1 --- /dev/null +++ b/src/proc/mobject/builder/segmentation-tool.hpp @@ -0,0 +1,78 @@ +/* + SEGMENTATION-TOOL.hpp - Tool for creating a partitioning of the current timeline + + Copyright (C) Lumiera.org + 2008, Hermann Vosseler + + 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 Software Foundation; either version 2 of + the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + + +#ifndef MOBJECT_BUILDER_SEGMENTATION_TOOL_H +#define MOBJECT_BUILDER_SEGMENTATION_TOOL_H + + +#include "proc/mobject/builder/applicable-builder-target-types.hpp" + +#include "proc/mobject/session/segmentation.hpp" +#include "proc/mobject/session/fixture.hpp" //////TODO really on the header?? + + +#include +using std::list; + + + +namespace mobject { +namespace builder { + + + /** + * Tool implementation for deriving a partitioning of the current + * timeline, such that each Segment has a constant configuration. + * "Constant" means here, that any remaining changes over time + * can be represented by automation solely, without the need + * to change the node connections. + */ + class SegmentationTool + : public ApplicableBuilderTargetTypes + { + + public: + SegmentationTool (session::Fixture &) ; + + void treat (mobject::session::Clip& clip) ; + void treat (mobject::session::Effect& effect) ; + + void treat (mobject::Buildable& something) ; + + void onUnknown (Buildable& target) ; /////////TODO why doesn't the treat(Buildable) function shadow this?? + + bool empty() const; + + private: + typedef mobject::session::Segment Segment; + + /** Partitioning of the Timeline to be created by this tool. */ + //session::Segmentation& segments_; + ///////////////////////////////////////////TODO: either put it inline, or use a scopend_ptr!!!!!!!!!! + + }; + + + +}} // namespace mobject::builder +#endif diff --git a/src/proc/mobject/builder/segmentation.cpp b/src/proc/mobject/builder/segmentation.cpp new file mode 100644 index 000000000..e7cd9cbf1 --- /dev/null +++ b/src/proc/mobject/builder/segmentation.cpp @@ -0,0 +1,85 @@ +/* + Segmentation - partitioning the effective timeline + + Copyright (C) Lumiera.org + 2010, Hermann Vosseler + + 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 Software Foundation; either version 2 of + the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +* *****************************************************/ + + +/** @file segmentation.cpp + ** Implementation details of fixture data structures. + ** + ** /////TODO file comment necessary? + ** + ** @see mobject::session::Fixture + ** + */ + + +#include "lib/error.hpp" +//#include "include/logging.h" +//#include "lib/sync-classlock.hpp" +//#include "proc/mobject/builderfacade.hpp" +#include "proc/mobject/builder/segmentation.hpp" +#include "proc/mobject/builder/fixture-change-detector.hpp" + +namespace mobject { +namespace builder { + + namespace error = lumiera::error; + + +// typedef ModelPortRegistry::ModelPortDescriptor const& MPDescriptor; + + + /** storage for the link to the global + Registry instance currently in charge */ +// lib::OptionalRef ModelPortRegistry::theGlobalRegistry; + + + /** access the globally valid registry instance. + * @throw error::State if this global registry is + * already closed or not yet initialised. */ +//ModelPortRegistry& +//ModelPortRegistry::globalInstance() +//{ +// LockRegistry global_lock; +// if (theGlobalRegistry.isValid()) +// return theGlobalRegistry(); +// +// throw error::State ("global model port registry is not accessible" +// , LUMIERA_ERROR_BUILDER_LIFECYCLE); +//} + + + + /** */ +// bool +// ModelPortRegistry::contains (ID key) const +// { +// return bool(key) +// && util::contains (transaction_, key); +// } + + + +//LUMIERA_ERROR_DEFINE (DUPLICATE_MODEL_PORT, "Attempt to define a new model port with an pipe-ID already denoting an existing port"); + + + +}}// namespace mobject::builder diff --git a/src/proc/mobject/builder/segmentation.hpp b/src/proc/mobject/builder/segmentation.hpp new file mode 100644 index 000000000..028e47f26 --- /dev/null +++ b/src/proc/mobject/builder/segmentation.hpp @@ -0,0 +1,87 @@ +/* + SEGMENTATION.hpp - partitioning the effective timeline + + Copyright (C) Lumiera.org + 2010, Hermann Vosseler + + 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 Software Foundation; either version 2 of + the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +/** @file segmentation.hpp + ** Part of the Fixture datastructure to manage time segments of constant structure. + ** The Fixture is result of the build process and separation between high-level and + ** low-level model. It's kind of an effective resulting timeline, and split into segments + ** of constant wiring structure: whenever the processing nodes need to be wired differently + ** for some timespan, we start a new segment of the timeline. This might be for the duration + ** of a clip, or just for the duration of a transition, when the pipes of both clips need to + ** be wired up in parallel. + ** + ** @see Fixture + ** @see ModelPort + */ + + +#ifndef PROC_MOBJECT_BUILDER_SEGMENTATION_H +#define PROC_MOBJECT_BUILDER_SEGMENTATION_H + +#include "lib/error.hpp" +//#include "lib/optional-ref.hpp" +#include "proc/asset/pipe.hpp" +//#include "proc/asset/struct.hpp" +//#include "proc/mobject/model-port.hpp" + +//#include + +namespace mobject { +namespace builder { + + using asset::ID; + using asset::Pipe; +//using asset::Struct; + +//LUMIERA_ERROR_DECLARE (DUPLICATE_MODEL_PORT); ///< Attempt to define a new model port with an pipe-ID already denoting an existing port + + + /** + * TODO type comment + */ + class Segment + : boost::noncopyable + { + + typedef ID PID; +// typedef ID StID; + + public: + + }; + + + + + /** + * TODO type comment + */ + class Segmentation + { + + public: + }; + + + +}} // namespace mobject::builder +#endif diff --git a/src/proc/mobject/builder/segmentationtool.cpp b/src/proc/mobject/builder/segmentationtool.cpp deleted file mode 100644 index d0a18595d..000000000 --- a/src/proc/mobject/builder/segmentationtool.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/* - SegmentationTool - Tool for creating a partitioning of the current timeline - - Copyright (C) Lumiera.org - 2008, Hermann Vosseler - - 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -* *****************************************************/ - - -#include "proc/mobject/builder/segmentationtool.hpp" - - -using mobject::Buildable; -using mobject::session::Clip; -using mobject::session::Effect; - - -namespace mobject { - namespace builder { - - /////////////////////////////////TICKET #414 - - - SegmentationTool::SegmentationTool(mobject::session::Fixture&) - { - UNIMPLEMENTED ("create new SegmentationTool"); - } - - - void - SegmentationTool::treat (Buildable& something) - { - UNIMPLEMENTED ("??? when partitioning timeline"); - } - - - void - SegmentationTool::treat (Clip& clip) - { - UNIMPLEMENTED ("consider clip when partitioning timeline"); - } - - - void - SegmentationTool::treat (Effect& effect) - { - UNIMPLEMENTED ("note applied effect when partitioning timeline"); - } - - - void - SegmentationTool::onUnknown (Buildable& target) - { - UNIMPLEMENTED ("catch-all when partitioning timeline"); - } - - - bool - SegmentationTool::empty() const - { - UNIMPLEMENTED ("detect an empty segmentation"); - } - - - } // namespace mobject::builder - -} // namespace mobject diff --git a/src/proc/mobject/builder/segmentationtool.hpp b/src/proc/mobject/builder/segmentationtool.hpp deleted file mode 100644 index 2b88f572a..000000000 --- a/src/proc/mobject/builder/segmentationtool.hpp +++ /dev/null @@ -1,80 +0,0 @@ -/* - SEGMENTATIONTOOL.hpp - Tool for creating a partitioning of the current timeline - - Copyright (C) Lumiera.org - 2008, Hermann Vosseler - - 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - - -#ifndef MOBJECT_BUILDER_SEGMENTATIONTOOL_H -#define MOBJECT_BUILDER_SEGMENTATIONTOOL_H - - -#include "proc/mobject/builder/applicable-builder-target-types.hpp" - -#include "proc/mobject/session/segmentation.hpp" -#include "proc/mobject/session/fixture.hpp" //////TODO really on the header?? - - -#include -using std::list; - - - -namespace mobject { - namespace builder { - - - /** - * Tool implementation for deriving a partitioning of the current - * timeline, such that each Segment has a constant configuration. - * "Constant" means here, that any remaining changes over time - * can be represented by automation solely, without the need - * to change the node connections. - */ - class SegmentationTool - : public ApplicableBuilderTargetTypes - { - - public: - SegmentationTool (session::Fixture &) ; - - void treat (mobject::session::Clip& clip) ; - void treat (mobject::session::Effect& effect) ; - - void treat (mobject::Buildable& something) ; - - void onUnknown (Buildable& target) ; /////////TODO why doesn't the treat(Buildable) function shadow this?? - - bool empty() const; - - private: - typedef mobject::session::Segment Segment; - - /** Partitioning of the Timeline to be created by this tool. */ - //session::Segmentation& segments_; - ///////////////////////////////////////////TODO: either put it inline, or use a scopend_ptr!!!!!!!!!! - - }; - - - - } // namespace mobject::builder - -} // namespace mobject -#endif diff --git a/src/proc/mobject/builder/toolfactory.cpp b/src/proc/mobject/builder/toolfactory.cpp index abfa8c83c..ab844f574 100644 --- a/src/proc/mobject/builder/toolfactory.cpp +++ b/src/proc/mobject/builder/toolfactory.cpp @@ -1,23 +1,23 @@ /* ToolFactory - supply of Tool implementations for the Builder - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/builder/toolfactory.hpp b/src/proc/mobject/builder/toolfactory.hpp index b283bea60..201653fde 100644 --- a/src/proc/mobject/builder/toolfactory.hpp +++ b/src/proc/mobject/builder/toolfactory.hpp @@ -1,23 +1,23 @@ /* TOOLFACTORY.hpp - supply of Tool implementations for the Builder - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ @@ -25,7 +25,7 @@ #define MOBJECT_BUILDER_TOOLFACTORY_H #include "proc/mobject/session/fixture.hpp" -#include "proc/mobject/builder/segmentationtool.hpp" +#include "proc/mobject/builder/segmentation-tool.hpp" #include "proc/mobject/builder/nodecreatortool.hpp" #include "proc/mobject/builder/mould.hpp" #include "proc/engine/rendergraph.hpp" diff --git a/src/proc/mobject/builder/wiringrequest.hpp b/src/proc/mobject/builder/wiringrequest.hpp index 6e39cb562..1ebb4515c 100644 --- a/src/proc/mobject/builder/wiringrequest.hpp +++ b/src/proc/mobject/builder/wiringrequest.hpp @@ -1,23 +1,23 @@ /* WIRINGREQUEST.hpp - (interface) the intention to make a data or control connection - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/builderfacade.cpp b/src/proc/mobject/builderfacade.cpp index 175aa2b24..b2f1377d5 100644 --- a/src/proc/mobject/builderfacade.cpp +++ b/src/proc/mobject/builderfacade.cpp @@ -1,23 +1,23 @@ /* BuilderFacade - Facade and service access point for the Builder Subsystem - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ @@ -26,12 +26,7 @@ namespace mobject { - namespace builder { - using ::NOBUG_FLAG(memory); - NOBUG_CPP_DEFINE_FLAG_PARENT(buildermem, memory); - } - - + /** * Main Operation of the Builder: * create a render engine for a given part of the timeline @@ -41,7 +36,10 @@ namespace mobject { { //////////////////////TODO } - - - + + LUMIERA_ERROR_DEFINE (BUILDER_LIFECYCLE, "Builder activated while in non operational state"); + + + + } // namespace mobject diff --git a/src/proc/mobject/builderfacade.hpp b/src/proc/mobject/builderfacade.hpp index 98197ec13..4a27d8b88 100644 --- a/src/proc/mobject/builderfacade.hpp +++ b/src/proc/mobject/builderfacade.hpp @@ -1,23 +1,23 @@ /* BUILDERFACADE.hpp - Facade and service access point for the Builder Subsystem - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ @@ -30,8 +30,9 @@ namespace mobject { - - + + LUMIERA_ERROR_DECLARE (BUILDER_LIFECYCLE); ///< Builder activated while in non operational state + /** * Provides unified access to the builder functionality. * While individual components of the builder subsystem may be called @@ -44,12 +45,14 @@ namespace mobject { /** * Main Operation of the Builder: * create a render engine for a given part of the timeline + * @deprecated thats a placeholder! the real invocation is now + * in the course of being worked out ////////////TODO 12/2010 */ engine::RenderEngine & buildEngine () ; // TODO: allocation, GC?????? }; - - - + + + } // namespace mobject #endif diff --git a/src/proc/mobject/explicitplacement.hpp b/src/proc/mobject/explicitplacement.hpp index 7fc3ec5dc..363e8beef 100644 --- a/src/proc/mobject/explicitplacement.hpp +++ b/src/proc/mobject/explicitplacement.hpp @@ -1,23 +1,23 @@ /* EXPLICITPLACEMENT.hpp - special Placement yielding an absolute location (Time,Track) for a MObject - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/interpolator.cpp b/src/proc/mobject/interpolator.cpp index 8ceb9ad86..026111b53 100644 --- a/src/proc/mobject/interpolator.cpp +++ b/src/proc/mobject/interpolator.cpp @@ -1,23 +1,23 @@ /* Interpolator - denotes a facility to get (continuously interpolated) parameter values - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/interpolator.hpp b/src/proc/mobject/interpolator.hpp index 843cd52bc..2244d7e58 100644 --- a/src/proc/mobject/interpolator.hpp +++ b/src/proc/mobject/interpolator.hpp @@ -1,23 +1,23 @@ /* INTERPOLATOR.hpp - denotes a facility to get (continuously interpolated) parameter values - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/mobject-ref.cpp b/src/proc/mobject/mobject-ref.cpp index a66250f1a..4eb98dcfc 100644 --- a/src/proc/mobject/mobject-ref.cpp +++ b/src/proc/mobject/mobject-ref.cpp @@ -1,23 +1,23 @@ /* MobjectRef - active external reference to an MObject within the Session - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/mobject-ref.hpp b/src/proc/mobject/mobject-ref.hpp index 737782436..ac03f32a1 100644 --- a/src/proc/mobject/mobject-ref.hpp +++ b/src/proc/mobject/mobject-ref.hpp @@ -1,23 +1,23 @@ /* MOBJECT-REF.hpp - active external reference to an MObject within the Session - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/mobject.cpp b/src/proc/mobject/mobject.cpp index 8ac73a1d2..f55c588aa 100644 --- a/src/proc/mobject/mobject.cpp +++ b/src/proc/mobject/mobject.cpp @@ -1,23 +1,23 @@ /* MObject - Key Abstraction: A Media Object in the Session - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/mobject.hpp b/src/proc/mobject/mobject.hpp index a1a7c8eab..a8ea73313 100644 --- a/src/proc/mobject/mobject.hpp +++ b/src/proc/mobject/mobject.hpp @@ -1,23 +1,23 @@ /* MOBJECT.hpp - Key Abstraction: A Media Object in the Session - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/model-port.hpp b/src/proc/mobject/model-port.hpp new file mode 100644 index 000000000..1ff5a0b3b --- /dev/null +++ b/src/proc/mobject/model-port.hpp @@ -0,0 +1,152 @@ +/* + MODEL-PORT.hpp - point to pull output data from the model + + Copyright (C) Lumiera.org + 2010, Hermann Vosseler + + 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 Software Foundation; either version 2 of + the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +/** @file model-port.hpp + ** Organising the output data calculation possibilities. + ** Model ports are conceptual entities, denoting the points where output might + ** possibly be produced. There is an actual representation, a collection of small + ** descriptor objects managed by the Fixture and organised within the registry + ** datastructure. Thus, while the actual ModelPort descriptor entities are located + ** within and managed by the Fixture -- model port as a concept spans the high-level + ** and low-level view. A model port can be associated both to a pipe within a timeline + ** in the HighLevelModel, as well as to denote a set of corresponding exit nodes within + ** the segments of the render nodes network. Model ports are keyed by Pipe-ID and thus + ** are bound to be unique within the application. + ** + ** A model port is rather derived than configured; it emerges during the build process + ** when a pipe claims an OutputDesignation and some other entity actually uses this + ** designation as a target, either directly or indirectly. This match of provision + ** and usage is detected by the Builder and produces an entry in the fixture's + ** ModelPortTable. Because of the 1:1 association with a pipe, each model port + ** has an associated StreamType. + ** + ** Because model ports are discovered this way, dynamically during the build process, + ** at some point there is a transactional switch to promote the new configuration + ** to become the valid current model port configuration. After that switch, model ports + ** are immutable. + ** + ** Model ports are to be accessed, enumerated and grouped in various ways, because + ** each port belongs to a specific timeline and is used to produce data of a single + ** StreamType solely. But all those referrals, searching and grouping happens only + ** after the build process has discovered all model ports currently available. + ** Thus actually the ModelPort elements handed out to client code are just + ** smart-handles, accessing a global ModelPortRegistry behind the scenes. + ** Validity of these handles will be checked on each access. The actual + ** model port descriptors are owned and managed by the fixture; + ** @todo they might bulk allocated in a similar manner than the + ** ProcNode and WiringDescriptor objects are. + ** + ** @see ModelPortRegistry_test abstract usage example + ** @see ModelPortRegistry management interface + ** @see OutputDesignation + ** @see OutputMapping + ** @see Timeline + */ + + +#ifndef PROC_MOBJECT_MODEL_PORT_H +#define PROC_MOBJECT_MODEL_PORT_H + +#include "proc/asset/pipe.hpp" +#include "lib/bool-checkable.hpp" +#include "lib/streamtype.hpp" + +namespace mobject { + + LUMIERA_ERROR_DECLARE (INVALID_MODEL_PORT); ///< Referral to unknown model port + LUMIERA_ERROR_DECLARE (UNCONNECTED_MODEL_PORT); ///< Attempt to operate on an existing but unconnected model port + + + using asset::ID; + using lumiera::StreamType; + + + /** + * Handle denoting a point within the model, + * where actually output data can be pulled. + * ModelPort is a frontend to be used by clients. + * These ModelPort handle objects may be copied and stored + * at will, but their validity will be verified on each access. + * Actually, the Builder will discover any model ports and + * maintain a ModelPortRegistry behind the scenes. + * + * Each model port corresponds to a (global) pipe within a + * specific Timeline ("holder"); consequently each such port is also + * bound to produce data of a specific StreamType (as defined by + * the corresponding pipe). A model port may be in \em unconnected + * state, which can be checked through \c bool conversion. While + * the ModelPort handles are value objects, the identity of the + * underlying model port (descriptor) is given by the + * corresponding pipe-ID, thus effectively resulting + * in a global namespace for model ports. + * + * @see builder::ModelPortRegistry management interface + * @see ModelPortRegistry_test abstract usage example + */ + class ModelPort + : public lib::BoolCheckable + { + ID id_; + + public: + ModelPort() ///< \em unconnected model port + : id_(ID::INVALID) + { } + + ModelPort (ID refID); ///< @note conversion from pipe-ID + + // using default copy operations + + + static bool exists (ID); + + ID pipe() const; + ID holder() const; + StreamType::ID streamType() const; + + bool + isValid() const + { + return exists (this->id_); + } + + + friend bool + operator== (ModelPort const& mp1, ModelPort const& mp2) + { + return mp1.id_ == mp2.id_; + } + + friend bool + operator!= (ModelPort const& mp1, ModelPort const& mp2) + { + return mp1.id_ != mp2.id_; + } + + private: + + }; + + + +} // namespace mobject +#endif diff --git a/src/proc/mobject/output-designation.cpp b/src/proc/mobject/output-designation.cpp index 0423e5890..3d628150b 100644 --- a/src/proc/mobject/output-designation.cpp +++ b/src/proc/mobject/output-designation.cpp @@ -1,23 +1,23 @@ /* OutputDesignation - specifying a desired output destination - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/output-designation.hpp b/src/proc/mobject/output-designation.hpp index 61a7b1c1a..43aa6f5b8 100644 --- a/src/proc/mobject/output-designation.hpp +++ b/src/proc/mobject/output-designation.hpp @@ -1,23 +1,23 @@ /* OUTPUT-DESIGNATION.hpp - specifying a desired output destination - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/output-mapping.hpp b/src/proc/mobject/output-mapping.hpp index 45f26ae0a..182c007e1 100644 --- a/src/proc/mobject/output-mapping.hpp +++ b/src/proc/mobject/output-mapping.hpp @@ -1,23 +1,23 @@ /* OUTPUT-MAPPING.hpp - generic interface for translation of output designations - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/parameter.cpp b/src/proc/mobject/parameter.cpp index ac826dcdd..854634f49 100644 --- a/src/proc/mobject/parameter.cpp +++ b/src/proc/mobject/parameter.cpp @@ -1,23 +1,23 @@ /* Parameter - representation of an automatable effect/plugin parameter - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/parameter.hpp b/src/proc/mobject/parameter.hpp index 634e36851..7a0a852d5 100644 --- a/src/proc/mobject/parameter.hpp +++ b/src/proc/mobject/parameter.hpp @@ -1,23 +1,23 @@ /* PARAMETER.hpp - representation of an automatable effect/plugin parameter - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/paramprovider.cpp b/src/proc/mobject/paramprovider.cpp index 8b5da785a..e0fae70a2 100644 --- a/src/proc/mobject/paramprovider.cpp +++ b/src/proc/mobject/paramprovider.cpp @@ -1,23 +1,23 @@ /* ParamProvider - interface denoting a source for actual Parameter values - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/paramprovider.hpp b/src/proc/mobject/paramprovider.hpp index fdcaff2a8..cbf44a779 100644 --- a/src/proc/mobject/paramprovider.hpp +++ b/src/proc/mobject/paramprovider.hpp @@ -1,23 +1,23 @@ /* PARAMPROVIDER.hpp - interface denoting a source for actual Parameter values - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/placement-ref.hpp b/src/proc/mobject/placement-ref.hpp index 91d246471..d5fb4fa59 100644 --- a/src/proc/mobject/placement-ref.hpp +++ b/src/proc/mobject/placement-ref.hpp @@ -1,23 +1,23 @@ /* PLACEMENT-REF.hpp - generic reference to an individual placement added to the session - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/placement.cpp b/src/proc/mobject/placement.cpp index 1b6e4c14d..e0260ef13 100644 --- a/src/proc/mobject/placement.cpp +++ b/src/proc/mobject/placement.cpp @@ -1,23 +1,23 @@ /* Placement - Key Abstraction: a way to place and locate a Media Object - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/placement.hpp b/src/proc/mobject/placement.hpp index 46607752d..5cd8206dc 100644 --- a/src/proc/mobject/placement.hpp +++ b/src/proc/mobject/placement.hpp @@ -1,23 +1,23 @@ /* PLACEMENT.hpp - Key Abstraction: a way to place and locate a Media Object - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session.hpp b/src/proc/mobject/session.hpp index 4bab5f285..22dd59bdf 100644 --- a/src/proc/mobject/session.hpp +++ b/src/proc/mobject/session.hpp @@ -1,23 +1,23 @@ /* SESSION.hpp - holds the complete session to be edited by the user - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ @@ -51,7 +51,7 @@ #include "proc/mobject/placement.hpp" #include "proc/mobject/mobject-ref.hpp" -#include "proc/mobject/session/defsmanager.hpp" ////////////////////////////TICKET #643 forward declare this? +#include "proc/mobject/session/defs-manager.hpp" ////////////////////////////TICKET #643 forward declare this? #include "lib/ref-array.hpp" #include "lib/singleton.hpp" #include "lib/symbol.hpp" diff --git a/src/proc/mobject/session/abstractmo.cpp b/src/proc/mobject/session/abstractmo.cpp index bdebb727d..aba3d7b2f 100644 --- a/src/proc/mobject/session/abstractmo.cpp +++ b/src/proc/mobject/session/abstractmo.cpp @@ -1,23 +1,23 @@ /* AbstractMO - abstract base class for all Media Objects - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/abstractmo.hpp b/src/proc/mobject/session/abstractmo.hpp index eff1d5d0c..53abf0466 100644 --- a/src/proc/mobject/session/abstractmo.hpp +++ b/src/proc/mobject/session/abstractmo.hpp @@ -1,23 +1,23 @@ /* ABSTRACTMO.hpp - abstract base class for all Media Objects - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/allocation.cpp b/src/proc/mobject/session/allocation.cpp index ae23185b8..03cbfd88d 100644 --- a/src/proc/mobject/session/allocation.cpp +++ b/src/proc/mobject/session/allocation.cpp @@ -1,23 +1,23 @@ /* Allocation - objective to place a MObject in a specific way - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/allocation.hpp b/src/proc/mobject/session/allocation.hpp index e668fb469..a1a668b9d 100644 --- a/src/proc/mobject/session/allocation.hpp +++ b/src/proc/mobject/session/allocation.hpp @@ -1,23 +1,23 @@ /* ALLOCATION.hpp - objective to place a MObject in a specific way - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/auto.cpp b/src/proc/mobject/session/auto.cpp index a8ecf4c38..b46ea5cae 100644 --- a/src/proc/mobject/session/auto.cpp +++ b/src/proc/mobject/session/auto.cpp @@ -1,23 +1,23 @@ /* Auto - Media Object holding automation data - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/auto.hpp b/src/proc/mobject/session/auto.hpp index 0ec133bc0..24b82ba9c 100644 --- a/src/proc/mobject/session/auto.hpp +++ b/src/proc/mobject/session/auto.hpp @@ -1,23 +1,23 @@ /* AUTO.hpp - Media Object holding automation data - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/binding.cpp b/src/proc/mobject/session/binding.cpp index eac8d70ea..9a763129a 100644 --- a/src/proc/mobject/session/binding.cpp +++ b/src/proc/mobject/session/binding.cpp @@ -1,23 +1,23 @@ /* Binding - link to use a sequence within the session - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/binding.hpp b/src/proc/mobject/session/binding.hpp index 05c51fd74..0b790da9c 100644 --- a/src/proc/mobject/session/binding.hpp +++ b/src/proc/mobject/session/binding.hpp @@ -1,23 +1,23 @@ /* BINDING.hpp - link to use a sequence within the session - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/bus-mo.cpp b/src/proc/mobject/session/bus-mo.cpp index ab43dba67..1ea99c15c 100644 --- a/src/proc/mobject/session/bus-mo.cpp +++ b/src/proc/mobject/session/bus-mo.cpp @@ -1,23 +1,23 @@ /* BusMO - attachment point to form a global pipe - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/bus-mo.hpp b/src/proc/mobject/session/bus-mo.hpp index 1e686bd37..30d5c3ae6 100644 --- a/src/proc/mobject/session/bus-mo.hpp +++ b/src/proc/mobject/session/bus-mo.hpp @@ -1,23 +1,23 @@ /* BUS-MO.hpp - attachment point to form a global pipe - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/clip.cpp b/src/proc/mobject/session/clip.cpp index a99f7c5df..af388fd9b 100644 --- a/src/proc/mobject/session/clip.cpp +++ b/src/proc/mobject/session/clip.cpp @@ -1,23 +1,23 @@ /* Clip - a Media Clip - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/clip.hpp b/src/proc/mobject/session/clip.hpp index 09aeda4c7..6a6251103 100644 --- a/src/proc/mobject/session/clip.hpp +++ b/src/proc/mobject/session/clip.hpp @@ -1,23 +1,23 @@ /* CLIP.hpp - a Media Clip - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/compoundclip.cpp b/src/proc/mobject/session/compoundclip.cpp index caa8e83bd..6de47a052 100644 --- a/src/proc/mobject/session/compoundclip.cpp +++ b/src/proc/mobject/session/compoundclip.cpp @@ -1,23 +1,23 @@ /* CompoundClip - compound of several clips (multichannel) - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/compoundclip.hpp b/src/proc/mobject/session/compoundclip.hpp index e2dfd9fd9..9e4f32f77 100644 --- a/src/proc/mobject/session/compoundclip.hpp +++ b/src/proc/mobject/session/compoundclip.hpp @@ -1,23 +1,23 @@ /* COMPOUNDCLIP.hpp - compound of several clips (multichannel) - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/constraint.cpp b/src/proc/mobject/session/constraint.cpp index 8a767ed45..4a1241cf3 100644 --- a/src/proc/mobject/session/constraint.cpp +++ b/src/proc/mobject/session/constraint.cpp @@ -1,23 +1,23 @@ /* Constraint - LocatingPin representing an mandatory directive - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/constraint.hpp b/src/proc/mobject/session/constraint.hpp index 191f4b515..eabddc617 100644 --- a/src/proc/mobject/session/constraint.hpp +++ b/src/proc/mobject/session/constraint.hpp @@ -1,23 +1,23 @@ /* CONSTRAINT.hpp - LocatingPin representing an mandatory directive - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/defsmanager.cpp b/src/proc/mobject/session/defs-manager.cpp similarity index 96% rename from src/proc/mobject/session/defsmanager.cpp rename to src/proc/mobject/session/defs-manager.cpp index 7f660f8c8..5dd350947 100644 --- a/src/proc/mobject/session/defsmanager.cpp +++ b/src/proc/mobject/session/defs-manager.cpp @@ -1,28 +1,28 @@ /* DefsManager - access to preconfigured default objects and definitions - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ -#include "proc/mobject/session/defsmanager.hpp" -#include "proc/mobject/session/defsregistry.hpp" +#include "proc/mobject/session/defs-manager.hpp" +#include "proc/mobject/session/defs-registry.hpp" #include "common/configrules.hpp" #include "lib/error.hpp" diff --git a/src/proc/mobject/session/defs-manager.hpp b/src/proc/mobject/session/defs-manager.hpp new file mode 100644 index 000000000..0fbcb1ab5 --- /dev/null +++ b/src/proc/mobject/session/defs-manager.hpp @@ -0,0 +1,128 @@ +/* + DEFS-MANAGER.hpp - access to preconfigured default objects and definitions + + Copyright (C) Lumiera.org + 2008, Hermann Vosseler + + 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 Software Foundation; either version 2 of + the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + + +#ifndef MOBJECT_SESSION_DEFS_MANAGER_H +#define MOBJECT_SESSION_DEFS_MANAGER_H + + +#include "lib/p.hpp" +#include "lib/query.hpp" + +#include +#include + + + +namespace mobject { +namespace session { + + + using lumiera::P; + using boost::scoped_ptr; + + namespace impl { class DefsRegistry; } + + + /** + * Organise a collection of preconfigured default objects. + * For various kinds of objects we can tweak the default parametrisation + * as part of the general session configuration. A ref to an instance of + * this class is accessible through the current session and can be used + * to fill in parts of the configuration of new objects, if the user + * code didn't give more specific parameters. Necessary sub-objects + * will be created on demand, and any default configuration, once + * found, will be remembered and stored with the current session. + * + * @note while the logic of defaults handling can be considered + * roughly final, as of 12/09 most of the actual object + * handling is placeholder code. + */ + class DefsManager : private boost::noncopyable + { + scoped_ptr defsRegistry; + + public: + + DefsManager () throw(); + ~DefsManager (); + + /** common access point: retrieve the default object fulfilling + * some given conditions. May silently trigger object creation. + * @throw error::Config in case no solution is possible, which + * is considered \e misconfiguration. + */ + template + P operator() (lumiera::Query const&); + + + /** search through the registered defaults, never create anything. + * @return object fulfilling the query, \c empty ptr if not found. + */ + template + P search (lumiera::Query const&); + + /** retrieve an object fulfilling the query and register it as default. + * The resolution is delegated to the ConfigQuery system (which may cause + * creation of new object instances) + * @return object fulfilling the query, \c empty ptr if no solution. + */ + template + P create (lumiera::Query const&); + + /** register the given object as default, after ensuring it fulfils the + * query. The latter may cause some properties of the object to be set, + * trigger creation of additional objects, and may fail altogether. + * @return true if query was successful and object is registered as default + * @note only a weak ref to the object is stored + */ + template + bool define (P const&, lumiera::Query const& =lumiera::Query()); + + /** remove the defaults registration of the given object, if there was such + * @return false if nothing has been changed because the object wasn't registered + */ + template + bool forget (P const&); + + +// Q: can we have something along the line of...? +// +// template +// < class TAR, ///< the target to query for +// template class SMP ///< smart pointer class to wrap the result +// > +// SMP operator() (const lumiera::Query&); + +// 12/09: according to my current knowledge of template metaprogramming, the answer is "no", +// but we could use a traits template to set up a fixed association of smart pointers +// and kinds of target object. This would allow to define a templated operator() returning +// the result wrapped into the right holder. But currently I don't see how to build a sensible +// implementation infrastructure backing such an interface. +//////////TICKET #452 + + }; + + + +}} // namespace mobject::session +#endif diff --git a/src/proc/mobject/session/defsregistry.hpp b/src/proc/mobject/session/defs-registry.hpp similarity index 64% rename from src/proc/mobject/session/defsregistry.hpp rename to src/proc/mobject/session/defs-registry.hpp index 0dc6242c5..a6fc169cb 100644 --- a/src/proc/mobject/session/defsregistry.hpp +++ b/src/proc/mobject/session/defs-registry.hpp @@ -1,43 +1,43 @@ /* - DEFSREGISTRY.hpp - implementation of the default object store - + DEFS-REGISTRY.hpp - implementation of the default object store + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ -/** @file defsregistry.hpp +/** @file defs-registry.hpp ** A piece of implementation code factored out into a separate header (include). - ** Only used in defsmanager.cpp and for the unit tests. We can't place it into - ** a separate compilation unit, because defsmanager.cpp defines some explicit + ** Only used in defs-manager.cpp and for the unit tests. We can't place it into + ** a separate compilation unit, because defs-manager.cpp defines some explicit ** template instantiation, which cause the different Slots of the DefsrRegistry#table_ ** to be filled with data and defaults for the specific Types. ** ** @see mobject::session::DefsManager - ** @see defsregistryimpltest.cpp + ** @see DefsRegistryImpl_test ** */ -#ifndef MOBJECT_SESSION_DEFSREGISTRY_H -#define MOBJECT_SESSION_DEFSREGISTRY_H +#ifndef MOBJECT_SESSION_DEFS_REGISTRY_H +#define MOBJECT_SESSION_DEFS_REGISTRY_H #include "lib/sync-classlock.hpp" @@ -55,131 +55,131 @@ namespace mobject { - namespace session { +namespace session { + + using lumiera::P; + using lumiera::Query; + using lib::ClassLock; + using std::tr1::weak_ptr; + + using std::string; + using boost::format; + using boost::lambda::_1; + using boost::lambda::var; + + namespace impl { - using lumiera::P; - using lumiera::Query; - using lib::ClassLock; - using std::tr1::weak_ptr; + namespace { + uint maxSlots (0); ///< number of different registered Types + format dumpRecord ("%2i| %64s --> %s\n"); + } - using std::string; - using boost::format; - using boost::lambda::_1; - using boost::lambda::var; - namespace impl { - - namespace { - uint maxSlots (0); ///< number of different registered Types - format dumpRecord ("%2i| %64s --> %s\n"); - } - - - struct TableEntry - { - virtual ~TableEntry() {}; - }; - - /** we maintain an independent defaults registry - * for every participating kind of object. */ - typedef std::vector< P > Table; - - - /** - * holding a single "default object" entry - */ - template - struct Record - { - uint degree; - Query query; - weak_ptr objRef; - - Record (const Query& q, const P& obj) - : degree (lumiera::query::countPred (q)), - query (q), - objRef (obj) - { } - - - struct Search ///< Functor searching for a specific object - { - Search (const P& obj) - : obj_(obj) { } - - const P& obj_; - - bool - operator() (const Record& rec) - { - P storedObj (rec.objRef.lock()); - return storedObj && (storedObj == obj_); - } - }; - - struct OrderRelation - { - inline bool - operator() (Record one, Record two) ///< @note doesn't touch the objRef - { - return ( one.degree < two.degree - ||(one.degree == two.degree && one.query < two.query) - ); - } - }; + struct TableEntry + { + virtual ~TableEntry() {}; + }; + + /** we maintain an independent defaults registry + * for every participating kind of object. */ + typedef std::vector< P > Table; + + + /** + * holding a single "default object" entry + */ + template + struct Record + { + uint degree; + Query query; + weak_ptr objRef; + + Record (const Query& q, const P& obj) + : degree (lumiera::query::countPred (q)), + query (q), + objRef (obj) + { } + + + struct Search ///< Functor searching for a specific object + { + Search (const P& obj) + : obj_(obj) { } - operator string () const { return str (dumpRecord % degree % query % dumpObj()); } - string dumpObj () const { P o (objRef.lock()); return o? string(*o):"dead"; } - }; - - /** every new kind of object (Type) creates a new - * slot in the main Table holding all registered - * default objects. Each slot actually holds a - * separate tree (set) of registry entries - */ - template - struct Slot : public TableEntry - { - typedef typename Record::OrderRelation Ordering; - typedef std::set, Ordering> Registry; - - Registry registry; - static size_t index; ///< where to find this Slot in every Table - - static Registry& - access (Table& table) + const P& obj_; + + bool + operator() (const Record& rec) { - if ( !index - || index > table.size() - ||!table[index-1]) - createSlot (table); - - ASSERT (0 < index && index<=table.size() && table[index-1]); - Slot* item = static_cast (table[index-1].get()); - return item->registry; + P storedObj (rec.objRef.lock()); + return storedObj && (storedObj == obj_); } - - private: - static void - createSlot (Table& table) - { - ClassLock guard(); - if (!index) - index = ++maxSlots; - if (index > table.size()) - table.resize (index); - table[index-1].reset(new Slot); - } - }; + }; + struct OrderRelation + { + inline bool + operator() (Record one, Record two) ///< @note doesn't touch the objRef + { + return ( one.degree < two.degree + ||(one.degree == two.degree && one.query < two.query) + ); + } + }; - // static vars to organise one Table Slot per type.... - template - size_t Slot::index (0); - - + operator string () const { return str (dumpRecord % degree % query % dumpObj()); } + string dumpObj () const { P o (objRef.lock()); return o? string(*o):"dead"; } + }; + + /** every new kind of object (Type) creates a new + * slot in the main Table holding all registered + * default objects. Each slot actually holds a + * separate tree (set) of registry entries + */ + template + struct Slot : public TableEntry + { + typedef typename Record::OrderRelation Ordering; + typedef std::set, Ordering> Registry; + + Registry registry; + static size_t index; ///< where to find this Slot in every Table + + static Registry& + access (Table& table) + { + if ( !index + || index > table.size() + ||!table[index-1]) + createSlot (table); + + ASSERT (0 < index && index<=table.size() && table[index-1]); + Slot* item = static_cast (table[index-1].get()); + return item->registry; + } + + private: + static void + createSlot (Table& table) + { + ClassLock guard(); + if (!index) + index = ++maxSlots; + if (index > table.size()) + table.resize (index); + table[index-1].reset(new Slot); + } + }; + // static vars to organise one Table Slot per type.... + template + size_t Slot::index (0); + + + + /** * @internal Helper for organising preconfigured default objects. * Maintains a collection of objects known or encountered as "default" @@ -235,8 +235,8 @@ namespace mobject { public: P operator* () { return ptr; } bool hasNext () { return next || findNext(); } - Iter operator++ (int) { Iter tmp=*this; operator++(); return tmp; } - Iter& operator++ () + Iter operator++ (int) { Iter tmp=*this; operator++(); return tmp; } + Iter& operator++ () { ptr=findNext(); next.reset(); @@ -332,16 +332,13 @@ namespace mobject { return res; } }; - - - - } // (End) impl namespace - - using impl::DefsRegistry; - } // namespace mobject::session - -} // namespace mobject - + + } // (End) impl namespace + + using impl::DefsRegistry; + + +}} // namespace mobject::session #endif diff --git a/src/proc/mobject/session/defsmanager.hpp b/src/proc/mobject/session/defsmanager.hpp deleted file mode 100644 index 09b7a0499..000000000 --- a/src/proc/mobject/session/defsmanager.hpp +++ /dev/null @@ -1,130 +0,0 @@ -/* - DEFSMANAGER.hpp - access to preconfigured default objects and definitions - - Copyright (C) Lumiera.org - 2008, Hermann Vosseler - - 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - - -#ifndef MOBJECT_SESSION_DEFSMANAGER_H -#define MOBJECT_SESSION_DEFSMANAGER_H - - -#include "lib/p.hpp" -#include "lib/query.hpp" - -#include -#include - - - -namespace mobject { - namespace session { - - - using lumiera::P; - using boost::scoped_ptr; - - namespace impl { class DefsRegistry; } - - - /** - * Organise a collection of preconfigured default objects. - * For various kinds of objects we can tweak the default parametrisation - * as part of the general session configuration. A ref to an instance of - * this class is accessible through the current session and can be used - * to fill in parts of the configuration of new objects, if the user - * code didn't give more specific parameters. Necessary sub-objects - * will be created on demand, and any default configuration, once - * found, will be remembered and stored with the current session. - * - * @note while the logic of defaults handling can be considered - * roughly final, as of 12/09 most of the actual object - * handling is placeholder code. - */ - class DefsManager : private boost::noncopyable - { - scoped_ptr defsRegistry; - - public: - - DefsManager () throw(); - ~DefsManager (); - - /** common access point: retrieve the default object fulfilling - * some given conditions. May silently trigger object creation. - * @throw error::Config in case no solution is possible, which - * is considered \e misconfiguration. - */ - template - P operator() (lumiera::Query const&); - - - /** search through the registered defaults, never create anything. - * @return object fulfilling the query, \c empty ptr if not found. - */ - template - P search (lumiera::Query const&); - - /** retrieve an object fulfilling the query and register it as default. - * The resolution is delegated to the ConfigQuery system (which may cause - * creation of new object instances) - * @return object fulfilling the query, \c empty ptr if no solution. - */ - template - P create (lumiera::Query const&); - - /** register the given object as default, after ensuring it fulfils the - * query. The latter may cause some properties of the object to be set, - * trigger creation of additional objects, and may fail altogether. - * @return true if query was successful and object is registered as default - * @note only a weak ref to the object is stored - */ - template - bool define (P const&, lumiera::Query const& =lumiera::Query()); - - /** remove the defaults registration of the given object, if there was such - * @return false if nothing has been changed because the object wasn't registered - */ - template - bool forget (P const&); - - -// Q: can we have something along the line of...? -// -// template -// < class TAR, ///< the target to query for -// template class SMP ///< smart pointer class to wrap the result -// > -// SMP operator() (const lumiera::Query&); - -// 12/09: according to my current knowledge of template metaprogramming, the answer is "no", -// but we could use a traits template to set up a fixed association of smart pointers -// and kinds of target object. This would allow to define a templated operator() returning -// the result wrapped into the right holder. But currently I don't see how to build a sensible -// implementation infrastructure backing such an interface. -//////////TICKET #452 - - }; - - - - } // namespace mobject::session - -} // namespace mobject -#endif diff --git a/src/proc/mobject/session/effect.cpp b/src/proc/mobject/session/effect.cpp index de2bfe18a..d190274dd 100644 --- a/src/proc/mobject/session/effect.cpp +++ b/src/proc/mobject/session/effect.cpp @@ -1,23 +1,23 @@ /* Effect - Model representation of a pluggable and automatable effect. - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/effect.hpp b/src/proc/mobject/session/effect.hpp index ba0f08e8c..9c22e847e 100644 --- a/src/proc/mobject/session/effect.hpp +++ b/src/proc/mobject/session/effect.hpp @@ -1,23 +1,23 @@ /* EFFECT.hpp - Model representation of a pluggable and automatable effect. - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/element-query.hpp b/src/proc/mobject/session/element-query.hpp index 9baf6a5d6..fbb3fbe3a 100644 --- a/src/proc/mobject/session/element-query.hpp +++ b/src/proc/mobject/session/element-query.hpp @@ -1,23 +1,23 @@ /* ELEMENT-QUERY.hpp - session sub-interface to query and retrieve elements - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/fixedlocation.cpp b/src/proc/mobject/session/fixedlocation.cpp index 238b8c011..1cd7eb98c 100644 --- a/src/proc/mobject/session/fixedlocation.cpp +++ b/src/proc/mobject/session/fixedlocation.cpp @@ -1,23 +1,23 @@ /* FixedLocation - directly positioning a MObject to a fixed location - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/fixedlocation.hpp b/src/proc/mobject/session/fixedlocation.hpp index 6b6d981c3..ab9b9cc6d 100644 --- a/src/proc/mobject/session/fixedlocation.hpp +++ b/src/proc/mobject/session/fixedlocation.hpp @@ -1,23 +1,23 @@ /* FIXEDLOCATION.hpp - directly positioning a MObject to a fixed location - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/fixture.cpp b/src/proc/mobject/session/fixture.cpp index 9c8209000..053bd3827 100644 --- a/src/proc/mobject/session/fixture.cpp +++ b/src/proc/mobject/session/fixture.cpp @@ -1,23 +1,23 @@ /* Fixture - the (low level) representation of the Session with explicit placement data - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/fixture.hpp b/src/proc/mobject/session/fixture.hpp index 76f55ce4b..d6ecdc847 100644 --- a/src/proc/mobject/session/fixture.hpp +++ b/src/proc/mobject/session/fixture.hpp @@ -1,23 +1,23 @@ /* FIXTURE.hpp - the (low level) representation of the Session with explicit placement data - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/label.cpp b/src/proc/mobject/session/label.cpp index 6f6224fed..58e3cd86f 100644 --- a/src/proc/mobject/session/label.cpp +++ b/src/proc/mobject/session/label.cpp @@ -1,23 +1,23 @@ /* Label - a user visible Marker or Tag - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/label.hpp b/src/proc/mobject/session/label.hpp index d2b6c3616..df790d74f 100644 --- a/src/proc/mobject/session/label.hpp +++ b/src/proc/mobject/session/label.hpp @@ -1,23 +1,23 @@ /* LABEL.hpp - a user visible Marker or Tag - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/lifecycle-advisor.hpp b/src/proc/mobject/session/lifecycle-advisor.hpp index b595273f2..a3c286af8 100644 --- a/src/proc/mobject/session/lifecycle-advisor.hpp +++ b/src/proc/mobject/session/lifecycle-advisor.hpp @@ -1,23 +1,23 @@ /* LIFECYCLE-ADVISOR.hpp - outline of the session lifecycle - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/locatingpin.cpp b/src/proc/mobject/session/locatingpin.cpp index f4e7ce954..1c98c3df1 100644 --- a/src/proc/mobject/session/locatingpin.cpp +++ b/src/proc/mobject/session/locatingpin.cpp @@ -1,23 +1,23 @@ /* LocatingPin - Chaining and constraining the Placement of a Media Object - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/locatingpin.hpp b/src/proc/mobject/session/locatingpin.hpp index 945947a75..04feae332 100644 --- a/src/proc/mobject/session/locatingpin.hpp +++ b/src/proc/mobject/session/locatingpin.hpp @@ -1,23 +1,23 @@ /* LOCATINGPIN.hpp - Chaining and constraining the Placement of a Media Object - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/meta.cpp b/src/proc/mobject/session/meta.cpp index cb61756d5..88d87c443 100644 --- a/src/proc/mobject/session/meta.cpp +++ b/src/proc/mobject/session/meta.cpp @@ -1,23 +1,23 @@ /* Meta - abstract base class of all MObjects representing meta data or processing instructions - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/meta.hpp b/src/proc/mobject/session/meta.hpp index bea5bdb25..3015bb127 100644 --- a/src/proc/mobject/session/meta.hpp +++ b/src/proc/mobject/session/meta.hpp @@ -1,23 +1,23 @@ /* META.hpp - abstract base class of all MObjects representing meta data or processing instructions - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/mobjectfactory.cpp b/src/proc/mobject/session/mobjectfactory.cpp index b7f639d9e..f6c6aa807 100644 --- a/src/proc/mobject/session/mobjectfactory.cpp +++ b/src/proc/mobject/session/mobjectfactory.cpp @@ -1,23 +1,23 @@ /* MObjectFactory - creating concrete MObject subclass instances - + Copyright (C) Lumiera.org 2008-2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/mobjectfactory.hpp b/src/proc/mobject/session/mobjectfactory.hpp index 0d7aa6010..67e1ada4e 100644 --- a/src/proc/mobject/session/mobjectfactory.hpp +++ b/src/proc/mobject/session/mobjectfactory.hpp @@ -1,23 +1,23 @@ /* MOBJECTFACTORY.hpp - creating concrete MObject subclass instances - + Copyright (C) Lumiera.org 2008-2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/placement-index-query-resolver.cpp b/src/proc/mobject/session/placement-index-query-resolver.cpp index 5b06caf73..ea366b6ac 100644 --- a/src/proc/mobject/session/placement-index-query-resolver.cpp +++ b/src/proc/mobject/session/placement-index-query-resolver.cpp @@ -1,23 +1,23 @@ /* placementIndexQueryResolver - using PlacementIndex to resolve scope queries - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/placement-index-query-resolver.hpp b/src/proc/mobject/session/placement-index-query-resolver.hpp index 7ae60a7b9..6e4ab424d 100644 --- a/src/proc/mobject/session/placement-index-query-resolver.hpp +++ b/src/proc/mobject/session/placement-index-query-resolver.hpp @@ -1,23 +1,23 @@ /* PLACEMENT-INDEX-QUERY-RESOLVER.hpp - using PlacementIndex to resolve scope queries - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/placement-index.cpp b/src/proc/mobject/session/placement-index.cpp index 1772bae18..fab3adda6 100644 --- a/src/proc/mobject/session/placement-index.cpp +++ b/src/proc/mobject/session/placement-index.cpp @@ -1,23 +1,23 @@ /* PlacementIndex - tracking individual Placements and their relations - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/placement-index.hpp b/src/proc/mobject/session/placement-index.hpp index b94cf0e2b..51dde737d 100644 --- a/src/proc/mobject/session/placement-index.hpp +++ b/src/proc/mobject/session/placement-index.hpp @@ -1,23 +1,23 @@ /* PLACEMENT-INDEX.hpp - tracking individual Placements and their relations - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/plug.cpp b/src/proc/mobject/session/plug.cpp index ccc117510..d642ed1e3 100644 --- a/src/proc/mobject/session/plug.cpp +++ b/src/proc/mobject/session/plug.cpp @@ -1,23 +1,23 @@ /* Plug - LocatingPin for requesting connection to some Pipe - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/plug.hpp b/src/proc/mobject/session/plug.hpp index 333ee3ed8..fb0835c55 100644 --- a/src/proc/mobject/session/plug.hpp +++ b/src/proc/mobject/session/plug.hpp @@ -1,23 +1,23 @@ /* PLUG.hpp - LocatingPin for requesting connection to some Pipe - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/query-focus-stack.hpp b/src/proc/mobject/session/query-focus-stack.hpp index d58b02481..42dedc962 100644 --- a/src/proc/mobject/session/query-focus-stack.hpp +++ b/src/proc/mobject/session/query-focus-stack.hpp @@ -1,23 +1,23 @@ /* QUERY-FOCUS-STACK.hpp - management of current scope within the Session - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/query-focus.cpp b/src/proc/mobject/session/query-focus.cpp index b6bcf3bd0..2972d2f35 100644 --- a/src/proc/mobject/session/query-focus.cpp +++ b/src/proc/mobject/session/query-focus.cpp @@ -1,23 +1,23 @@ /* QueryFocus - management of current scope within the Session - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/query-focus.hpp b/src/proc/mobject/session/query-focus.hpp index 3dfe9ba04..9fc74decc 100644 --- a/src/proc/mobject/session/query-focus.hpp +++ b/src/proc/mobject/session/query-focus.hpp @@ -1,23 +1,23 @@ /* QUERY-FOCUS.hpp - management of current scope within the Session - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/query-resolver.cpp b/src/proc/mobject/session/query-resolver.cpp index 1461cf7f5..787c58f6d 100644 --- a/src/proc/mobject/session/query-resolver.cpp +++ b/src/proc/mobject/session/query-resolver.cpp @@ -1,23 +1,23 @@ /* QueryResolver - interface for discovering contents of a scope - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/query-resolver.hpp b/src/proc/mobject/session/query-resolver.hpp index 38a41d874..eedd6811a 100644 --- a/src/proc/mobject/session/query-resolver.hpp +++ b/src/proc/mobject/session/query-resolver.hpp @@ -1,23 +1,23 @@ /* QUERY-RESOLVER.hpp - interface for discovering contents of a scope - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/relativelocation.cpp b/src/proc/mobject/session/relativelocation.cpp index 7ae39ff3a..557d3b66d 100644 --- a/src/proc/mobject/session/relativelocation.cpp +++ b/src/proc/mobject/session/relativelocation.cpp @@ -1,23 +1,23 @@ /* RelativeLocation - Placement implementation attaching MObjects relative to another one - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/relativelocation.hpp b/src/proc/mobject/session/relativelocation.hpp index ff0d159f2..46b2a6d4b 100644 --- a/src/proc/mobject/session/relativelocation.hpp +++ b/src/proc/mobject/session/relativelocation.hpp @@ -1,23 +1,23 @@ /* RELATIVELOCATION.hpp - Placement implementation attaching MObjects relative to another one - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/root.cpp b/src/proc/mobject/session/root.cpp index 401a90dcb..5b6aa6290 100644 --- a/src/proc/mobject/session/root.cpp +++ b/src/proc/mobject/session/root.cpp @@ -1,28 +1,28 @@ /* Root - root element of the high-level model, global session scope - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "proc/mobject/session/root.hpp" -#include "proc/mobject/session/defsmanager.hpp" +#include "proc/mobject/session/defs-manager.hpp" namespace mobject { diff --git a/src/proc/mobject/session/root.hpp b/src/proc/mobject/session/root.hpp index 8d5b744ad..c8dc18631 100644 --- a/src/proc/mobject/session/root.hpp +++ b/src/proc/mobject/session/root.hpp @@ -1,23 +1,23 @@ /* ROOT.hpp - root element of the high-level model, global session scope - + Copyright (C) Lumiera.org 2008, Hermann Vosseler 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/scope-locator.hpp b/src/proc/mobject/session/scope-locator.hpp index 5512f3917..a3c427722 100644 --- a/src/proc/mobject/session/scope-locator.hpp +++ b/src/proc/mobject/session/scope-locator.hpp @@ -1,23 +1,23 @@ /* SCOPE-LOCATOR.hpp - management and registration point for the QueryFocus-system - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/scope-path.cpp b/src/proc/mobject/session/scope-path.cpp index c713e2fc0..5c750d920 100644 --- a/src/proc/mobject/session/scope-path.cpp +++ b/src/proc/mobject/session/scope-path.cpp @@ -1,23 +1,23 @@ /* ScopePath - logical access path down from Session root - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/scope-path.hpp b/src/proc/mobject/session/scope-path.hpp index 61799d95d..da23516d8 100644 --- a/src/proc/mobject/session/scope-path.hpp +++ b/src/proc/mobject/session/scope-path.hpp @@ -1,23 +1,23 @@ /* SCOPE-PATH.hpp - logical access path down from Session root - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file scope-path.hpp diff --git a/src/proc/mobject/session/scope-query.hpp b/src/proc/mobject/session/scope-query.hpp index f8d7e600a..166e2615a 100644 --- a/src/proc/mobject/session/scope-query.hpp +++ b/src/proc/mobject/session/scope-query.hpp @@ -1,23 +1,23 @@ /* SCOPE-QUERY.hpp - query to discover the contents of a container-like part of the model - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/scope.cpp b/src/proc/mobject/session/scope.cpp index 2143cb4f5..24b684a03 100644 --- a/src/proc/mobject/session/scope.cpp +++ b/src/proc/mobject/session/scope.cpp @@ -1,23 +1,23 @@ /* Scope - nested search scope for properties of placement - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/scope.hpp b/src/proc/mobject/session/scope.hpp index a4b9ca3fd..d3b463dc2 100644 --- a/src/proc/mobject/session/scope.hpp +++ b/src/proc/mobject/session/scope.hpp @@ -1,23 +1,23 @@ /* SCOPE.hpp - nested search scope for properties of placement - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/segment.cpp b/src/proc/mobject/session/segment.cpp index 45c593c67..07320761d 100644 --- a/src/proc/mobject/session/segment.cpp +++ b/src/proc/mobject/session/segment.cpp @@ -1,23 +1,23 @@ /* Segment - Segment of the timeline for rendering. - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "proc/mobject/session/segment.hpp" diff --git a/src/proc/mobject/session/segment.hpp b/src/proc/mobject/session/segment.hpp index 66f03b9bc..3a0835c87 100644 --- a/src/proc/mobject/session/segment.hpp +++ b/src/proc/mobject/session/segment.hpp @@ -1,23 +1,23 @@ /* SEGMENT.hpp - Segment of the timeline for rendering. - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/segmentation.cpp b/src/proc/mobject/session/segmentation.cpp index f19b8041b..b8c8fd660 100644 --- a/src/proc/mobject/session/segmentation.cpp +++ b/src/proc/mobject/session/segmentation.cpp @@ -1,23 +1,23 @@ /* Segementation - Partitioning of a timeline for organising the render graph. - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ #include "proc/mobject/session/segmentation.hpp" diff --git a/src/proc/mobject/session/segmentation.hpp b/src/proc/mobject/session/segmentation.hpp index 2decf122c..4312a6205 100644 --- a/src/proc/mobject/session/segmentation.hpp +++ b/src/proc/mobject/session/segmentation.hpp @@ -1,23 +1,23 @@ /* SEGMENTATION.hpp - Partitioning of a timeline for organising the render graph. - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/sess-manager-impl.cpp b/src/proc/mobject/session/sess-manager-impl.cpp index 51696928f..d0e4c4cc4 100644 --- a/src/proc/mobject/session/sess-manager-impl.cpp +++ b/src/proc/mobject/session/sess-manager-impl.cpp @@ -1,23 +1,23 @@ /* SessManagerImpl - global session access and lifecycle - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ @@ -40,7 +40,7 @@ #include "proc/mobject/session.hpp" #include "proc/mobject/session/sess-manager-impl.hpp" -#include "proc/mobject/session/defsmanager.hpp" +#include "proc/mobject/session/defs-manager.hpp" #include "proc/mobject/session/lifecycle-advisor.hpp" #include "proc/asset/timeline.hpp" #include "lib/error.hpp" @@ -152,6 +152,7 @@ namespace session { closeSessionInterface() { /////////////////////// TICKET #699 INFO (session, "closing session interfaces."); + TODO ("actually close session interfaces :) and don't babble in the log when NOT closing anything..."); } diff --git a/src/proc/mobject/session/sess-manager-impl.hpp b/src/proc/mobject/session/sess-manager-impl.hpp index dcd671d2f..14af631c6 100644 --- a/src/proc/mobject/session/sess-manager-impl.hpp +++ b/src/proc/mobject/session/sess-manager-impl.hpp @@ -1,23 +1,23 @@ /* SESS-MANAGER-IMPL.hpp - global session access and lifecycle - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/session-impl.cpp b/src/proc/mobject/session/session-impl.cpp index 6ce106049..e091414b2 100644 --- a/src/proc/mobject/session/session-impl.cpp +++ b/src/proc/mobject/session/session-impl.cpp @@ -1,23 +1,23 @@ /* SessionImpl - holds the complete session data to be edited by the user - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/session-impl.hpp b/src/proc/mobject/session/session-impl.hpp index c741bde80..b5416057e 100644 --- a/src/proc/mobject/session/session-impl.hpp +++ b/src/proc/mobject/session/session-impl.hpp @@ -1,23 +1,23 @@ /* SESSION-IMPL.hpp - holds the complete session data to be edited by the user - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/session-interface-modules.hpp b/src/proc/mobject/session/session-interface-modules.hpp index 437bc5663..daa05b18f 100644 --- a/src/proc/mobject/session/session-interface-modules.hpp +++ b/src/proc/mobject/session/session-interface-modules.hpp @@ -1,23 +1,23 @@ /* SESSION-INTERFACE-MODULES.hpp - composing the public session API from several interface modules - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ @@ -73,7 +73,7 @@ #include "lib/element-tracker.hpp" #include "proc/asset/timeline.hpp" #include "proc/asset/sequence.hpp" -#include "proc/mobject/session/defsmanager.hpp" +#include "proc/mobject/session/defs-manager.hpp" #include "proc/mobject/session/element-query.hpp" diff --git a/src/proc/mobject/session/session-query.hpp b/src/proc/mobject/session/session-query.hpp index 5514b9a4c..15cf82d69 100644 --- a/src/proc/mobject/session/session-query.hpp +++ b/src/proc/mobject/session/session-query.hpp @@ -1,23 +1,23 @@ /* SESSION-QUERY.hpp - querying for session contents in various ways - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/session-service-defaults.hpp b/src/proc/mobject/session/session-service-defaults.hpp index 85073e96f..70cbd1b4a 100644 --- a/src/proc/mobject/session/session-service-defaults.hpp +++ b/src/proc/mobject/session/session-service-defaults.hpp @@ -1,23 +1,23 @@ /* SESSION-SERVICE-DEFAULTS.hpp - session implementation service API: manage default objects - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/session-service-explore-scope.hpp b/src/proc/mobject/session/session-service-explore-scope.hpp index 98d998a2f..e3330fe27 100644 --- a/src/proc/mobject/session/session-service-explore-scope.hpp +++ b/src/proc/mobject/session/session-service-explore-scope.hpp @@ -1,23 +1,23 @@ /* SESSION-SERVICE-EXPLORE-SCOPE.hpp - session implementation service API: explore scope - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/session-service-fetch.hpp b/src/proc/mobject/session/session-service-fetch.hpp index 50f62c7c5..fd883dffb 100644 --- a/src/proc/mobject/session/session-service-fetch.hpp +++ b/src/proc/mobject/session/session-service-fetch.hpp @@ -1,23 +1,23 @@ /* SESSION-SERVICE-FETCH.hpp - session implementation service API: fetch PlacementRef - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/session-service-mock-index.hpp b/src/proc/mobject/session/session-service-mock-index.hpp index 4389a80f6..44d4ab446 100644 --- a/src/proc/mobject/session/session-service-mock-index.hpp +++ b/src/proc/mobject/session/session-service-mock-index.hpp @@ -1,23 +1,23 @@ /* SESSION-SERVICE-MOCK-INDEX.hpp - session service API: mock PlacementIndex for tests - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/session-service-mutate.hpp b/src/proc/mobject/session/session-service-mutate.hpp index a1cdcb4e2..dbd063592 100644 --- a/src/proc/mobject/session/session-service-mutate.hpp +++ b/src/proc/mobject/session/session-service-mutate.hpp @@ -1,23 +1,23 @@ /* SESSION-SERVICE-MUTATE.hpp - session implementation service API: add/remove session contents - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/session-services.cpp b/src/proc/mobject/session/session-services.cpp index 76ebe2d58..c75a6c9bd 100644 --- a/src/proc/mobject/session/session-services.cpp +++ b/src/proc/mobject/session/session-services.cpp @@ -1,23 +1,23 @@ /* SessionServices - accessing Proc-Layer internal session implementation services - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/session-services.hpp b/src/proc/mobject/session/session-services.hpp index 889f70cbd..a44fddae8 100644 --- a/src/proc/mobject/session/session-services.hpp +++ b/src/proc/mobject/session/session-services.hpp @@ -1,23 +1,23 @@ /* SESSION-SERVICES.hpp - accessing Proc-Layer internal session implementation services - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/session.cpp b/src/proc/mobject/session/session.cpp index ba414dc65..891ba1349 100644 --- a/src/proc/mobject/session/session.cpp +++ b/src/proc/mobject/session/session.cpp @@ -1,23 +1,23 @@ /* Session - holds the complete session to be edited by the user - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ @@ -32,7 +32,7 @@ #include "proc/mobject/session.hpp" -#include "proc/mobject/session/defsmanager.hpp" +#include "proc/mobject/session/defs-manager.hpp" #include "proc/mobject/session/session-impl.hpp" #include "proc/mobject/session/sess-manager-impl.hpp" diff --git a/src/proc/mobject/session/simpleclip.cpp b/src/proc/mobject/session/simpleclip.cpp index 97796a00e..e404532bf 100644 --- a/src/proc/mobject/session/simpleclip.cpp +++ b/src/proc/mobject/session/simpleclip.cpp @@ -1,23 +1,23 @@ /* SimpleClip - Elementary clip (single media stream only) - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/simpleclip.hpp b/src/proc/mobject/session/simpleclip.hpp index f0dc62c02..6b6c23913 100644 --- a/src/proc/mobject/session/simpleclip.hpp +++ b/src/proc/mobject/session/simpleclip.hpp @@ -1,23 +1,23 @@ /* SIMPLECLIP.hpp - Elementary clip (single media stream only) - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/specific-contents-query.hpp b/src/proc/mobject/session/specific-contents-query.hpp index 0fbf713e7..4437441bc 100644 --- a/src/proc/mobject/session/specific-contents-query.hpp +++ b/src/proc/mobject/session/specific-contents-query.hpp @@ -1,23 +1,23 @@ /* SPECIFIC-CONTENTS-QUERY.hpp - pick specific contents from the model, using a filter - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/track.cpp b/src/proc/mobject/session/track.cpp index 8d7c5eb22..73e811b90 100644 --- a/src/proc/mobject/session/track.cpp +++ b/src/proc/mobject/session/track.cpp @@ -1,23 +1,23 @@ /* Track - A grouping device within the Session. - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/track.hpp b/src/proc/mobject/session/track.hpp index 0bff48744..60fb8afa5 100644 --- a/src/proc/mobject/session/track.hpp +++ b/src/proc/mobject/session/track.hpp @@ -1,23 +1,23 @@ /* TRACK.hpp - A grouping device within the Session. - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/session/wish.cpp b/src/proc/mobject/session/wish.cpp index ddf90d307..3704c77e6 100644 --- a/src/proc/mobject/session/wish.cpp +++ b/src/proc/mobject/session/wish.cpp @@ -1,23 +1,23 @@ /* Wish - LocatingPin representing a low-priority directive - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/mobject/session/wish.hpp b/src/proc/mobject/session/wish.hpp index 7fe447e4e..ae5ffbeab 100644 --- a/src/proc/mobject/session/wish.hpp +++ b/src/proc/mobject/session/wish.hpp @@ -1,23 +1,23 @@ /* WISH.hpp - LocatingPin representing a low-priority directive - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/proc/mobject/test-dummy-mobject.hpp b/src/proc/mobject/test-dummy-mobject.hpp index 24c1df0f2..14542b629 100644 --- a/src/proc/mobject/test-dummy-mobject.hpp +++ b/src/proc/mobject/test-dummy-mobject.hpp @@ -1,23 +1,23 @@ /* TEST-DUMMY-MOBJECT.hpp - dummy MObject hierarchy for unit tests - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file test-dummy-mobject.hpp diff --git a/src/proc/play/dummy-image-generator.cpp b/src/proc/play/dummy-image-generator.cpp index 603b0d033..250549b42 100644 --- a/src/proc/play/dummy-image-generator.cpp +++ b/src/proc/play/dummy-image-generator.cpp @@ -1,24 +1,24 @@ /* DummyImageGenerator - creating test output frames for simulated playback - + Copyright (C) Lumiera.org 2009, Joel Holdsworth , Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/play/dummy-image-generator.hpp b/src/proc/play/dummy-image-generator.hpp index 17056997d..e2d70d322 100644 --- a/src/proc/play/dummy-image-generator.hpp +++ b/src/proc/play/dummy-image-generator.hpp @@ -1,24 +1,24 @@ /* DUMMY-IMAGE-GENERATOR.hpp - creating test output frames for simulated playback - + Copyright (C) Lumiera.org 2009, Joel Holdsworth , Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file dummy-image-generator.hpp diff --git a/src/proc/play/dummy-player-interface-proxy.hpp b/src/proc/play/dummy-player-interface-proxy.hpp index 05319dc27..3e4ccdcd4 100644 --- a/src/proc/play/dummy-player-interface-proxy.hpp +++ b/src/proc/play/dummy-player-interface-proxy.hpp @@ -1,23 +1,23 @@ /* DummyPlayer(Proxy) - access point and service implementing a dummy test player - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/play/dummy-player-service.cpp b/src/proc/play/dummy-player-service.cpp index 54ce69e9d..ea443f709 100644 --- a/src/proc/play/dummy-player-service.cpp +++ b/src/proc/play/dummy-player-service.cpp @@ -1,23 +1,23 @@ /* DummyPlayerService - access point and service implementing a dummy test player - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/play/dummy-player-service.hpp b/src/proc/play/dummy-player-service.hpp index 8dc1f87e8..75e0f3d78 100644 --- a/src/proc/play/dummy-player-service.hpp +++ b/src/proc/play/dummy-player-service.hpp @@ -1,23 +1,23 @@ /* DUMMY-PLAYER-SERVICE.hpp - service implementing a dummy test player - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file dummy-player-service.hpp diff --git a/src/proc/play/tick-service.hpp b/src/proc/play/tick-service.hpp index a81335913..a67116020 100644 --- a/src/proc/play/tick-service.hpp +++ b/src/proc/play/tick-service.hpp @@ -1,24 +1,24 @@ /* TICK-SERVICE.hpp - issuing timed callbacks - + Copyright (C) Lumiera.org 2009, Joel Holdsworth , Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file tick-service.hpp diff --git a/src/proc/state.cpp b/src/proc/state.cpp index fa9f32dc3..939bd6721 100644 --- a/src/proc/state.cpp +++ b/src/proc/state.cpp @@ -1,23 +1,23 @@ /* State - Key Interface representing a render process and encapsulating state - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/src/proc/state.hpp b/src/proc/state.hpp index a37e85933..ca0a6a44c 100644 --- a/src/proc/state.hpp +++ b/src/proc/state.hpp @@ -1,23 +1,23 @@ /* STATE.hpp - Key Interface representing a render process and encapsulating state - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/src/tool/luidgen.c b/src/tool/luidgen.c index 84ed75588..7452288a8 100644 --- a/src/tool/luidgen.c +++ b/src/tool/luidgen.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/15time.tests b/tests/15time.tests new file mode 100644 index 000000000..0cb57ddcc --- /dev/null +++ b/tests/15time.tests @@ -0,0 +1,6 @@ +TESTING "Time conversion" ./test-time + +TEST "basic functionality" basic < -1); + CHECK (fd > -1); printf ("got filehandle #%d\n", fd); /* put it into aging, can't use anymore */ @@ -67,7 +67,7 @@ TEST ("more") for (int i=0; i<100; ++i) { fds[i] = lumiera_file_handle_acquire (files[i]); - ENSURE (fds[i] > -1); + CHECK (fds[i] > -1); printf ("got filehandle #%d\n", fds[i]); } diff --git a/tests/backend/test-fileheader.c b/tests/backend/test-fileheader.c index 5b206c7da..b19ba5204 100644 --- a/tests/backend/test-fileheader.c +++ b/tests/backend/test-fileheader.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -56,7 +56,7 @@ TEST (create_nowrite) { lumiera_backend_init (); LumieraFile file = lumiera_file_new (",tmp-fileheader", LUMIERA_FILE_READONLY); - REQUIRE(file); + CHECK(file); LUMIERA_FILE_RDLOCK_SECTION (NOBUG_ON, file) { diff --git a/tests/backend/test-filemmap.c b/tests/backend/test-filemmap.c index c93e2543c..bd1b4ce7a 100644 --- a/tests/backend/test-filemmap.c +++ b/tests/backend/test-filemmap.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -159,7 +159,7 @@ TEST (mmap_simple) /* check that the file got truncated to the desired size */ struct stat st; stat (",tmp-filemmap", &st); - ENSURE (st.st_size == 100); + CHECK (st.st_size == 100); lumiera_backend_destroy (); lumiera_config_destroy (); @@ -179,7 +179,7 @@ TEST (mmap_checkout_twice) LumieraMMap map2 = lumiera_mmapings_mmap_acquire (mmaps, file, 0, 100); - ENSURE (map->address == map2->address); + CHECK (map->address == map2->address); lumiera_mmapings_release_mmap (mmaps, map); @@ -190,7 +190,7 @@ TEST (mmap_checkout_twice) /* check that the file got truncated to the desired size */ struct stat st; stat (",tmp-filemmap", &st); - ENSURE (st.st_size == 100); + CHECK (st.st_size == 100); lumiera_backend_destroy (); lumiera_config_destroy (); @@ -217,7 +217,7 @@ TEST (mmap_checkout_again) /* check that the file got truncated to the desired size */ struct stat st; stat (",tmp-filemmap", &st); - ENSURE (st.st_size == 100); + CHECK (st.st_size == 100); lumiera_backend_destroy (); lumiera_config_destroy (); @@ -242,7 +242,7 @@ TEST (mmap_grow_existing_file) /* check that the file got truncated to the desired size */ struct stat st; stat (",tmp-filemmap", &st); - ENSURE (st.st_size == 100); + CHECK (st.st_size == 100); lumiera_backend_destroy (); lumiera_config_destroy (); @@ -266,7 +266,7 @@ TEST (mmap_readonly_file) /* check that the file got truncated to the desired size */ struct stat st; stat (",tmp-filemmap", &st); - ENSURE (st.st_size == 100); + CHECK (st.st_size == 100); lumiera_backend_destroy (); lumiera_config_destroy (); diff --git a/tests/backend/test-resourcecollector.c b/tests/backend/test-resourcecollector.c index f0d0f5dda..6629ea2f8 100644 --- a/tests/backend/test-resourcecollector.c +++ b/tests/backend/test-resourcecollector.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -57,7 +57,7 @@ TEST (basic) TEST (memory_collection_mockup) { - REQUIRE (argv[2]); + CHECK (argv[2]); lumiera_resourcecollector_init (); lumiera_resourcecollector_register_handler (LUMIERA_RESOURCE_MEMORY, test_memory_handler, NULL); diff --git a/tests/backend/test-threadpool.c b/tests/backend/test-threadpool.c index 8173361de..ed3204a9b 100644 --- a/tests/backend/test-threadpool.c +++ b/tests/backend/test-threadpool.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/backend/test-threads.c b/tests/backend/test-threads.c index 73108ab6e..a3b3697a3 100644 --- a/tests/backend/test-threads.c +++ b/tests/backend/test-threads.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/bugs/bugmain.c b/tests/bugs/bugmain.c index 7823b279e..f932a0321 100644 --- a/tests/bugs/bugmain.c +++ b/tests/bugs/bugmain.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/common/ref-array-test.cpp b/tests/common/ref-array-test.cpp index 92e799069..b0127167f 100644 --- a/tests/common/ref-array-test.cpp +++ b/tests/common/ref-array-test.cpp @@ -1,23 +1,23 @@ /* RefArray(Test) - unittest for wrapping with array-of-refs access - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ @@ -129,12 +129,12 @@ namespace test{ RefArray & rArr (subWrap); - ASSERT (subWrap.size()==subz.size()); - ASSERT (INSTANCEOF(I, &rArr[0])); + CHECK (subWrap.size()==subz.size()); + CHECK (INSTANCEOF(I, &rArr[0])); for (size_t i=0; i & vect (subz); RefArray & rArr (subz); - ASSERT (vect.size()==subz.size()); - ASSERT (INSTANCEOF(I, &rArr[0])); + CHECK (vect.size()==subz.size()); + CHECK (INSTANCEOF(I, &rArr[0])); for (size_t i=0; i tab; // creates 20 Sub1-objects in-place // which are indeed located within the object - ASSERT (sizeof(tab) >= 20 * sizeof(Sub1)); - ASSERT (ADR(tab) < ADR(tab[19]) && ADR(tab[19]) < ADR(tab) + sizeof(tab)); + CHECK (sizeof(tab) >= 20 * sizeof(Sub1)); + CHECK (ADR(tab) < ADR(tab[19]) && ADR(tab[19]) < ADR(tab) + sizeof(tab)); RefArray & rArr (tab); - ASSERT (20 == tab.size()); - ASSERT (INSTANCEOF(I, &rArr[0])); + CHECK (20 == tab.size()); + CHECK (INSTANCEOF(I, &rArr[0])); for (size_t i=0; i theFact; RefArrayTable tab (theFact); RefArray & rArr (tab); - ASSERT (30 == tab.size()); + CHECK (30 == tab.size()); for (size_t i=0; i factory; RefArrayTable table (factory); - ASSERT (Sub3::sum == (29+1)*29/2); + CHECK (Sub3::sum == (29+1)*29/2); } - ASSERT (Sub3::sum == 0); + CHECK (Sub3::sum == 0); } catch(long id) { - ASSERT (id == Sub3::trigger); - ASSERT (Sub3::sum == id); + CHECK (id == Sub3::trigger); + CHECK (Sub3::sum == id); // meaning: all objects have been cleaned up, // with the exception of the one hitting the trigger } } diff --git a/tests/common/test-config.c b/tests/common/test-config.c index f90441a8e..e1a72636d 100644 --- a/tests/common/test-config.c +++ b/tests/common/test-config.c @@ -7,8 +7,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -39,12 +39,12 @@ TEST (init) TEST (configitem_simple) { - REQUIRE (argv[2]); + CHECK (argv[2]); LumieraConfigitem item; item = lumiera_configitem_new (argv[2]); - ENSURE (item); + CHECK (item); printf ("line = '%s'\n", item->line); if (item->key) @@ -71,10 +71,10 @@ TEST (lookup) lumiera_config_lookup_insert (&lookup, item); LumieraConfigitem found = lumiera_config_lookup_item_find (&lookup, "foo.bar"); - ENSURE (found == item); + CHECK (found == item); lumiera_config_lookup_remove (&lookup, found); - ENSURE (!lumiera_config_lookup_item_find (&lookup, "foo.bar")); + CHECK (!lumiera_config_lookup_item_find (&lookup, "foo.bar")); lumiera_config_lookup_destroy (&lookup); lumiera_config_destroy (); @@ -83,9 +83,9 @@ TEST (lookup) TEST (change_value) { - REQUIRE (argv[2]); - REQUIRE (argv[3]); - REQUIRE (argv[4]); + CHECK (argv[2]); + CHECK (argv[3]); + CHECK (argv[4]); const char* value; @@ -112,8 +112,8 @@ TEST (change_value) TEST (basic_set_get) { - REQUIRE (argv[2]); - REQUIRE (argv[3]); + CHECK (argv[2]); + CHECK (argv[3]); if (!lumiera_config_set (argv[2], argv[3])) printf ("failure setting first time '%s%s': %s\n", argv[2], argv[3], lumiera_error ()); @@ -135,8 +135,8 @@ TEST (basic_set_get) TEST (number_get) { - REQUIRE (argv[2]); - REQUIRE (argv[3]); + CHECK (argv[2]); + CHECK (argv[3]); long long number = 0; @@ -153,7 +153,7 @@ TEST (number_get) TEST (number_get_nodefault) { - REQUIRE (argv[2]); + CHECK (argv[2]); long long number = 0; @@ -168,8 +168,8 @@ TEST (number_get_nodefault) TEST (number_set) { - REQUIRE (argv[2]); - REQUIRE (argv[3]); + CHECK (argv[2]); + CHECK (argv[3]); signed long long number = atoll (argv[3]); @@ -187,8 +187,8 @@ TEST (number_set) TEST (string_get) { - REQUIRE (argv[2]); - REQUIRE (argv[3]); + CHECK (argv[2]); + CHECK (argv[3]); const char* string; @@ -205,8 +205,8 @@ TEST (string_get) TEST (string_set) { - REQUIRE (argv[2]); - REQUIRE (argv[3]); + CHECK (argv[2]); + CHECK (argv[3]); if (!lumiera_config_string_set (argv[2], &argv[3])) printf ("failed setting string '%s=%s': %s\n", argv[2], argv[3], lumiera_error ()); @@ -223,8 +223,8 @@ TEST (string_set) TEST (word_get) { - REQUIRE (argv[2]); - REQUIRE (argv[3]); + CHECK (argv[2]); + CHECK (argv[3]); const char* word; @@ -241,8 +241,8 @@ TEST (word_get) TEST (word_set) { - REQUIRE (argv[2]); - REQUIRE (argv[3]); + CHECK (argv[2]); + CHECK (argv[3]); if (!lumiera_config_word_set (argv[2], &argv[3])) printf ("failed setting word '%s=%s': %s\n", argv[2], argv[3], lumiera_error ()); @@ -259,7 +259,7 @@ TEST (word_set) TEST (configitem_simple_ctor_dtor) { - REQUIRE (argv[2]); + CHECK (argv[2]); LumieraConfigitem item; @@ -271,7 +271,7 @@ TEST (configitem_simple_ctor_dtor) TEST (configitem_simple_content_check) { - REQUIRE (argv[2]); + CHECK (argv[2]); LumieraConfigitem item; @@ -300,9 +300,9 @@ TEST (configitem_simple_content_check) TEST (wordlist_get_nth) { - REQUIRE (argv[2]); - REQUIRE (argv[3]); - REQUIRE (argv[4]); + CHECK (argv[2]); + CHECK (argv[3]); + CHECK (argv[4]); if (!lumiera_config_wordlist_set (argv[2], &argv[3])) printf ("failed setting word '%s=%s': %s\n", argv[2], argv[3], lumiera_error ()); @@ -317,9 +317,9 @@ TEST (wordlist_get_nth) TEST (wordlist_find) { - REQUIRE (argv[2]); - REQUIRE (argv[3]); - REQUIRE (argv[4]); + CHECK (argv[2]); + CHECK (argv[3]); + CHECK (argv[4]); if (!lumiera_config_wordlist_set (argv[2], &argv[3])) printf ("failed setting word '%s=%s': %s\n", argv[2], argv[3], lumiera_error ()); @@ -334,11 +334,11 @@ TEST (wordlist_find) TEST (wordlist_replace) { - REQUIRE (argv[2]); - REQUIRE (argv[3]); - REQUIRE (argv[4]); - REQUIRE (argv[5]); - REQUIRE (argv[6]); + CHECK (argv[2]); + CHECK (argv[3]); + CHECK (argv[4]); + CHECK (argv[5]); + CHECK (argv[6]); if (!lumiera_config_wordlist_set (argv[2], &argv[3])) printf ("failed setting word '%s=%s': %s\n", argv[2], argv[3], lumiera_error ()); @@ -356,10 +356,10 @@ TEST (wordlist_replace) TEST (wordlist_add) { - REQUIRE (argv[2]); - REQUIRE (argv[3]); - REQUIRE (argv[4]); - REQUIRE (argv[5]); + CHECK (argv[2]); + CHECK (argv[3]); + CHECK (argv[4]); + CHECK (argv[5]); if (!lumiera_config_wordlist_set (argv[2], &argv[3])) printf ("failed setting word '%s=%s': %s\n", argv[2], argv[3], lumiera_error ()); diff --git a/tests/common/test-interfaces.c b/tests/common/test-interfaces.c index 5616369d0..93440a530 100644 --- a/tests/common/test-interfaces.c +++ b/tests/common/test-interfaces.c @@ -6,8 +6,8 @@ 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/components/Makefile.am b/tests/components/Makefile.am index ea5d1fddb..2de68311a 100644 --- a/tests/components/Makefile.am +++ b/tests/components/Makefile.am @@ -73,6 +73,9 @@ test_components_SOURCES = \ $(testcomponents_srcdir)/proc/engine/node-source-test.cpp \ $(testcomponents_srcdir)/proc/mobject/builder/buildertooltest.cpp \ $(testcomponents_srcdir)/proc/mobject/builder/buildsegmenttest.cpp \ + $(testcomponents_srcdir)/proc/mobject/builder/model-port-registry-test.cpp \ + $(testcomponents_srcdir)/proc/mobject/builder/fixture-change-detector-test.cpp \ + $(testcomponents_srcdir)/proc/mobject/builder/segmentation-datastructure-test.cpp\ $(testcomponents_srcdir)/proc/mobject/controller/rendersegmenttest.cpp \ $(testcomponents_srcdir)/proc/mobject/mobject-interface-test.cpp \ $(testcomponents_srcdir)/proc/mobject/mobject-ref-test.cpp \ @@ -82,9 +85,9 @@ test_components_SOURCES = \ $(testcomponents_srcdir)/proc/mobject/placement-object-identity-test.cpp \ $(testcomponents_srcdir)/proc/mobject/placement-ref-test.cpp \ $(testcomponents_srcdir)/proc/mobject/session/addcliptest.cpp \ - $(testcomponents_srcdir)/proc/mobject/session/defsmanagerimpltest.cpp \ - $(testcomponents_srcdir)/proc/mobject/session/defsmanagertest.cpp \ - $(testcomponents_srcdir)/proc/mobject/session/defsregistryimpltest.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/defs-manager-impl-test.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/defs-manager-test.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/defs-registry-impl-test.cpp \ $(testcomponents_srcdir)/proc/mobject/session/deletecliptest.cpp \ $(testcomponents_srcdir)/proc/mobject/session/placement-index-query-test.cpp \ $(testcomponents_srcdir)/proc/mobject/session/placement-index-test.cpp \ diff --git a/tests/components/backend/mediaaccessmock.cpp b/tests/components/backend/mediaaccessmock.cpp index 820b5487a..e15a2213c 100644 --- a/tests/components/backend/mediaaccessmock.cpp +++ b/tests/components/backend/mediaaccessmock.cpp @@ -1,23 +1,23 @@ /* MediaAccessMock.hpp - a test (stub) target object for testing the factories - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/tests/components/backend/mediaaccessmock.hpp b/tests/components/backend/mediaaccessmock.hpp index 4199b29f8..e48733bc1 100644 --- a/tests/components/backend/mediaaccessmock.hpp +++ b/tests/components/backend/mediaaccessmock.hpp @@ -1,23 +1,23 @@ /* MEDIAACCESSMOCK.hpp - a test (stub) target object for testing the factories - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/tests/components/backend/mediaaccessmocktest.cpp b/tests/components/backend/mediaaccessmocktest.cpp index a81f6fe8f..60d770b89 100644 --- a/tests/components/backend/mediaaccessmocktest.cpp +++ b/tests/components/backend/mediaaccessmocktest.cpp @@ -1,23 +1,23 @@ /* MediaAccessMock(Test) - checking our Test Mock replacing the MediaAccessFacade - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/tests/components/proc/asset/asset-category-test.cpp b/tests/components/proc/asset/asset-category-test.cpp index a211cd963..bc0676011 100644 --- a/tests/components/proc/asset/asset-category-test.cpp +++ b/tests/components/proc/asset/asset-category-test.cpp @@ -1,23 +1,23 @@ /* AssetCategory(Test) - verifying Asset category tuple functions - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ @@ -82,16 +82,16 @@ namespace test { Category c3 (VIDEO,"bin1/subbin"); Category c4 (EFFECT,"some_kind"); - ASSERT ( c1.hasKind(VIDEO) ); - ASSERT (!c1.hasKind(AUDIO) ); - ASSERT ( c2.isWithin(c1) ); - ASSERT ( c3.isWithin(c2) ); - ASSERT ( c3.isWithin(c1) ); - ASSERT (!c1.isWithin(c2) ); - ASSERT (!c2.isWithin(c3) ); - ASSERT (!c1.isWithin(c3) ); - ASSERT (!c3.isWithin(c4) ); - ASSERT (!c4.isWithin(c3) ); + CHECK ( c1.hasKind(VIDEO) ); + CHECK (!c1.hasKind(AUDIO) ); + CHECK ( c2.isWithin(c1) ); + CHECK ( c3.isWithin(c2) ); + CHECK ( c3.isWithin(c1) ); + CHECK (!c1.isWithin(c2) ); + CHECK (!c2.isWithin(c3) ); + CHECK (!c1.isWithin(c3) ); + CHECK (!c3.isWithin(c4) ); + CHECK (!c4.isWithin(c3) ); } @@ -104,30 +104,30 @@ namespace test { Category c5 (STRUCT); Category c6 (META); - ASSERT (0 > c1.compare(c2)); - ASSERT (0 > c2.compare(c3)); - ASSERT (0 > c3.compare(c4)); - ASSERT (0 > c4.compare(c5)); - ASSERT (0 > c5.compare(c6)); + CHECK (0 > c1.compare(c2)); + CHECK (0 > c2.compare(c3)); + CHECK (0 > c3.compare(c4)); + CHECK (0 > c4.compare(c5)); + CHECK (0 > c5.compare(c6)); - ASSERT (0 ==c1.compare(c1)); - ASSERT (0 > c1.compare(c6)); + CHECK (0 ==c1.compare(c1)); + CHECK (0 > c1.compare(c6)); Category c21 (VIDEO,"bin1"); Category c22 (VIDEO,"bin2"); Category c23 (VIDEO,"bin2/sub"); - ASSERT (0 > c1.compare(c21)); - ASSERT (0 > c2.compare(c21)); - ASSERT (0 < c22.compare(c21)); - ASSERT (0 < c23.compare(c22)); - ASSERT (0 < c23.compare(c21)); - ASSERT ( 0==c22.compare(c22)); + CHECK (0 > c1.compare(c21)); + CHECK (0 > c2.compare(c21)); + CHECK (0 < c22.compare(c21)); + CHECK (0 < c23.compare(c22)); + CHECK (0 < c23.compare(c21)); + CHECK ( 0==c22.compare(c22)); - ASSERT ( c2 == c2 ); - ASSERT ( c2 != c22 ); - ASSERT ( c2 != c3 ); + CHECK ( c2 == c2 ); + CHECK ( c2 != c22 ); + CHECK ( c2 != c3 ); } }; diff --git a/tests/components/proc/asset/asset-diagnostics.hpp b/tests/components/proc/asset/asset-diagnostics.hpp index 856f131b3..08619bbba 100644 --- a/tests/components/proc/asset/asset-diagnostics.hpp +++ b/tests/components/proc/asset/asset-diagnostics.hpp @@ -1,23 +1,23 @@ /* ASSET-DIAGNOSTICS.hpp - collection of test and debug helpers - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ /** @file asset-diagnostics.hpp diff --git a/tests/components/proc/asset/basicpipetest.cpp b/tests/components/proc/asset/basicpipetest.cpp index 70f644ed1..6084dba5e 100644 --- a/tests/components/proc/asset/basicpipetest.cpp +++ b/tests/components/proc/asset/basicpipetest.cpp @@ -1,23 +1,23 @@ /* BasicPipe(Test) - checking the basic properties of Pipe Assets - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ @@ -42,13 +42,13 @@ using std::string; using std::cout; -namespace asset - { - namespace test - { +namespace asset { +namespace test { + using mobject::Session; using lumiera::Query; using lumiera::query::normaliseID; + using lumiera::StreamType; @@ -81,25 +81,25 @@ namespace asset { string pID_sane (pID); normaliseID (pID_sane); - ASSERT (pID_sane != pID); + CHECK (pID_sane != pID); PPipe thePipe = asset::Struct::retrieve.newPipe (pID,sID); - ASSERT (thePipe); - ASSERT (thePipe->getProcPatt()); - ASSERT (thePipe->getPipeID() == pID_sane); - ASSERT (thePipe->getStreamID() == sID); - ASSERT (thePipe->shortDesc == pID_sane); + CHECK (thePipe); + CHECK (thePipe->getProcPatt()); + CHECK (thePipe->getPipeID() == pID_sane); + CHECK (thePipe->getStreamID() == StreamType::ID(sID)); + CHECK (thePipe->shortDesc == pID_sane); Asset::Ident idi = thePipe->ident; - ASSERT (idi.org == "lumi"); - ASSERT (contains (idi.name, thePipe->getPipeID())); - ASSERT (contains (idi.name, thePipe->getStreamID())); + CHECK (idi.org == "lumi"); + CHECK (contains (idi.name, thePipe->getPipeID())); + CHECK (contains (idi.name, thePipe->getStreamID())); Category cat (idi.category); Category refcat (STRUCT,"pipes"); - ASSERT ( cat.hasKind(STRUCT) ); - ASSERT ( cat.isWithin(refcat) ); + CHECK ( cat.hasKind(STRUCT) ); + CHECK ( cat.isWithin(refcat) ); } @@ -108,20 +108,20 @@ namespace asset normaliseID (pID); PPipe pipe1 = Pipe::query ("pipe("+pID+")"); - ASSERT (pipe1); - ASSERT (pipe1->getPipeID() == pID); + CHECK (pipe1); + CHECK (pipe1->getPipeID() == pID); string pID2 = "another-" + pID; PPipe pipe2 = Pipe::query ("pipe("+pID2+")"); - ASSERT (pipe2); - ASSERT (pipe2 != pipe1); + CHECK (pipe2); + CHECK (pipe2 != pipe1); Category c1 = pipe1->ident.category; Category c2 = pipe2->ident.category; - ASSERT (c1 == c2); + CHECK (c1 == c2); PPipe pipe3 = Pipe::query ("pipe("+pID2+")"); //////////////////////////////////////////////////////////////TODO: that's broken; creating a new one instead to find the existing one, as it should be - ASSERT (pipe3 == pipe2); + CHECK (pipe3 == pipe2); } @@ -129,26 +129,26 @@ namespace asset { PPipe pipe1 = Pipe::query (""); // "the default pipe" PPipe pipe2; - ASSERT (pipe1); - ASSERT (pipe1 == Session::current->defaults (Query())); - ASSERT (pipe1->ident.category.hasKind(VIDEO)); - ASSERT (pipe1->getProcPatt()); + CHECK (pipe1); + CHECK (pipe1 == Session::current->defaults (Query())); + CHECK (pipe1->ident.category.hasKind(VIDEO)); + CHECK (pipe1->getProcPatt()); PProcPatt propa = Session::current->defaults (Query("pipe(default)")); - ASSERT (propa == pipe1->getProcPatt()); + CHECK (propa == pipe1->getProcPatt()); // several variants to query for "the default pipe" pipe2 = Session::current->defaults(Query ()); - ASSERT (pipe2 == pipe1); + CHECK (pipe2 == pipe1); pipe2 = asset::Struct::retrieve (Query ()); - ASSERT (pipe2 == pipe1); + CHECK (pipe2 == pipe1); pipe2 = asset::Struct::retrieve (Query ("pipe(default)")); - ASSERT (pipe2 == pipe1); + CHECK (pipe2 == pipe1); string sID = pipe1->getStreamID(); // sort of a "default stream type" PPipe pipe3 = Pipe::query ("stream("+sID+")"); - ASSERT (pipe3); - ASSERT (pipe3->getStreamID() == sID); - ASSERT (pipe3->getProcPatt() == Session::current->defaults (Query("stream("+sID+")"))); + CHECK (pipe3); + CHECK (pipe3->getStreamID() == StreamType::ID(sID)); + CHECK (pipe3->getProcPatt() == Session::current->defaults (Query("stream("+sID+")"))); } @@ -158,46 +158,46 @@ namespace asset typedef P PProcPatt; PPipe thePipe = Pipe::query ("pipe("+pID+")"); - ASSERT (thePipe); + CHECK (thePipe); PProcPatt thePatt = thePipe->getProcPatt(); - ASSERT (thePatt); - ASSERT (dependencyCheck (thePipe, thePatt)); + CHECK (thePatt); + CHECK (dependencyCheck (thePipe, thePatt)); PProcPatt pattern2 = thePatt->newCopy("another"); - ASSERT (thePatt != pattern2); - ASSERT (!dependencyCheck (thePipe, pattern2)); + CHECK (thePatt != pattern2); + CHECK (!dependencyCheck (thePipe, pattern2)); TODO ("add something to the new pattern, e.g. an effect"); // now querying for a pipe using this pattern (created on-the-fly) // note: because the pattern is new, this new pipe will be used as // default pipe for this pattern automatically PPipe pipe2x = Pipe::query ("pattern(another)"); - ASSERT (pattern2 == pipe2x->getProcPatt()); - ASSERT (pipe2x == Session::current->defaults (Query("pattern(another)"))); + CHECK (pattern2 == pipe2x->getProcPatt()); + CHECK (pipe2x == Session::current->defaults (Query("pattern(another)"))); thePipe->switchProcPatt(pattern2); - ASSERT ( dependencyCheck (thePipe, pattern2)); - ASSERT (!dependencyCheck (thePipe, thePatt)); + CHECK ( dependencyCheck (thePipe, pattern2)); + CHECK (!dependencyCheck (thePipe, thePatt)); AssetManager& aMang = AssetManager::instance(); - ASSERT ( aMang.known (thePipe->getID())); - ASSERT ( aMang.known (thePatt->getID())); - ASSERT ( aMang.known (pattern2->getID())); + CHECK ( aMang.known (thePipe->getID())); + CHECK ( aMang.known (thePatt->getID())); + CHECK ( aMang.known (pattern2->getID())); aMang.remove (pattern2->getID()); - ASSERT ( aMang.known (thePatt->getID())); - ASSERT (!aMang.known (pattern2->getID())); - ASSERT (!aMang.known (thePipe->getID())); // has been unlinked too, because dependant on pattern2 + CHECK ( aMang.known (thePatt->getID())); + CHECK (!aMang.known (pattern2->getID())); + CHECK (!aMang.known (thePipe->getID())); // has been unlinked too, because dependant on pattern2 - ASSERT (thePipe); + CHECK (thePipe); PProcPatt pattern3 = thePipe->getProcPatt(); /////TODO: transition to P<> - ASSERT (thePipe->getProcPatt()); - ASSERT ( pattern3 == pattern2); // but is still valid, as long as the ref is alive.... + CHECK (thePipe->getProcPatt()); + CHECK ( pattern3 == pattern2); // but is still valid, as long as the ref is alive.... PPipe pipe3x = Pipe::query ("pattern(another)"); pattern3 = pipe3x->getProcPatt(); /////TODO: transition to P<> - ASSERT (pattern3 != pattern2); // because pattern2 is already unlinked... - ASSERT (pipe3x == Session::current->defaults (Query("pattern(another)"))); - ASSERT (pipe3x != pipe2x); // ..we got a new default pipe for "pattern(another)" too! + CHECK (pattern3 != pattern2); // because pattern2 is already unlinked... + CHECK (pipe3x == Session::current->defaults (Query("pattern(another)"))); + CHECK (pipe3x != pipe2x); // ..we got a new default pipe for "pattern(another)" too! TRACE (asset_mem, "leaving BasicPipe_test::dependProcPatt()"); diff --git a/tests/components/proc/asset/compoundmediatest.cpp b/tests/components/proc/asset/compoundmediatest.cpp index d3a2324f8..f7bf248d0 100644 --- a/tests/components/proc/asset/compoundmediatest.cpp +++ b/tests/components/proc/asset/compoundmediatest.cpp @@ -1,23 +1,23 @@ /* CompoundMedia(Test) - handling multichannel Media Assets - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/tests/components/proc/asset/create-asset-test.cpp b/tests/components/proc/asset/create-asset-test.cpp index cec6d97ef..716155f7d 100644 --- a/tests/components/proc/asset/create-asset-test.cpp +++ b/tests/components/proc/asset/create-asset-test.cpp @@ -1,23 +1,23 @@ /* CreateAsset(Test) - constructing and registering Assets - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ @@ -37,168 +37,168 @@ using std::string; namespace asset { namespace test { - - - - + + + + /*********************************************************************** * @test creating new Assets and registering them with the AssetManager. * @see proc_interface::AssetManager#reg */ class CreateAsset_test : public Test { - virtual void run(Arg arg) + virtual void run(Arg arg) { createMedia(); factoryVariants(); - + if (!isnil (arg)) dumpAssetManager(); TRACE (asset_mem, "leaving CreateAsset_test::run()"); } - - + + ////////////////////////////////////TICKET #589 typedef P PM; /////TODO: transition to P<> - + /** @test Creating and automatically registering Asset instances. * Re-Retrieving the newly created objects from AssetManager. - * Checking AssetManager access functions, esp. getting + * Checking AssetManager access functions, esp. getting * different kinds of Assets by ID, querying with the - * wrong Category and querying unknown IDs. + * wrong Category and querying unknown IDs. */ void createMedia() - { + { Category cat(VIDEO,"bin1"); Asset::Ident key("Name-1", cat, "ichthyo", 5); PM mm1 = asset::Media::create(key,"testfile.mov"); PM mm2 = asset::Media::create("testfile1.mov", cat); PM mm3 = asset::Media::create("testfile2.mov", VIDEO); - + // Assets have been registered and can be retrieved by ID AssetManager& aMang = AssetManager::instance(); PM registered; /////TODO: transition to P<> registered = aMang.getAsset (mm1->getID()); - ASSERT (registered == mm1); + CHECK (registered == mm1); registered = aMang.getAsset (mm2->getID()); - ASSERT (registered == mm2); + CHECK (registered == mm2); registered = aMang.getAsset (mm3->getID()); - ASSERT (registered == mm3); - + CHECK (registered == mm3); + registered = aMang.getAsset (mm1->getID()); - ASSERT (registered != mm2); -/* + CHECK (registered != mm2); +/* * TODO: switch back to original version * once the transition to P is done... -* - ASSERT (aMang.getAsset (mm1->getID()) == mm1); - ASSERT (aMang.getAsset (mm2->getID()) == mm2); - ASSERT (aMang.getAsset (mm3->getID()) == mm3); - - ASSERT (aMang.getAsset (mm1->getID()) != mm2); -*/ +* + CHECK (aMang.getAsset (mm1->getID()) == mm1); + CHECK (aMang.getAsset (mm2->getID()) == mm2); + CHECK (aMang.getAsset (mm3->getID()) == mm3); + + CHECK (aMang.getAsset (mm1->getID()) != mm2); +*/ PAsset aa1 = aMang.getAsset (ID(mm1->getID())); // note we get an Asset ref - ASSERT (aa1 == mm1); + CHECK (aa1 == mm1); PM mX1 = aMang.getAsset (mm1->getID()); // ..and now we get a Media ref - ASSERT (mX1 == mm1); - ASSERT (mX1 == aa1); - - ASSERT (aMang.known (mm1->getID())); - ASSERT (aMang.known (mm2->getID())); - ASSERT (aMang.known (mm3->getID())); - - ASSERT ( !aMang.known (mm3->getID(), Category(AUDIO))); // not found within AUDIO-Category - try - { // can't be found if specifying wrong Asset kind.... + CHECK (mX1 == mm1); + CHECK (mX1 == aa1); + + CHECK (aMang.known (mm1->getID())); + CHECK (aMang.known (mm2->getID())); + CHECK (aMang.known (mm3->getID())); + + CHECK ( !aMang.known (mm3->getID(), Category(AUDIO))); // not found within AUDIO-Category + try + { // can't be found if specifying wrong Asset kind.... aMang.getAsset (ID(mm1->getID())); NOTREACHED(); } - catch (lumiera::error::Invalid& xxx) {ASSERT (xxx.getID()==LUMIERA_ERROR_WRONG_ASSET_KIND);} - try - { // try accessing nonexistent ID + catch (lumiera::error::Invalid& xxx) {CHECK (xxx.getID()==LUMIERA_ERROR_WRONG_ASSET_KIND);} + try + { // try accessing nonexistent ID aMang.getAsset (ID (1234567890)); NOTREACHED(); } - catch (lumiera::error::Invalid& xxx) {ASSERT (xxx.getID()==LUMIERA_ERROR_UNKNOWN_ASSET_ID);} + catch (lumiera::error::Invalid& xxx) {CHECK (xxx.getID()==LUMIERA_ERROR_UNKNOWN_ASSET_ID);} lumiera_error (); // reset errorflag - - + + // checking the Ident-Fields - ASSERT (mm1->ident.name == "Name-1"); - ASSERT (mm2->ident.name == "testfile1"); - ASSERT (mm3->ident.name == "testfile2"); - - ASSERT (cat == Category (VIDEO,"bin1")); - ASSERT (mm1->ident.category == Category (VIDEO,"bin1")); - ASSERT (mm2->ident.category == Category (VIDEO,"bin1")); - ASSERT (mm3->ident.category == Category (VIDEO )); - - ASSERT (mm1->ident.org == "ichthyo"); - ASSERT (mm2->ident.org == "lumi"); - ASSERT (mm3->ident.org == "lumi"); - - ASSERT (mm1->ident.version == 5); - ASSERT (mm2->ident.version == 1); - ASSERT (mm3->ident.version == 1); - - ASSERT (mm1->getFilename() == "testfile.mov"); - ASSERT (mm2->getFilename() == "testfile1.mov"); - ASSERT (mm3->getFilename() == "testfile2.mov"); - - + CHECK (mm1->ident.name == "Name-1"); + CHECK (mm2->ident.name == "testfile1"); + CHECK (mm3->ident.name == "testfile2"); + + CHECK (cat == Category (VIDEO,"bin1")); + CHECK (mm1->ident.category == Category (VIDEO,"bin1")); + CHECK (mm2->ident.category == Category (VIDEO,"bin1")); + CHECK (mm3->ident.category == Category (VIDEO )); + + CHECK (mm1->ident.org == "ichthyo"); + CHECK (mm2->ident.org == "lumi"); + CHECK (mm3->ident.org == "lumi"); + + CHECK (mm1->ident.version == 5); + CHECK (mm2->ident.version == 1); + CHECK (mm3->ident.version == 1); + + CHECK (mm1->getFilename() == "testfile.mov"); + CHECK (mm2->getFilename() == "testfile1.mov"); + CHECK (mm3->getFilename() == "testfile2.mov"); + + TRACE (asset_mem, "leaving test method scope"); } - - + + /** @test different variants of calling the MediaFactory, - * with focus on the behaviour of the basic Asset - * creation machinery. Covers filling out Asset's + * with focus on the behaviour of the basic Asset + * creation machinery. Covers filling out Asset's * datafields, amending missing pieces of information. */ void factoryVariants() - { + { PM candi; - + Asset::Ident key1("Au-1", Category(AUDIO), "ichthyo", 5); candi = asset::Media::create(key1); - ASSERT ( checkProperties (candi, key1, "")); - + CHECK ( checkProperties (candi, key1, "")); + candi = asset::Media::create(key1, string("testfile.wav")); - ASSERT ( checkProperties (candi, key1, "testfile.wav")); - + CHECK ( checkProperties (candi, key1, "testfile.wav")); + Asset::Ident key2("", Category(AUDIO), "ichthyo", 5); candi = asset::Media::create(key2, string("testfile2.wav")); - ASSERT ( checkProperties (candi, key2, "testfile2.wav")); - ASSERT (key2.name == "testfile2"); // name filled in automatically - + CHECK ( checkProperties (candi, key2, "testfile2.wav")); + CHECK (key2.name == "testfile2"); // name filled in automatically + candi = asset::Media::create(string("testfile3.wav"), Category(AUDIO)); - ASSERT ( checkProperties (candi, Asset::Ident("testfile3", Category(AUDIO), "lumi", 1) + CHECK ( checkProperties (candi, Asset::Ident("testfile3", Category(AUDIO), "lumi", 1) , "testfile3.wav")); - + candi = asset::Media::create("some/path/testfile4.wav", Category(AUDIO)); - ASSERT ( checkProperties (candi, Asset::Ident("testfile4", Category(AUDIO), "lumi", 1) + CHECK ( checkProperties (candi, Asset::Ident("testfile4", Category(AUDIO), "lumi", 1) , "some/path/testfile4.wav")); - + candi = asset::Media::create("", Category(AUDIO,"sub/bin")); - ASSERT ( checkProperties (candi, Asset::Ident("nil", Category(AUDIO,"sub/bin"), "lumi", 1) + CHECK ( checkProperties (candi, Asset::Ident("nil", Category(AUDIO,"sub/bin"), "lumi", 1) , "")); - + candi = asset::Media::create("", AUDIO); - ASSERT ( checkProperties (candi, Asset::Ident("nil", Category(AUDIO), "lumi", 1) + CHECK ( checkProperties (candi, Asset::Ident("nil", Category(AUDIO), "lumi", 1) , "")); } - + bool checkProperties (PM object, Asset::Ident identity, string filename) { - return identity == object->ident + return identity == object->ident && filename == object->getFilename(); } }; - - + + /** Register this test class... */ LAUNCHER (CreateAsset_test, "unit asset"); - - - + + + }} // namespace asset::test diff --git a/tests/components/proc/asset/deleteassettest.cpp b/tests/components/proc/asset/deleteassettest.cpp index d8c79f761..b47a93755 100644 --- a/tests/components/proc/asset/deleteassettest.cpp +++ b/tests/components/proc/asset/deleteassettest.cpp @@ -1,23 +1,23 @@ /* DeleteAsset(Test) - deleting and Asset with all dependencies - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/tests/components/proc/asset/dependent-assets-test.cpp b/tests/components/proc/asset/dependent-assets-test.cpp index e2234602d..65783b20c 100644 --- a/tests/components/proc/asset/dependent-assets-test.cpp +++ b/tests/components/proc/asset/dependent-assets-test.cpp @@ -1,23 +1,23 @@ /* DependentAssets(Test) - check the asset dependency handling - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ @@ -35,10 +35,10 @@ using util::isnil; namespace asset{ namespace test { - - - - + + + + /******************************************************************* * @test the handling of Assets dependent on other Assets and the * enabling/disabling of Assets. @@ -47,142 +47,142 @@ namespace test { */ class DependentAssets_test : public Test { - virtual void run (Arg) + virtual void run (Arg) { checkDependencyMechanics (); checkUnlinking (); checkEnablementPropagation (); checkRealAssetDependencyRegistration (); } - + typedef TestAsset TA; typedef TA::PA PTestA; - - + + /** @test check operation of basic asset dependency support */ void checkDependencyMechanics () { PAsset a1 = TA::create(); - ASSERT (isnil (a1->getParents())); - ASSERT (isnil (a1->getDependant())); - + CHECK (isnil (a1->getParents())); + CHECK (isnil (a1->getDependant())); + PTestA a2 = TA::create(a1); - ASSERT (a1 == a2->getParents()[0]); // TestAsset registered a1 as parent - ASSERT (a2 == a1->getDependant()[0]); - + CHECK (a1 == a2->getParents()[0]); // TestAsset registered a1 as parent + CHECK (a2 == a1->getDependant()[0]); + PAsset a3 = TA::create(); a2->set_depend(a3); - ASSERT (a3 == a2->getParents()[1]); - ASSERT (a2 == a3->getDependant()[0]); - ASSERT (!contains (a1->getDependant(), a3)); + CHECK (a3 == a2->getParents()[1]); + CHECK (a2 == a3->getDependant()[0]); + CHECK (!contains (a1->getDependant(), a3)); } - - + + /** @test unlink operation removing inter asset links */ void checkUnlinking () { PTestA a1_ = TA::create(); PAsset a1 (a1_); - PTestA a2_ = TA::create(a1); - PAsset a2 (a2_); - PAsset a3 = TA::create(a2); - ASSERT (a1 == a2->getParents()[0]); - ASSERT (a2 == a1->getDependant()[0]); - ASSERT (a2 == a3->getParents()[0]); - ASSERT (a3 == a2->getDependant()[0]); - + PTestA a2_ = TA::create(a1); + PAsset a2 (a2_); + PAsset a3 = TA::create(a2); + CHECK (a1 == a2->getParents()[0]); + CHECK (a2 == a1->getDependant()[0]); + CHECK (a2 == a3->getParents()[0]); + CHECK (a3 == a2->getDependant()[0]); + a2_->call_unlink(); - ASSERT (isnil (a2->getDependant())); - ASSERT (!contains (a1->getDependant(), a2)); // has been propagated up - ASSERT (!isnil (a2->getParents())); - ASSERT (contains (a3->getParents(), a2)); // but up-links remain intact - + CHECK (isnil (a2->getDependant())); + CHECK (!contains (a1->getDependant(), a2)); // has been propagated up + CHECK (!isnil (a2->getParents())); + CHECK (contains (a3->getParents(), a2)); // but up-links remain intact + a2_->call_unlink(a1->getID()); a2_->set_depend(a1); PAsset a4 = TA::create(a1); - ASSERT (a1 == a2->getParents()[0]); - ASSERT (a1 == a4->getParents()[0]); - ASSERT (a2 == a1->getDependant()[0]); - ASSERT (a4 == a1->getDependant()[1]); - + CHECK (a1 == a2->getParents()[0]); + CHECK (a1 == a4->getParents()[0]); + CHECK (a2 == a1->getDependant()[0]); + CHECK (a4 == a1->getDependant()[1]); + a1_->call_unlink(a4->getID()); - ASSERT (!contains (a1->getDependant(), a4)); // selectively removed - ASSERT ( contains (a1->getDependant(), a2)); - ASSERT (a1 == a4->getParents()[0]); // no propagation + CHECK (!contains (a1->getDependant(), a4)); // selectively removed + CHECK ( contains (a1->getDependant(), a2)); + CHECK (a1 == a4->getParents()[0]); // no propagation } - - - /** @test enabling and disabling an asset should + + + /** @test enabling and disabling an asset should * propagate to dependant assets */ void checkEnablementPropagation () { PAsset a1 = TA::create(); - PTestA a2_= TA::create(a1); + PTestA a2_= TA::create(a1); PAsset a2 (a2_); PAsset a3 = TA::create(); // not dependant - - ASSERT (a1->isActive()); - ASSERT (a2->isActive()); - ASSERT (a3->isActive()); - + + CHECK (a1->isActive()); + CHECK (a2->isActive()); + CHECK (a3->isActive()); + a1->enable(false); - ASSERT (!a1->isActive()); - ASSERT (!a2->isActive()); - ASSERT (a3->isActive()); - + CHECK (!a1->isActive()); + CHECK (!a2->isActive()); + CHECK (a3->isActive()); + a2->enable(true); - ASSERT (!a1->isActive()); - ASSERT (!a2->isActive()); // ignored because parent is disabled - + CHECK (!a1->isActive()); + CHECK (!a2->isActive()); // ignored because parent is disabled + a1->enable(true); - ASSERT (a1->isActive()); - ASSERT (a2->isActive()); - + CHECK (a1->isActive()); + CHECK (a2->isActive()); + a2->enable(false); - ASSERT (a1->isActive()); - ASSERT (!a2->isActive()); // disabling not propagated to parent + CHECK (a1->isActive()); + CHECK (!a2->isActive()); // disabling not propagated to parent a2->enable(true); - ASSERT (a1->isActive()); - ASSERT (a2->isActive()); - + CHECK (a1->isActive()); + CHECK (a2->isActive()); + a3->enable(false); - ASSERT (a1->isActive()); - ASSERT (a2->isActive()); - ASSERT (!a3->isActive()); // no dependency... - + CHECK (a1->isActive()); + CHECK (a2->isActive()); + CHECK (!a3->isActive()); // no dependency... + a1->enable(false); a3->enable(); - ASSERT (!a1->isActive()); - ASSERT (!a2->isActive()); - ASSERT (a3->isActive()); - + CHECK (!a1->isActive()); + CHECK (!a2->isActive()); + CHECK (a3->isActive()); + a1->enable(); a2_->set_depend(a3); // now add a new parent dependency a3->enable(false); - ASSERT (a1->isActive()); - ASSERT (!a2->isActive()); // has been propagated via the new dependency - ASSERT (!a3->isActive()); - + CHECK (a1->isActive()); + CHECK (!a2->isActive()); // has been propagated via the new dependency + CHECK (!a3->isActive()); + a2->enable(true); - ASSERT (a1->isActive()); // no change because one of the parents is disbled - ASSERT (!a2->isActive()); - ASSERT (!a3->isActive()); + CHECK (a1->isActive()); // no change because one of the parents is disbled + CHECK (!a2->isActive()); + CHECK (!a3->isActive()); a1->enable(false); - ASSERT (!a1->isActive()); + CHECK (!a1->isActive()); a3->enable(true); - ASSERT (!a1->isActive()); // no propagation because the disabled other parent (a1) - ASSERT (!a2->isActive()); - ASSERT (a3->isActive()); + CHECK (!a1->isActive()); // no propagation because the disabled other parent (a1) + CHECK (!a2->isActive()); + CHECK (a3->isActive()); a1->enable(true); - ASSERT (a1->isActive()); // but now propagation is possible - ASSERT (a2->isActive()); - ASSERT (a3->isActive()); + CHECK (a1->isActive()); // but now propagation is possible + CHECK (a2->isActive()); + CHECK (a3->isActive()); } - - + + /** @test each real world asset subclass has to care * for registering and deregistering any additional * dependencies. Here we collect some more prominent @@ -196,16 +196,16 @@ namespace test { typedef P PC; PM mm = asset::Media::create("test-1", VIDEO); PC cc = mm->createClip()->findClipAsset(); - ASSERT (dependencyCheck (cc,mm)); - + CHECK (dependencyCheck (cc,mm)); + } - + }; - - + + /** Register this test class... */ LAUNCHER (DependentAssets_test, "unit function asset"); - - - + + + }} // namespace asset::test diff --git a/tests/components/proc/asset/entry-id-test.cpp b/tests/components/proc/asset/entry-id-test.cpp index 4c266f30e..c25e9f82c 100644 --- a/tests/components/proc/asset/entry-id-test.cpp +++ b/tests/components/proc/asset/entry-id-test.cpp @@ -1,23 +1,23 @@ /* EntryID(Test) - proof-of-concept test for a combined hash+symbolic ID - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/tests/components/proc/asset/identityofassetstest.cpp b/tests/components/proc/asset/identityofassetstest.cpp index d2fb11911..6f13cb7fc 100644 --- a/tests/components/proc/asset/identityofassetstest.cpp +++ b/tests/components/proc/asset/identityofassetstest.cpp @@ -1,23 +1,23 @@ /* IdentityOfAssets(Test) - Asset object identity and versioning - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ @@ -35,74 +35,70 @@ using util::isnil; using std::string; -namespace asset - { - namespace test +namespace asset { +namespace test { + + + + + /*********************************************************************** + * @test creating several Assets and checking object identity, + * detection of duplicates and version handling. + * @see proc_interface::AssetManager#reg + */ + class IdentityOfAssets_test : public Test { - - - - - /*********************************************************************** - * @test creating several Assets and checking object identity, - * detection of duplicates and version handling. - * @see proc_interface::AssetManager#reg - */ - class IdentityOfAssets_test : public Test - { - virtual void run(Arg arg) - { - createDuplicate(); - - if (!isnil (arg)) - dumpAssetManager(); - TRACE (asset_mem, "leaving IdentityOfAssets_test::run()"); - } - - - - typedef shared_ptr PM; - - /** @test produce an ID clash. - * documents the current behaviour of the code as of 9/07 - * @todo this test is expected to break when the detection - * of duplicate registrations is implemented. - */ - void createDuplicate() - { - PM mm1 = asset::Media::create ("testfile1.mov", VIDEO); - - Asset::Ident idi (mm1->ident); // duplicate Ident record - PM mm1X = asset::Media::create (idi); // note: we actually don't call any ctor - ASSERT (mm1 == mm1X); // instead, we got mm1 back. - - PM mm2 = asset::Media::create (idi,"testfile2.mov"); - - ASSERT (mm1->getID() == mm2->getID()); // different object, same hash - - AssetManager& aMang = AssetManager::instance(); - ASSERT (aMang.getAsset (mm1->getID()) == mm2); // record of mm1 was replaced by mm2 - ASSERT (aMang.getAsset (mm2->getID()) == mm2); - - ASSERT (aMang.known (mm1->getID())); - ASSERT (aMang.known (mm2->getID())); - ASSERT (mm1->ident.name == "testfile1"); - ASSERT (mm2->ident.name == "testfile1"); - ASSERT (mm1->getFilename() == "testfile1.mov"); - ASSERT (mm2->getFilename() == "testfile2.mov"); - - - TRACE (asset_mem, "leaving test method scope"); - } - - }; - - - /** Register this test class... */ - LAUNCHER (IdentityOfAssets_test, "unit asset"); - - - - } // namespace test - -} // namespace asset + virtual void run(Arg arg) + { + createDuplicate(); + + if (!isnil (arg)) + dumpAssetManager(); + TRACE (asset_mem, "leaving IdentityOfAssets_test::run()"); + } + + + + typedef shared_ptr PM; + + /** @test produce an ID clash. + * documents the current behaviour of the code as of 9/07 + * @todo this test is expected to break when the detection + * of duplicate registrations is implemented. + */ + void createDuplicate() + { + PM mm1 = asset::Media::create ("testfile1.mov", VIDEO); + + Asset::Ident idi (mm1->ident); // duplicate Ident record + PM mm1X = asset::Media::create (idi); // note: we actually don't call any ctor + CHECK (mm1 == mm1X); // instead, we got mm1 back. + + PM mm2 = asset::Media::create (idi,"testfile2.mov"); + + CHECK (mm1->getID() == mm2->getID()); // different object, same hash + + AssetManager& aMang = AssetManager::instance(); + CHECK (aMang.getAsset (mm1->getID()) == mm2); // record of mm1 was replaced by mm2 + CHECK (aMang.getAsset (mm2->getID()) == mm2); + + CHECK (aMang.known (mm1->getID())); + CHECK (aMang.known (mm2->getID())); + CHECK (mm1->ident.name == "testfile1"); + CHECK (mm2->ident.name == "testfile1"); + CHECK (mm1->getFilename() == "testfile1.mov"); + CHECK (mm2->getFilename() == "testfile2.mov"); + + + TRACE (asset_mem, "leaving test method scope"); + } + + }; + + + /** Register this test class... */ + LAUNCHER (IdentityOfAssets_test, "unit asset"); + + + +}} // namespace asset::test diff --git a/tests/components/proc/asset/makecliptest.cpp b/tests/components/proc/asset/makecliptest.cpp index 7f9d0581c..4042053a7 100644 --- a/tests/components/proc/asset/makecliptest.cpp +++ b/tests/components/proc/asset/makecliptest.cpp @@ -1,23 +1,23 @@ /* MakeClip(Test) - create a Clip from a Media Asset - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ @@ -60,14 +60,14 @@ namespace asset { PC cc = mm->createClip(); PM cm = cc->getMedia(); - ASSERT (cm); - ASSERT (Time(0) < cc->getLength()); - ASSERT (cm->ident.category.hasKind (VIDEO)); - ASSERT (cm->getFilename() == mm->getFilename()); + CHECK (cm); + CHECK (Time(0) < cc->getLength()); + CHECK (cm->ident.category.hasKind (VIDEO)); + CHECK (cm->getFilename() == mm->getFilename()); TODO ("implement Processing Pattern!!!"); -// ASSERT (cm->howtoProc() == mm->howtoProc()); - ASSERT (cm->ident.org == mm->ident.org); - ASSERT (dependencyCheck (cm,mm)); +// CHECK (cm->howtoProc() == mm->howtoProc()); + CHECK (cm->ident.org == mm->ident.org); + CHECK (dependencyCheck (cm,mm)); TRACE (asset_mem, "leaving MakeClip_test::run()"); TRACE (mobject_mem, "leaving MakeClip_test::run()"); diff --git a/tests/components/proc/asset/mediastructurequerytest.cpp b/tests/components/proc/asset/mediastructurequerytest.cpp index 2f5a58c53..99f0aaab8 100644 --- a/tests/components/proc/asset/mediastructurequerytest.cpp +++ b/tests/components/proc/asset/mediastructurequerytest.cpp @@ -1,23 +1,23 @@ /* MediaStructureQuery(Test) - check functionallity used for creating media assets - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/tests/components/proc/asset/orderingofassetstest.cpp b/tests/components/proc/asset/orderingofassetstest.cpp index d87b00d3b..cd4009e7f 100644 --- a/tests/components/proc/asset/orderingofassetstest.cpp +++ b/tests/components/proc/asset/orderingofassetstest.cpp @@ -1,23 +1,23 @@ /* OrderingOfAssets(Test) - equality and comparisons - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ @@ -74,45 +74,45 @@ namespace asset { // ordering of keys - ASSERT (key1 == key2); - ASSERT (key2 != key3); - ASSERT (key3 != key4); - ASSERT (key4 != key5); - ASSERT (key1 != key5); + CHECK (key1 == key2); + CHECK (key2 != key3); + CHECK (key3 != key4); + CHECK (key4 != key5); + CHECK (key1 != key5); - ASSERT ( 0 > key2.compare(key3)); - ASSERT ( 0 < key3.compare(key2)); + CHECK ( 0 > key2.compare(key3)); + CHECK ( 0 < key3.compare(key2)); - ASSERT ( 0 > key3.compare(key4)); - ASSERT ( 0 > key4.compare(key5)); - ASSERT ( 0 > key1.compare(key5)); - ASSERT ( 0 > key2.compare(key5)); - ASSERT ( 0 > key3.compare(key5)); - ASSERT ( 0 > key1.compare(key3)); - ASSERT ( 0 > key1.compare(key4)); - ASSERT ( 0 > key2.compare(key4)); + CHECK ( 0 > key3.compare(key4)); + CHECK ( 0 > key4.compare(key5)); + CHECK ( 0 > key1.compare(key5)); + CHECK ( 0 > key2.compare(key5)); + CHECK ( 0 > key3.compare(key5)); + CHECK ( 0 > key1.compare(key3)); + CHECK ( 0 > key1.compare(key4)); + CHECK ( 0 > key2.compare(key4)); // ordering of Asset smart ptrs - ASSERT (mm1 == mm2); - ASSERT (mm2 != mm3); - ASSERT (mm3 != mm4); - ASSERT (mm4 != mm5); - ASSERT (mm1 != mm5); + CHECK (mm1 == mm2); + CHECK (mm2 != mm3); + CHECK (mm3 != mm4); + CHECK (mm4 != mm5); + CHECK (mm1 != mm5); - ASSERT (mm2 < mm3); - ASSERT (mm2 <= mm3); - ASSERT (mm3 > mm2); - ASSERT (mm3 >= mm2); + CHECK (mm2 < mm3); + CHECK (mm2 <= mm3); + CHECK (mm3 > mm2); + CHECK (mm3 >= mm2); - ASSERT (mm3 < mm4); - ASSERT (mm4 < mm5); - ASSERT (mm1 < mm5); - ASSERT (mm2 < mm5); - ASSERT (mm3 < mm5); - ASSERT (mm1 < mm3); - ASSERT (mm1 < mm4); - ASSERT (mm2 < mm4); + CHECK (mm3 < mm4); + CHECK (mm4 < mm5); + CHECK (mm1 < mm5); + CHECK (mm2 < mm5); + CHECK (mm3 < mm5); + CHECK (mm1 < mm3); + CHECK (mm1 < mm4); + CHECK (mm2 < mm4); } }; diff --git a/tests/components/proc/asset/testasset.cpp b/tests/components/proc/asset/testasset.cpp index 3a6ffb61d..12eba65ad 100644 --- a/tests/components/proc/asset/testasset.cpp +++ b/tests/components/proc/asset/testasset.cpp @@ -1,23 +1,23 @@ /* TestClip - test clip (stub) for checking Model/Session functionality - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/tests/components/proc/asset/testasset.hpp b/tests/components/proc/asset/testasset.hpp index 716cd33f7..7dbcbe636 100644 --- a/tests/components/proc/asset/testasset.hpp +++ b/tests/components/proc/asset/testasset.hpp @@ -1,23 +1,23 @@ /* TESTASSET.hpp - test asset (stub) for checking internal asset functionality - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/tests/components/proc/asset/testclipasset.hpp b/tests/components/proc/asset/testclipasset.hpp index fc501625c..eb5167abc 100644 --- a/tests/components/proc/asset/testclipasset.hpp +++ b/tests/components/proc/asset/testclipasset.hpp @@ -1,23 +1,23 @@ /* TESTCLIPASSET.hpp - test Media-Asset (clip) for checking Assets and MObjects - + Copyright (C) Lumiera.org 2008, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ diff --git a/tests/components/proc/asset/typed-id-test.cpp b/tests/components/proc/asset/typed-id-test.cpp index 633a07443..7835c162b 100644 --- a/tests/components/proc/asset/typed-id-test.cpp +++ b/tests/components/proc/asset/typed-id-test.cpp @@ -1,23 +1,23 @@ /* TypedID(Test) - verifying registration service for ID to type association - + Copyright (C) Lumiera.org 2010, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ diff --git a/tests/components/proc/control/argument-tuple-accept-test.cpp b/tests/components/proc/control/argument-tuple-accept-test.cpp index 34efd4bd3..c264ca255 100644 --- a/tests/components/proc/control/argument-tuple-accept-test.cpp +++ b/tests/components/proc/control/argument-tuple-accept-test.cpp @@ -1,23 +1,23 @@ /* ArgumentTupleAccept(Test) - verify synthesising a bind(...) function - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ @@ -112,7 +112,7 @@ namespace test { cout << showSizeof(testTime) << endl; cout << testTime.getHead() << endl; - ASSERT (23 == testTime.getTail().getHead()); + CHECK (23 == testTime.getTail().getHead()); } }; diff --git a/tests/components/proc/control/command-argument-test.cpp b/tests/components/proc/control/command-argument-test.cpp index bdf7b2724..8f5feb85f 100644 --- a/tests/components/proc/control/command-argument-test.cpp +++ b/tests/components/proc/control/command-argument-test.cpp @@ -1,23 +1,23 @@ /* CommandArgument(Test) - checking storage of specifically typed command arguments - + Copyright (C) Lumiera.org 2009, Hermann Vosseler - + 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 Software Foundation; either version 2 of the - License, or (at your option) any later version. - + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * *****************************************************/ @@ -51,77 +51,77 @@ using std::endl; namespace control { namespace test { - + using lib::test::showSizeof; using lib::test::randTime; using namespace lumiera::typelist; - - - - - + + + + + namespace { // test helpers - + ostringstream protocol; ///< used to verify the test function calls - - - /** + + + /** * watching the instance creation - * of some parameter values + * of some parameter values */ template struct Tracker { TY element_; static int instanceCnt; - + Tracker (TY init = TY()) : element_(init) { ++instanceCnt; } Tracker (Tracker const& otr) : element_(otr.element_) { ++instanceCnt; } ~Tracker() { --instanceCnt; } - + TY& operator* () { return element_; } - + operator string() const { return element_; } - + friend ostream& operator<< (ostream& out, const Tracker& tra) { return out << tra.element_; } - + friend bool operator== (Tracker const& tra1, Tracker const& tra2) { return tra1.element_ == tra2.element_; } }; - + template int Tracker::instanceCnt (0); - - + + /** Dummy custom memento datatype * @note memento needs to be equality comparable */ struct Sint5 { int i[5]; - + friend bool operator== (Sint5 const& i1, Sint5 const& i2) { return i1.i == i2.i; } }; - - - + + + /* === functions to implement test-"operation" & UNDO === */ - + void doIt (Tracker