diff --git a/AUTHORS b/AUTHORS index da64efbcd..e950124df 100644 --- a/AUTHORS +++ b/AUTHORS @@ -29,8 +29,8 @@ doudou=Sylvain Joyeux rafael2k=Rafael Diniz nicolasm=Nicolas Maufrais -Involved in Design Studies / Prototypes for Cinelerra-3 -======================================================= +Involved in Lumiera development +=============================== cehteh=Christian Thaeter ichthyo=Hermann Vosseler plouj=Michael Ploujnikov diff --git a/DIR_INFO b/DIR_INFO index 39fd1850f..f05e9a881 100644 --- a/DIR_INFO +++ b/DIR_INFO @@ -1 +1 @@ -The root dir for the cinelerra3 project +The root dir for the Lumiera project diff --git a/INSTALL b/INSTALL index c6cf3ff92..7983166ec 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Running / Installing Cinelerra-3 Prototype -========================================== +Running / Installing Lumiera Prototype +====================================== ** to be written ** diff --git a/LICENSE b/LICENSE index b93cee22f..4a684524d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,17 +1,10 @@ -The Cinelerra source code is (C) by the original authors (see AUTHORS) +The Lumiera source code is (C) by the original authors (see AUTHORS) ======================================================================= -Cinelerra is free software -- you may use and redistribute it under the +Lumiera is free software -- you may use and redistribute it under the Terms and conditions of the GNU GENERAL PUBLIC LICENSE (GPL); either version 2 of the License, or (at your option) any later version. ======================================================================= For a copy of the GPL Version 2 see the file "COPYING" -In addition to the GPL's warranty stipulation, Cinelerra is distributed WITHOUT -GUARANTEED SUPPORT; without even the guarantee of ADDITIONAL LABOR. Support -that is not guaranteed includes technical support, compiler troubleshooting, -debugging, version matching, updating, among other additional labor which -may or may not be required to meet a user's requirements. - - diff --git a/Makefile.am b/Makefile.am index 9b03ecb54..236a67f8b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) CinelerraCV +# Copyright (C) Lumiera.org # 2007, Christian Thaeter # # This program is free software; you can redistribute it and/or diff --git a/README b/README index 0ab5fe3ae..7913094ee 100644 --- a/README +++ b/README @@ -1,8 +1,8 @@ -====================================== -Cinelerra -- the video NLE for Linux -====================================== +==================================== +Lumiera -- the video NLE for Linux +==================================== - Cinelerra is a nonlinear video editing and compositing tool. + Lumiera is a nonlinear video editing and compositing tool. It understands some of the common multimedia formats (quicktime, avi, ogg) and audio/video compression codecs (divx, xvid, mpeg1/2/4, ...) @@ -12,23 +12,30 @@ Cinelerra -- the video NLE for Linux and RGB-float colormodels and the ability to mix media with differing sizes and framerates. +For more information about Lumiera visit http://lumiera.org/ For more information about Cinelerra visit http://cinelerra.org/ ------------------------------- -"Cinelerra-3" prototype code ------------------------------- +---------------------------- +"Lumiera" prototype code +---------------------------- -**This source tree doesn't contain a working video editing application** -Rather, it contains some design studies and prototype code for improving -some aspects of the Cinelerra Application. This work may eventually -evolve into a new major release of Cinelerra. +**This source tree doesn't yet contain a working video editing application** +Rather, it contains the initial framework and core modules of the lower and +middle layer of the envisioned new Application "Lumiera". As of 7/2007, we start here with some backend and render engine modules together with some unit tests. You should find a wiki with detailed design considerations and developer documentation and a UML model (usable with BOUML 2.29) in the sibling directories. +As of 2/2008 the project has been separated completely from his ancestor "Cinelerra" +The Community, which is largely identical to the Cinelerra-CV community, choose the +new project name "Lumiera". The basic project infrastructure is up and running, +and work on the new codebase is going on continuosely. We can show nothing but +a running test suite for now. + + Build Requirements ------------------ diff --git a/SConstruct b/SConstruct index 88c5dcb97..4d2f2ee9c 100644 --- a/SConstruct +++ b/SConstruct @@ -1,10 +1,10 @@ # -*- python -*- ## -## SConstruct - SCons based build-sytem for Cinelerra +## SConstruct - SCons based build-sytem for Lumiera ## -# Copyright (C) CinelerraCV -# 2007, Hermann Vosseler +# Copyright (C) Lumiera.org +# 2008, Hermann Vosseler # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -61,7 +61,7 @@ def setupBasicEnvironment(): , SRCDIR=SRCDIR , BINDIR=BINDIR , CPPPATH=["#"+SRCDIR] # used to find includes, "#" means always absolute to build-root - , CPPDEFINES=['-DCINELERRA_VERSION='+VERSION ] # note: it's a list to append further defines + , CPPDEFINES=['-DLUMIERA_VERSION='+VERSION ] # note: it's a list to append further defines , CCFLAGS='-Wall ' # -fdiagnostics-show-option ) @@ -134,7 +134,7 @@ def defineCmdlineOptions(): def prepareOptionsHelp(opts,env): prelude = """ USAGE: scons [-c] [OPTS] [key=val [key=val...]] [TARGETS] - Build and optionally install Cinelerra. + Build and optionally install Lumiera. Without specifying any target, just the (re)build target will run. Add -c to the commandline to clean up anything a given target would produce @@ -234,21 +234,21 @@ def defineBuildTargets(env, artifacts): We use a custom function to declare a whole tree of srcfiles. """ - cinobj = ( srcSubtree(env,'$SRCDIR/backend') + lumobj = ( srcSubtree(env,'$SRCDIR/backend') + srcSubtree(env,'$SRCDIR/proc') + srcSubtree(env,'$SRCDIR/common') + srcSubtree(env,'$SRCDIR/lib') ) plugobj = srcSubtree(env,'$SRCDIR/plugin', isShared=True) - core = env.StaticLibrary('$BINDIR/core.la', cinobj) - #core = cinobj # use this for linking directly + core = env.StaticLibrary('$BINDIR/core.la', lumobj) + #core = lumobj # use this for linking directly # use PCH to speed up building precomp = env.PrecompiledHeader('$SRCDIR/pre') - env.Depends(cinobj, precomp) + env.Depends(lumobj, precomp) - artifacts['cinelerra'] = env.Program('$BINDIR/cinelerra', ['$SRCDIR/main.cpp']+ core ) - artifacts['plugins'] = env.SharedLibrary('$BINDIR/cinelerra-plugin', plugobj) + artifacts['lumiera'] = env.Program('$BINDIR/lumiera', ['$SRCDIR/main.cpp']+ core ) + artifacts['plugins'] = env.SharedLibrary('$BINDIR/lumiera-plugin', plugobj) # call subdir SConscript(s) for independent components SConscript(dirs=[SRCDIR+'/tool'], exports='env artifacts') @@ -264,7 +264,7 @@ def definePostBuildTargets(env, artifacts): il = env.Alias('install-lib', '$DESTDIR/lib') env.Alias('install', [ib, il]) - build = env.Alias('build', '$BINDIR') + build = env.Alias('build', artifacts['lumiera']+artifacts['plugins']) allbu = env.Alias('allbuild', build+artifacts['testsuite']) env.Default('build') # additional files to be cleaned when cleaning 'build' @@ -286,11 +286,11 @@ def definePostBuildTargets(env, artifacts): def defineInstallTargets(env, artifacts): """ define some artifacts to be installed into target locations. """ - env.Install(dir = '$DESTDIR/bin', source=artifacts['cinelerra']) + env.Install(dir = '$DESTDIR/bin', source=artifacts['lumiera']) env.Install(dir = '$DESTDIR/lib', source=artifacts['plugins']) env.Install(dir = '$DESTDIR/bin', source=artifacts['tools']) - env.Install(dir = '$DESTDIR/share/doc/cinelerra$VERSION/devel', source=artifacts['doxydoc']) + env.Install(dir = '$DESTDIR/share/doc/lumiera$VERSION/devel', source=artifacts['doxydoc']) ##################################################################### @@ -310,7 +310,7 @@ artifacts = {} # the various things we build. # Each entry actually is a SCons-Node list. # Passing these entries to other builders defines dependencies. -# 'cinelerra' : the App +# 'lumiera' : the App # 'plugins' : plugin shared lib # 'tools' : small tool applications (e.g mpegtoc) # 'src,tar' : source tree as tarball (without doc) diff --git a/admin/scons/Buildhelper.py b/admin/scons/Buildhelper.py index 419de6e68..ae3f5fb1f 100644 --- a/admin/scons/Buildhelper.py +++ b/admin/scons/Buildhelper.py @@ -3,8 +3,8 @@ ## Buildhelper.py - helpers, custom builders, for SConstruct ## -# Copyright (C) CinelerraCV -# 2007, Hermann Vosseler +# Copyright (C) Lumiera.org +# 2008, Hermann Vosseler # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -123,8 +123,8 @@ def Tarball(env,location,dirs,suffix=''): """ targetID = '../extern-tar%s' % suffix versionID = env['VERSION'] - defaultName = 'cinelerra%s_%s' % (suffix, versionID) - nameprefix = 'cinelerra-%s/' % (versionID) + defaultName = 'lumiera%s_%s' % (suffix, versionID) + nameprefix = 'lumiera-%s/' % (versionID) location = env.subst(location) dirs = env.subst(dirs) return env.Command(targetID,None, createTarball, diff --git a/bin/DIR_INFO b/bin/DIR_INFO index c9048f8c1..9dafe61c3 100644 --- a/bin/DIR_INFO +++ b/bin/DIR_INFO @@ -1 +1 @@ -cinelerra executable(s) and libraries will be built here +Lumiera executable(s) and libraries will be built here diff --git a/configure.ac b/configure.ac index 1730b3bdc..386bd94b0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,12 @@ -AC_INIT(cinelerra, 3.0pre) +AC_INIT(lumiera, 0.1pre) AC_CONFIG_SRCDIR(src/lib/plugin.c) AC_CONFIG_AUX_DIR(scripts) AM_INIT_AUTOMAKE AC_PREREQ(2.59) AC_COPYRIGHT([ - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 diff --git a/doc/devel/Doxyfile b/doc/devel/Doxyfile index 7023172ca..2f90301f0 100644 --- a/doc/devel/Doxyfile +++ b/doc/devel/Doxyfile @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = Cinelerra3 +PROJECT_NAME = Lumiera PROJECT_NUMBER = 3.0+alpha OUTPUT_DIRECTORY = CREATE_SUBDIRS = YES @@ -153,9 +153,10 @@ VERBATIM_HEADERS = YES #--------------------------------------------------------------------------- ALPHABETICAL_INDEX = YES COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = cinelerra:: \ - cinelerra_ \ - CINELERRA_ +IGNORE_PREFIX = lumiera:: \ + lumiera_ \ + lumi_ \ + LUMIERA_ #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- diff --git a/doc/devel/uml/class128138.html b/doc/devel/uml/class128138.html index cf9db4338..6cbff1e37 100644 --- a/doc/devel/uml/class128138.html +++ b/doc/devel/uml/class128138.html @@ -16,5 +16,5 @@ -

Declaration :

  • C++ : class Thread

We can basically reuse the Thread class design from cinelerra2, Thread becomes a baseclass for all Threads

+

Declaration :

  • C++ : class Thread

We can basically reuse the Thread class design from Cinelerra2, Thread becomes a baseclass for all Threads

diff --git a/doc/devel/uml/class128266.html b/doc/devel/uml/class128266.html index f4fa4ec54..be0f14da2 100644 --- a/doc/devel/uml/class128266.html +++ b/doc/devel/uml/class128266.html @@ -16,7 +16,7 @@ -

Declaration :

  • C++ : class Condition

I provided a reworked Condition class in my cinelerra2 repository

+

Declaration :

  • C++ : class Condition

I provided a reworked Condition class in my Cinelerra2 repository

Class Lock
diff --git a/doc/devel/uml/class128394.html b/doc/devel/uml/class128394.html index a82ace25d..7b7e1a826 100644 --- a/doc/devel/uml/class128394.html +++ b/doc/devel/uml/class128394.html @@ -16,7 +16,7 @@ -

Declaration :

  • C++ : class Mutex

I provided a reworked Mutex class in my cinelerra2 repository

+

Declaration :

  • C++ : class Mutex

I provided a reworked Mutex class in my Cinelerra2 repository

Class Lock
diff --git a/doc/devel/uml/class135429.html b/doc/devel/uml/class135429.html index 93f554a39..538ad35b0 100644 --- a/doc/devel/uml/class135429.html +++ b/doc/devel/uml/class135429.html @@ -20,7 +20,7 @@
Attribut theApp_

Declaration :

holds the single instance and triggers initialization

-
Operation Appconfig

Declaration :

  • Uml : - Appconfig() :
  • C++ : private: Appconfig ()

perform initialization on first access.
A call is placed in static initialization code
included in cinelerra.h

+
Operation Appconfig

Declaration :

  • Uml : - Appconfig() :
  • C++ : private: Appconfig ()

perform initialization on first access.
A call is placed in static initialization code
included in lumiera.h

Operation instance

Declaration :

  • Uml : static, - instance() : Appconfig*
  • C++ : private: static Appconfig* instance ()
Operation get

Declaration :

  • Uml : static, + get(inout key : string) : string
  • C++ : public: static string get (string & key)

access the configuation value for a given key.
@return empty string for unknown keys, else the corresponding configuration value

All public operations : get

diff --git a/doc/devel/uml/class136453.html b/doc/devel/uml/class136453.html index 525aaa684..610053bbe 100644 --- a/doc/devel/uml/class136453.html +++ b/doc/devel/uml/class136453.html @@ -25,7 +25,7 @@

Declaration :

  • Uml : + name : string
  • C++ : public: const string name

element ID, comprehensible but sanitized. The tuple (category, name, org) is unique.

Relation category (<unidirectional association>)

Declaration :

  • Uml : + category : Category, multiplicity : 1
  • C++ : public: const Category* category

primary tree like classification of the asset

Attribut org
-

Declaration :

  • Uml : + org : string
  • C++ : public: const string org

origin or authorship id. Can be a project abbreviation, a package id or just the authors nickname or UID. This allows for the compnent name to be more generic (e.g. "blur"). Default for all assets provided by the core cinelerra-3 codebase is "cin3".

+

Declaration :

  • Uml : + org : string
  • C++ : public: const string org

origin or authorship id. Can be a project abbreviation, a package id or just the authors nickname or UID. This allows for the compnent name to be more generic (e.g. "blur"). Default for all assets provided by the core Lumiera codebase is "lumi".

Attribut version

Declaration :

  • Uml : + version : uint
  • C++ : public: const unsigned int version

version number of the thing or concept represented by this asset. Of each unique tuple (name, category, org) there will be only one version in the whole system. Version 0 is reserved for internal purposes. Versions are considered to be ordered, and any higher version is supposed to be fully backwards compatible to all previous versions.

Attribut groups
diff --git a/doc/devel/uml/classdiagrams.html b/doc/devel/uml/classdiagrams.html index 63f1a4fcf..03c862119 100644 --- a/doc/devel/uml/classdiagrams.html +++ b/doc/devel/uml/classdiagrams.html @@ -21,7 +21,7 @@ Builder Entities Controller Entities File MappingShows whats used to access Frames -HierarchyCinelerra Exception hierarchy +HierarchyLumiera Exception hierarchy In Memory Database interface components Media-Asset Relations diff --git a/doc/devel/uml/classes.html b/doc/devel/uml/classes.html index 48c1ea2d6..d2f240eb9 100644 --- a/doc/devel/uml/classes.html +++ b/doc/devel/uml/classes.html @@ -37,7 +37,7 @@ CodecAdapter CompoundClipClip MObject which is actually a compound of several elementary clips,
e.g. the several streams found within multichannels media. CompoundMediacompound of several elementary media tracks,
e.g. the individual media streams found in one media file -ConditionI provided a reworked Condition class in my cinelerra2 repository +ConditionI provided a reworked Condition class in my Cinelerra2 repository Config ConManagerConnection Manager, used to build the connections between render engine nodes, if these nodes need to cooperate besides the normal "data pull" operation. Esp., the Connection Manager knows how to wire up the effect's parameters with the corresponding ParamProviders (autmation) in the Session Constraint @@ -86,7 +86,7 @@ Metakey abstraction: metadata and organisational asset Meta MObjectinterface -MutexI provided a reworked Mutex class in my cinelerra2 repository +MutexI provided a reworked Mutex class in my Cinelerra2 repository NodeCreatorToolThis Tool implementation plays the central role in the buld process: given a MObject from Session, it is able to attach ProcNodes to the render engine under construction such as to reflect the properties of the MObject in the actual render. ParameterDescriptor and access object for a plugin parameter. Parameters may be provided with values from the session, and this values may be automated. ParamProviderinterfaceA facility to get the actual value of a plugin/effect parameter @@ -119,7 +119,7 @@ StateProxyinterface std::exceptionauxiliary Structkey abstraction: structural asset -ThreadWe can basically reuse the Thread class design from cinelerra2, Thread becomes a baseclass for all Threads +ThreadWe can basically reuse the Thread class design from Cinelerra2, Thread becomes a baseclass for all Threads Timedenotes a temporal position (time point), based on timeline start.

investigate posix.4 realtime timers, wrap these here Tool ToolFactory diff --git a/doc/devel/uml/fig129797.png b/doc/devel/uml/fig129797.png index e38a4cb77..229233231 100644 Binary files a/doc/devel/uml/fig129797.png and b/doc/devel/uml/fig129797.png differ diff --git a/doc/devel/uml/fig130053.png b/doc/devel/uml/fig130053.png index 9e6810f94..9cee6c87a 100644 Binary files a/doc/devel/uml/fig130053.png and b/doc/devel/uml/fig130053.png differ diff --git a/doc/devel/uml/fig130181.png b/doc/devel/uml/fig130181.png index 692da89b9..fbd802a89 100644 Binary files a/doc/devel/uml/fig130181.png and b/doc/devel/uml/fig130181.png differ diff --git a/doc/devel/uml/index-withframe.html b/doc/devel/uml/index-withframe.html index cf6c2c73f..9844745f9 100644 --- a/doc/devel/uml/index-withframe.html +++ b/doc/devel/uml/index-withframe.html @@ -4,7 +4,7 @@ -/mnt/Lager/heim/devel/cin3/doc/devel/uml/index-withframe +/mnt/Lager/heim/devel/lumi/doc/devel/uml/index-withframe diff --git a/doc/devel/uml/index.html b/doc/devel/uml/index.html index 3853e7c4f..406fc303d 100644 --- a/doc/devel/uml/index.html +++ b/doc/devel/uml/index.html @@ -4,14 +4,14 @@ -cinelerra3 +<title>lumiera Documentation -
cinelerra3
Documentation
+
lumiera
Documentation

@@ -22,7 +22,7 @@ Documentation

All things concering the big picture.
Not a real code package, rather a container for design drafts, specifications, decisions.

1.1 Component View Architecture

-

The various Components comprising the Cinelerra3 Video editing Application

+

The various Components comprising the Lumiera Video editing Application

@@ -104,15 +104,15 @@ Documentation

This package is used to organize code generation by BOUML. It is considered useless after having generated the initial code skeleton.

1.3.1 Deployment View EXE Deployment

-

defines and lists how the Cinelerra executable has to be created

+

defines and lists how the Lumiera executable has to be created

Source Overview



-
Artifact Cinelerra3
+
Artifact Lumiera

Depends on common

Depends on gui

Depends on proc

Depends on backend

the main executable to be built

-

executable associated with : main, conmanager, clip, meta, fixedlocation, relativelocation, vrender, mobject, source, frame, placement, sessionimpl, builderfacade, controllerfacade, processor, pluginadapter, effect, buildertool, segmentationtool, aframe, assembler, trafo, explicitplacement, auto, glrender, link, parameter, renderengine, allocation, vframe, toolfactory, arender, renderstate, label, glbuf, procnode, stateproxy, hub, buildable, abstractmo, nodecreatertool, projector, interpolator, edl, fixture, glpipe, exitnode, pathmanager, track, paramprovider, mask

+

executable associated with : exitnode, pathmanager, track, paramprovider, mask, main, conmanager, clip, meta, fixedlocation, relativelocation, mobject, source, frame, placement, sessionimpl, builderfacade, controllerfacade, processor, pluginadapter, effect, buildertool, segmentationtool, aframe, assembler, trafo, explicitplacement, auto, glrender, link, parameter, renderengine, allocation, vframe, toolfactory, arender, renderstate, label, glbuf, procnode, stateproxy, hub, buildable, abstractmo, nodecreatertool, projector, interpolator, edl, fixture, glpipe, vrender

Artifact main

Artifact source

@@ -120,7 +120,7 @@ Documentation

1.3.2 Package common

    -
  • C++ namespace : cinelerra
    • +
  • C++ namespace : lumiera

sourcecode package

Common library and helper classes

Diagram : Source Overview

@@ -134,7 +134,7 @@ Documentation

Artifact source associated with : Visitable, Tool, Applicable

Artifact error
-

Cinelerra Exception Interface

+

Lumiera Exception Interface

Artifact source associated with : Error, Logic, Config, State, Invalid, External

Artifact appconfig
@@ -148,12 +148,12 @@ Documentation

1.3.2.2 Package error

    -
  • C++ namespace : cinelerra::error
    • +
  • C++ namespace : lumiera::error

Namespace for Exception Kinds

1.3.2.3 Package visitor

    -
  • C++ namespace : cinelerra::visitor
    • +
  • C++ namespace : lumiera::visitor

sub-namespace for visitor library implementation

@@ -1143,7 +1143,7 @@ reuse exiting Engine

Selection :

    Transformation

    Hierarchy



    -

    Cinelerra Exception hierarchy

    Class Error
    +

    Lumiera Exception hierarchy

    Class Error
    Class Logic
    Class Config
    Class State
    diff --git a/doc/devel/uml/index_60.html b/doc/devel/uml/index_60.html index 75ccc147d..a873c25b0 100644 --- a/doc/devel/uml/index_60.html +++ b/doc/devel/uml/index_60.html @@ -17,8 +17,8 @@ - + @@ -28,8 +28,8 @@ - + diff --git a/doc/devel/uml/index_65.html b/doc/devel/uml/index_65.html index d570a1c71..cb80221e6 100644 --- a/doc/devel/uml/index_65.html +++ b/doc/devel/uml/index_65.html @@ -28,13 +28,13 @@ - + - + @@ -54,9 +54,9 @@ - + diff --git a/doc/devel/uml/index_66.html b/doc/devel/uml/index_66.html index 9158c65e4..2d9540c91 100644 --- a/doc/devel/uml/index_66.html +++ b/doc/devel/uml/index_66.html @@ -34,8 +34,8 @@ - + diff --git a/doc/devel/uml/index_67.html b/doc/devel/uml/index_67.html index dfc4fc2d8..93dc372e2 100644 --- a/doc/devel/uml/index_67.html +++ b/doc/devel/uml/index_67.html @@ -23,39 +23,37 @@ - + - - - - - - - + - - - + + + + + + + + + + + + + + - + - - - - - - - - - + + @@ -77,7 +75,7 @@ - + @@ -90,8 +88,8 @@ - + diff --git a/doc/devel/uml/index_69.html b/doc/devel/uml/index_69.html index 6ba353281..1f6fd3f19 100644 --- a/doc/devel/uml/index_69.html +++ b/doc/devel/uml/index_69.html @@ -24,8 +24,8 @@ - + @@ -39,9 +39,9 @@ - + - + diff --git a/doc/devel/uml/index_70.html b/doc/devel/uml/index_70.html index 23907ab84..b36d60aff 100644 --- a/doc/devel/uml/index_70.html +++ b/doc/devel/uml/index_70.html @@ -33,8 +33,8 @@ - + diff --git a/doc/devel/uml/index_71.html b/doc/devel/uml/index_71.html index 23b81058d..82430e314 100644 --- a/doc/devel/uml/index_71.html +++ b/doc/devel/uml/index_71.html @@ -51,8 +51,8 @@ - +
    NameKindDescription
    <flow>transition
    <flow>transition
    <flow>transition
    <flow>transition
    <flow>transition
    <flow>transition
    <flow>transition
    <flow>transition
    <flow>transition
    <flow>transition
    <flow>transition
    <flow>transition
    <flow>transition
    <flow>transition
    <flow>transition
    allocationartifact
    Allocationclassa directive to place a MObject in a specific way
    anchorrelation
    Appconfigoperationperform initialization on first access.
    A call is placed in static initialization code
    included in cinelerra.h; thus it will happen
    ubiquitous very early.
    Appconfigoperationperform initialization on first access.
    A call is placed in static initialization code
    included in lumiera.h; thus it will happen
    ubiquitous very early.
    appconfigartifactfor global initialization and configuration
    AppconfigclassSingleton to hold inevitable global flags and constants and for performing erarly (static) global initialization tasks.
    Applicableclass
    applyoperation
    applyoperation
    Architecturecomponent viewThe various Components comprising the Cinelerra3 Video editing Application
    Architecturecomponent viewThe various Components comprising the Lumiera Video editing Application
    ARenderclassRepresentation of a Audio render process
    arenderartifactRepresentation of a Audio Render process
    AssemblerclassThis is the actual building facility: provided the correct tools and associations, it serves to build and connect the individual ProcNode objects
    aud_Aclass instance
    aud_aclass instance
    audioclass instance
    audio1class instance
    audio1class instance
    audio1class instance
    audio1class instance
    autoartifactMedia Object holding automation data
    AutoclassAutomation data for some parameter (i.e. a time varying function)
    Automation Entitiesclass diagram
    buildableartifactmarker interface denoting any MObject able to be treated by Tools
    buildEngineoperationMain Operation of the Builder: create a render engine for a given part of the timeline
    Buildercomponent
    builderpackagesourcecode package

    The Builder creating the Render Engine,
    located within the MObject Subsystem
    Builderpackage
    builderpackagesourcecode package

    The Builder creating the Render Engine,
    located within the MObject Subsystem
    Builder Entitiesclass diagram
    Builder Workingsclass view
    BuilderFacadeclassProvides unified access to the builder functionality. While individual components of the builder subsystem may be called if necessary or suitable, it is usually better to do all extern invocations via the high level methods of this Facade
    Categoryclasstree like classification of Assets
    categoryartifacttree like classification of Assets
    causeattributea copy of the first exception encountered in this exception chain
    chainrelationChain of additional Placements further constraining the position of this MObject
    chainoperationcreate and add another Placement for this media object, thus increasingly constraining the (possible) position of this object.
    chainrelationChain of additional Placements further constraining the position of this MObject
    checked_inrelationchecked_in objects are subject of cache aging and must be not in use
    checked_outrelationthis list keeps all mappings which are in use, and thus prevents them from Cache aging
    Cinelerra3artifactthe main executable to be built
    cinelerra3package
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    class instanceclass instance
    clearoperationclear current session contents
    without resetting overall session config.
    Afterwards, the session will contain only one
    empty EDL, while all Assets are retained.
    Clipclassbookkeeping (asset) view of a media clip.
    CompoundClipclassClip MObject which is actually a compound of several elementary clips,
    e.g. the several streams found within multichannels media.
    CompoundMediaclasscompound of several elementary media tracks,
    e.g. the individual media streams found in one media file
    compoundmediaartifacta special clip as a compound of several elementary media tracks,
    e.g. the individual media streams found in one media file
    ConditionclassI provided a reworked Condition class in my cinelerra2 repository
    ConditionclassI provided a reworked Condition class in my Cinelerra2 repository
    Configclass
    config examplesuse case view
    configureoperation
    constraintartifactLocatingPin representing an directive by the user that
    must not be violated
    Constraintclass
    Controllercomponent
    Controllerpackage
    controllerpackagesourcecode package

    The Processing and Render Controller,
    located within the MObject Subsystem
    Controllerpackage
    Controller Entitiesclass diagram
    Controller Workingsclass view
    ControllerFacadeclassProvides unified access to the Proc-Subsystem Controller. Especially, this Facade class provides the functions to get a render engine to carry out actual renderings.
    EDL Example2object diagramMore complex example showing the Object graph in the EDL and how it is linked into the Fixture to yield the actual locations. In this example, an HUE Effect is applied on a part of the Clip
    edlsrelation
    EffectclassEffect or media processing component
    effectartifactEDL representation of a pluggable and automatable effect.
    effectartifactEffect or media processing component
    effectartifactEDL representation of a pluggable and automatable effect.
    Effectclass
    elementsrelationrelevant MObjects comprising this segment. TODO: actually necessary??
    enableoperationchange the enabled status of this asset. Note the corresponding #isActive predicate may depend on the enablement status of parent assets as well
    errorpackageNamespace for Exception Kinds
    errorclass view
    Errorclass
    errorartifactCinelerra Exception Interface
    errorartifactLumiera Exception Interface
    establish partitioningexpansion region
    EXE Deploymentdeployment viewdefines and lists how the Cinelerra executable has to be created
    EXE Deploymentdeployment viewdefines and lists how the Lumiera executable has to be created
    ExitNodeclassThe output of the render pipeline. Pulling from such exit nodes actually ivokes the render process
    exitnodeartifactspecial Processing Node providing "pullable" output
    explicitplacementartifactspecial Placement yielding an absolute location (Time,Track)-location for a MObject
    FixedLocationclass
    Fixtureactivity object
    fixtureartifactthe (low level) representation of the EDL with concrete placement data
    Fixturecomponent
    Fixtureclass
    Fixturecomponent
    fork activity nodefork activity node
    FrameclassFrames are just a low level lump of continous memory, most parts are opaque. Frames are memory sensitive, they will be small constant sized structures which can be efficently managed in a pool.
    Framenode
    GLRenderclassRepresentation of a OpenGL accelerated Video render process
    glrenderartifactRepresentation of a OpenGL accellerated Video render process
    groupsattributeadditional classification, selections or departments this asset belongs to. Groups are optional, non-exclusive and may be overlapping.
    GUIpackageGUI is here just a container to hold any entities considered to be User Interface related, which is not in focus for this Design draft
    guipackagesourcecode package

    User Interface classes go here
    GUIpackageGUI is here just a container to hold any entities considered to be User Interface related, which is not in focus for this Design draft
    diff --git a/doc/devel/uml/index_72.html b/doc/devel/uml/index_72.html index a26e1439f..bf8262c8c 100644 --- a/doc/devel/uml/index_72.html +++ b/doc/devel/uml/index_72.html @@ -20,7 +20,7 @@ handlerelationweak pointer handlesrelation handles_availableattributeinitialized to the maximum number of filehandles the backend may use for mapped files. When no handles are available, the handle which is last in the handles list is closed and (re-)used.
    Else this number is decremented for each new filehandle used and incremented for any one explicitly freed. -Hierarchyclass diagramCinelerra Exception hierarchy +Hierarchyclass diagramLumiera Exception hierarchy howtoProcoperation@return descriptor how to build a render pipeline corresponding to this media Hubclass hubartifactspecial ProcNode used to build data distributing connections diff --git a/doc/devel/uml/index_73.html b/doc/devel/uml/index_73.html index 93008767f..27e37a604 100644 --- a/doc/devel/uml/index_73.html +++ b/doc/devel/uml/index_73.html @@ -20,9 +20,9 @@ idattributeAsset primary key. In Memory Databaseclass diagram inFixtureactivity action pin -inputclass instance -inputclass instance inputclass instance +inputclass instance +inputclass instance instanceoperation instructionsrelation Interfaceclass view diff --git a/doc/devel/uml/index_76.html b/doc/devel/uml/index_76.html index 9b41469f0..0b4ef97db 100644 --- a/doc/devel/uml/index_76.html +++ b/doc/devel/uml/index_76.html @@ -31,6 +31,8 @@ Lockclass Logicclass longDescattributeuser visible qualification of the thing, unit or concept represented by this asset. perferably "in one line". To be localized. +Lumieraartifactthe main executable to be built +lumierapackage diff --git a/doc/devel/uml/index_77.html b/doc/devel/uml/index_77.html index 68bbd5cfb..3e0b915cc 100644 --- a/doc/devel/uml/index_77.html +++ b/doc/devel/uml/index_77.html @@ -40,7 +40,7 @@ MObjectpackage MObjectclass multichannel clipobject diagram -MutexclassI provided a reworked Mutex class in my cinelerra2 repository +MutexclassI provided a reworked Mutex class in my Cinelerra2 repository diff --git a/doc/devel/uml/index_79.html b/doc/devel/uml/index_79.html index 5446e9730..d1fdc83c0 100644 --- a/doc/devel/uml/index_79.html +++ b/doc/devel/uml/index_79.html @@ -18,10 +18,10 @@ - - - + + + diff --git a/doc/devel/uml/index_82.html b/doc/devel/uml/index_82.html index 3a3a83808..a76e8f590 100644 --- a/doc/devel/uml/index_82.html +++ b/doc/devel/uml/index_82.html @@ -22,8 +22,8 @@ - + diff --git a/doc/devel/uml/index_83.html b/doc/devel/uml/index_83.html index df33c880e..18c49405b 100644 --- a/doc/devel/uml/index_83.html +++ b/doc/devel/uml/index_83.html @@ -46,8 +46,8 @@ - + diff --git a/doc/devel/uml/index_84.html b/doc/devel/uml/index_84.html index 738749c2a..692cb2cac 100644 --- a/doc/devel/uml/index_84.html +++ b/doc/devel/uml/index_84.html @@ -21,7 +21,7 @@ - + @@ -43,12 +43,12 @@ + - - +
    NameKindDescription
    offsetattributeOffset the actual position by this (time) value relative to the anchor point. TODO: Representation?
    orgattributeorigin or authorship id. Can be a project abbreviation, a package id or just the authors nickname or UID. This allows for the compnent name to be more generic (e.g. "blur"). Default for all assets provided by the core cinelerra-3 codebase is "cin3".
    ouputclass instance
    ouputclass instance
    orgattributeorigin or authorship id. Can be a project abbreviation, a package id or just the authors nickname or UID. This allows for the compnent name to be more generic (e.g. "blur"). Default for all assets provided by the core Lumiera codebase is "lumi".
    ouputclass instance
    ouputclass instance
    ouputclass instance
    outPortrelationthe Port this MObject wants to be conected to
    outputrelation
    Overviewcomponent diagramThis drawing shows the top level compoents and relations
    registryrelation@internal Table or DB holding all registered asset instances.
    relativelocationartifactPlacement implemnetaion providing various ways of attaching a MObject to another one
    RelativeLocationclass
    RelTypeclassthe possible kinds of RelativePlacements
    relTypeattributethe kind of relation denoted by this Placement
    RelTypeclassthe possible kinds of RelativePlacements
    removeoperationremove the given asset <i>together with all its dependants</i> from the internal DB
    Render Entitiesclass diagram
    Render Requestactivity parameter
    SimpleClipclassElementary clip consisting of only one media stream
    SmartPointerclass
    SmartPointersclass view
    sourcerelationmedia source of this clip
    sourcerelationthe media source this clip referes to
    sourcerelationmedia source of this clip
    SourceclassSource Node: represents a media source to pull data from.
    sourceartifactRepresentation of a Media source
    Source Overviewdeployment diagram
    theApp_attributeholds the single instance and triggers initialization
    theFixturerelation
    theTimelinerelation
    ThreadclassWe can basically reuse the Thread class design from cinelerra2, Thread becomes a baseclass for all Threads
    ThreadclassWe can basically reuse the Thread class design from Cinelerra2, Thread becomes a baseclass for all Threads
    timeattribute
    timeartifactunified representation of a time point, including conversion functions
    Timeclassdenotes a temporal position (time point), based on timeline start.

    investigate posix.4 realtime timers, wrap these here
    treatoperation
    treatoperationThis operation is to be overloaded for the specific MObject subclasses to be treated.
    treatoperation
    treatoperation
    treatoperation
    treatoperation
    treatoperation
    treatoperation
    treatoperation
    treatoperation
    treatoperation
    diff --git a/doc/devel/uml/index_86.html b/doc/devel/uml/index_86.html index 2429dd829..f75b93690 100644 --- a/doc/devel/uml/index_86.html +++ b/doc/devel/uml/index_86.html @@ -20,23 +20,23 @@ versionattributeversion number of the thing or concept represented by this asset. Of each unique tuple (name, category, org) there will be only one version in the whole system. Version 0 is reserved for internal purposes. Versions are considered to be ordered, and any higher version is supposed to be fully backwards compatible to all previous versions. VFrameclass vframeartifacta buffer and render process holding a Video frame -vid1class instance vid1class instance -vid_Aclass instance +vid1class instance vid_aclass instance -vid_Aclass instance vid_aclass instance +vid_Aclass instance +vid_Aclass instance vid_Aclass instance -videoclass instance videoclass instance +videoclass instance videoclass instance videoclass instance -video1class instance -video1class instance -video1class instance -video1class instance video1class instance +video1class instance video1class instance +video1class instance +video1class instance +video1class instance Visitableclass visitorpackagesub-namespace for visitor library implementation visitorartifactAcyclic Visitor library diff --git a/doc/devel/uml/navig.html b/doc/devel/uml/navig.html index facf4a06c..74b812388 100644 --- a/doc/devel/uml/navig.html +++ b/doc/devel/uml/navig.html @@ -4,7 +4,7 @@ -/mnt/Lager/heim/devel/cin3/doc/devel/uml/navig +/mnt/Lager/heim/devel/lumi/doc/devel/uml/navig diff --git a/doc/devel/uml/packages.html b/doc/devel/uml/packages.html index aac0bc389..c9321815b 100644 --- a/doc/devel/uml/packages.html +++ b/doc/devel/uml/packages.html @@ -22,18 +22,18 @@ BackendLayer buildersrcsourcecode package

    The Builder creating the Render Engine,
    located within the MObject Subsystem Builder -cinelerra3 codegenThis package is used to organize code generation by BOUML. It is considered useless after having generated the initial code skeleton. commonsrcsourcecode package

    Common library and helper classes CommonLib -controllersrcsourcecode package

    The Processing and Render Controller,
    located within the MObject Subsystem Controller +controllersrcsourcecode package

    The Processing and Render Controller,
    located within the MObject Subsystem design designAll things concering the big picture.
    Not a real code package, rather a container for design drafts, specifications, decisions. enginesrcsourcecode package

    The Core Render Engine errorNamespace for Exception Kinds -GUIGUI is here just a container to hold any entities considered to be User Interface related, which is not in focus for this Design draft guisrcsourcecode package

    User Interface classes go here +GUIGUI is here just a container to hold any entities considered to be User Interface related, which is not in focus for this Design draft +lumiera mobjectsrcsourcecode package

    MObject Subsystem
    including the Session (EDL), Builder and Processing Controller MObject procsrcsourcecode package

    All classes belonging to the (middle) processing layer diff --git a/doc/devel/uml/public_properties.html b/doc/devel/uml/public_properties.html index 2cf2100de..6fa20439e 100644 --- a/doc/devel/uml/public_properties.html +++ b/doc/devel/uml/public_properties.html @@ -22,7 +22,7 @@ idAssetAsset primary key. nameAssetelement ID, comprehensible but sanitized. The tuple (category, name, org) is unique. nodesDoAttach -orgAssetorigin or authorship id. Can be a project abbreviation, a package id or just the authors nickname or UID. This allows for the compnent name to be more generic (e.g. "blur"). Default for all assets provided by the core cinelerra-3 codebase is "cin3". +orgAssetorigin or authorship id. Can be a project abbreviation, a package id or just the authors nickname or UID. This allows for the compnent name to be more generic (e.g. "blur"). Default for all assets provided by the core Lumiera codebase is "lumi". pointDoAttachidentifying the point where the nodes should be attached subTracksTrackChild tracks in a tree structure versionAssetversion number of the thing or concept represented by this asset. Of each unique tuple (name, category, org) there will be only one version in the whole system. Version 0 is reserved for internal purposes. Versions are considered to be ordered, and any higher version is supposed to be fully backwards compatible to all previous versions. diff --git a/oldsrc/DIR_INFO b/oldsrc/DIR_INFO index 666124344..e3f9d5b47 100644 --- a/oldsrc/DIR_INFO +++ b/oldsrc/DIR_INFO @@ -1 +1 @@ -cinelerra2 sources, added per case when needed +Cinelerra2 sources, added per case when needed diff --git a/src/backend/mediaaccessfacade.cpp b/src/backend/mediaaccessfacade.cpp index f6a1b8305..ad52698b8 100644 --- a/src/backend/mediaaccessfacade.cpp +++ b/src/backend/mediaaccessfacade.cpp @@ -1,8 +1,8 @@ /* MediaAccessFacade - functions for querying media file and channels. - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -26,13 +26,13 @@ #include "common/util.hpp" using util::isnil; -using cinelerra::error::Invalid; +using lumiera::error::Invalid; namespace backend_interface { /** storage for the SingletonFactory - * (actually a cinelerra::test::MockInjector) */ + * (actually a lumiera::test::MockInjector) */ Singleton MediaAccessFacade::instance; diff --git a/src/backend/mediaaccessfacade.hpp b/src/backend/mediaaccessfacade.hpp index d4c0e3a0d..63741b02e 100644 --- a/src/backend/mediaaccessfacade.hpp +++ b/src/backend/mediaaccessfacade.hpp @@ -1,8 +1,8 @@ /* MEDIAACCESSFACADE.hpp - functions for querying media file and channels. - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -59,7 +59,7 @@ namespace backend_interface * information from this file, NULL if the * file is not acessible. */ - virtual FileHandle queryFile (const char* name) throw(cinelerra::error::Invalid); + virtual FileHandle queryFile (const char* name) throw(lumiera::error::Invalid); /** request for information about the n-th channel * of the file refered by FileHandle. diff --git a/src/common/appconfig.cpp b/src/common/appconfig.cpp index d9475bc97..612376022 100644 --- a/src/common/appconfig.cpp +++ b/src/common/appconfig.cpp @@ -1,8 +1,8 @@ /* Appconfig - for global initialization and configuration - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -34,7 +34,7 @@ using util::isnil; -namespace cinelerra +namespace lumiera { /** This internal pointer to the single instance is deliberately @@ -45,14 +45,14 @@ namespace cinelerra * to beeing dependant on inclusion order of headers. */ // scoped_ptr Appconfig::theApp_; -#ifndef CINELERRA_VERSION -#define CINELERRA_VERSION 3++devel +#ifndef LUMIERA_VERSION +#define LUMIERA_VERSION 3++devel #endif /** perform initialization on first access. * A call is placed in static initialization code - * included in cinelerra.h; thus it will happen + * included in lumiera.h; thus it will happen * probably very early. */ Appconfig::Appconfig() @@ -65,9 +65,9 @@ namespace cinelerra INFO(config, "Basic application configuration triggered."); // install our own handler for undeclared exceptions - std::set_unexpected (cinelerra::error::cinelerra_unexpectedException); + std::set_unexpected (lumiera::error::lumiera_unexpectedException); - (*configParam_)["version"] = STRINGIFY (CINELERRA_VERSION); + (*configParam_)["version"] = STRINGIFY (LUMIERA_VERSION); } @@ -89,10 +89,10 @@ namespace cinelerra catch (...) { ERROR(config, "error while accessing configuration parameter \"%s\".", key.c_str()); - throw cinelerra::error::Fatal (); + throw lumiera::error::Fatal (); } } -} // namespace cinelerra +} // namespace lumiera diff --git a/src/common/appconfig.hpp b/src/common/appconfig.hpp index a3b0e3191..984236755 100644 --- a/src/common/appconfig.hpp +++ b/src/common/appconfig.hpp @@ -1,8 +1,8 @@ /* APPCONFIG.hpp - for global initialization and configuration - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, Christian Thaeter Hermann Vosseler This program is free software; you can redistribute it and/or @@ -34,8 +34,8 @@ */ -#ifndef CINELERRA_APPCONFIG_H -#define CINELERRA_APPCONFIG_H +#ifndef LUMIERA_APPCONFIG_H +#define LUMIERA_APPCONFIG_H #include #include @@ -45,7 +45,7 @@ -namespace cinelerra +namespace lumiera { using std::string; using boost::scoped_ptr; @@ -104,5 +104,5 @@ namespace cinelerra -} // namespace cinelerra +} // namespace lumiera #endif diff --git a/src/common/cmdline.cpp b/src/common/cmdline.cpp index ef23743ca..bf00cf2b2 100644 --- a/src/common/cmdline.cpp +++ b/src/common/cmdline.cpp @@ -1,8 +1,8 @@ /* Cmdline - abstraction of the usual commandline, a sequence of strings - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/common/cmdline.hpp b/src/common/cmdline.hpp index d2ea9e72b..8d7b1e44f 100644 --- a/src/common/cmdline.hpp +++ b/src/common/cmdline.hpp @@ -1,8 +1,8 @@ /* CMDLINE.hpp - abstraction of the usual commandline, a sequence of strings - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/common/configrules.cpp b/src/common/configrules.cpp index c74f70b6a..504df330f 100644 --- a/src/common/configrules.cpp +++ b/src/common/configrules.cpp @@ -1,8 +1,8 @@ /* ConfigRules - interface for rule based configuration - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -28,13 +28,13 @@ -namespace cinelerra +namespace lumiera { namespace query { - CINELERRA_ERROR_DEFINE (CAPABILITY_QUERY, "unresolvable capability query"); + LUMIERA_ERROR_DEFINE (CAPABILITY_QUERY, "unresolvable capability query"); @@ -51,4 +51,4 @@ namespace cinelerra SingletonSub ConfigRules::instance (typeinfo); -} // namespace cinelerra +} // namespace lumiera diff --git a/src/common/configrules.hpp b/src/common/configrules.hpp index 4dcbef8c9..a7f0fe37a 100644 --- a/src/common/configrules.hpp +++ b/src/common/configrules.hpp @@ -1,8 +1,8 @@ /* CONFIGRULES.hpp - interface for rule based configuration - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -36,15 +36,15 @@ ** ** @note this is rather a scrapbook and in flux... don't take this code too literal! ** - ** @see cinelerra::Query + ** @see lumiera::Query ** @see mobject::session::DefsManager ** @see asset::StructFactory ** */ -#ifndef CINELERRA_CONFIGRULES_H -#define CINELERRA_CONFIGRULES_H +#ifndef LUMIERA_CONFIGRULES_H +#define LUMIERA_CONFIGRULES_H #include "common/query.hpp" #include "common/typelistutil.hpp" @@ -61,7 +61,7 @@ -namespace cinelerra +namespace lumiera { using std::string; using std::tr1::shared_ptr; @@ -132,8 +132,8 @@ namespace cinelerra * type TY fulfilling the given Query. To start with, * we use a mock implementation. * (this code works and is already used 2/2008) - * @see cinelerra::query::LookupPreconfigured - * @see cinelerra::query::MockTable + * @see lumiera::query::LookupPreconfigured + * @see lumiera::query::MockTable */ template class QueryHandler @@ -187,7 +187,7 @@ namespace cinelerra - CINELERRA_ERROR_DECLARE (CAPABILITY_QUERY); ///< unresolvable capability query. + LUMIERA_ERROR_DECLARE (CAPABILITY_QUERY); ///< unresolvable capability query. } // namespace query @@ -201,12 +201,12 @@ namespace cinelerra * the list of all concrete types participating in the * rule based config query system */ - typedef cinelerra::typelist::Types < mobject::session::Track - , asset::Track - , asset::Pipe - , const asset::ProcPatt - > ::List - InterfaceTypes; + typedef lumiera::typelist::Types < mobject::session::Track + , asset::Track + , asset::Pipe + , const asset::ProcPatt + > ::List + InterfaceTypes; /** * user-visible Interface to the ConfigRules subsystem. @@ -222,5 +222,5 @@ namespace cinelerra }; -} // namespace cinelerra +} // namespace lumiera #endif diff --git a/src/common/error.cpp b/src/common/error.cpp index 505e6e130..e708c5d3a 100644 --- a/src/common/error.cpp +++ b/src/common/error.cpp @@ -1,8 +1,8 @@ /* - Error - Cinelerra Exception Interface + Error - Lumiera Exception Interface - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -33,7 +33,7 @@ using util::isnil; using std::exception; -namespace cinelerra +namespace lumiera { namespace error @@ -46,23 +46,23 @@ namespace cinelerra */ inline const string default_usermsg (Error* exception_obj) throw() { - return string("Sorry, Cinelerra encountered an internal error. (") + return string("Sorry, Lumiera encountered an internal error. (") + typeid(*exception_obj).name() + ")"; } /* constants to be used as error IDs */ - CINELERRA_ERROR_DEFINE (LOGIC , "internal logic broken"); - CINELERRA_ERROR_DEFINE (FATAL , "floundered"); - CINELERRA_ERROR_DEFINE (CONFIG , "misconfiguration"); - CINELERRA_ERROR_DEFINE (STATE , "unforseen state"); - CINELERRA_ERROR_DEFINE (INVALID , "invalid input or parameters"); - CINELERRA_ERROR_DEFINE (EXTERNAL , "failure in external service"); - CINELERRA_ERROR_DEFINE (ASSERTION, "assertion failure"); + LUMIERA_ERROR_DEFINE (LOGIC , "internal logic broken"); + LUMIERA_ERROR_DEFINE (FATAL , "floundered"); + LUMIERA_ERROR_DEFINE (CONFIG , "misconfiguration"); + LUMIERA_ERROR_DEFINE (STATE , "unforseen state"); + LUMIERA_ERROR_DEFINE (INVALID , "invalid input or parameters"); + LUMIERA_ERROR_DEFINE (EXTERNAL , "failure in external service"); + LUMIERA_ERROR_DEFINE (ASSERTION, "assertion failure"); } // namespace error - CINELERRA_ERROR_DEFINE (EXCEPTION, "generic cinelerra exception"); + LUMIERA_ERROR_DEFINE (EXCEPTION, "generic Lumiera exception"); @@ -75,7 +75,7 @@ namespace cinelerra desc_ (description), cause_ ("") { - cinelerra_error_set (this->id_); + lumiera_error_set (this->id_); } @@ -87,7 +87,7 @@ namespace cinelerra desc_ (description), cause_ (extractCauseMsg(cause)) { - cinelerra_error_set (this->id_); + lumiera_error_set (this->id_); } @@ -103,7 +103,7 @@ namespace cinelerra /** Description of the problem, including the internal char constant - * in accordance to cinelerra's error identification scheme. + * in accordance to Lumiera's error identification scheme. * If a root cause can be obtained, this will be included in the * generated output as well. */ @@ -167,15 +167,15 @@ namespace cinelerra namespace error { - void cinelerra_unexpectedException () throw() + void lumiera_unexpectedException () throw() { const char* is_halted - = "### Cinelerra halted due to an unexpected Error ###"; + = "### Lumiera halted due to an unexpected Error ###"; std::cerr << "\n" << is_halted << "\n\n"; ERROR (NOBUG_ON, "%s", is_halted); - if (const char * errorstate = cinelerra_error ()) + if (const char * errorstate = lumiera_error ()) ERROR (NOBUG_ON, "last registered error was....\n%s", errorstate); std::terminate(); @@ -183,13 +183,12 @@ namespace cinelerra void assertion_terminate (const string& location) { - Fatal exception (location, CINELERRA_ERROR_ASSERTION); - exception.setUsermsg("Program terminated because of violating " - "an internal consistency check."); - throw exception; + throw Fatal (location, LUMIERA_ERROR_ASSERTION) + .setUsermsg("Program terminated because of violating " + "an internal consistency check."); } } // namespace error -} // namespace cinelerra +} // namespace lumiera diff --git a/src/common/error.hpp b/src/common/error.hpp index 82a388e50..71e5f79dc 100644 --- a/src/common/error.hpp +++ b/src/common/error.hpp @@ -1,8 +1,8 @@ /* - ERROR.hpp - Cinelerra Exception Interface + ERROR.hpp - Lumiera Exception Interface - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,26 +21,26 @@ */ -#ifndef CINELERRA_ERROR_HPP_ -#define CINELERRA_ERROR_HPP_ +#ifndef LUMIERA_ERROR_HPP_ +#define LUMIERA_ERROR_HPP_ #include #include "nobugcfg.h" #include "lib/error.h" -namespace cinelerra +namespace lumiera { using std::string; /** error-ID for unspecified exceptions */ - CINELERRA_ERROR_DECLARE(EXCEPTION); + LUMIERA_ERROR_DECLARE(EXCEPTION); /** * Interface and Baseclass of all Exceptions thrown - * from within cinelerra (C++) code. Common operations + * from within Lumiera (C++) code. Common operations * for getting an diagnostic message and for obtaining * the root cause, i.e. the first exception encountered * in a chain of exceptions. @@ -48,9 +48,9 @@ namespace cinelerra class Error : public std::exception { public: - Error (string description="", const char* id=CINELERRA_ERROR_EXCEPTION) throw(); + Error (string description="", const char* id=LUMIERA_ERROR_EXCEPTION) throw(); Error (std::exception& cause, - string description="", const char* id=CINELERRA_ERROR_EXCEPTION) throw(); + string description="", const char* id=LUMIERA_ERROR_EXCEPTION) throw(); Error (const Error&) throw(); virtual ~Error () throw() {}; @@ -58,7 +58,7 @@ namespace cinelerra /** yield a diagnostic message characterizing the problem */ virtual const char* what () const throw(); - /** the internal cinelerra-error-ID (was set as C-errorstate in ctor) */ + /** the internal Lumiera-error-ID (was set as C-errorstate in ctor) */ const char* getID () const throw() { return this->id_; } /** extract the message to be displayed for the user */ @@ -80,7 +80,7 @@ namespace cinelerra private: - const char* id_; ///< an CINELERRA_ERROR id, which is set as errorstate on construction + const char* id_; ///< an LUMIERA_ERROR id, which is set as errorstate on construction string msg_; ///< friendly message intended for users (to be localized) string desc_; ///< detailed description of the error situation for the developers mutable string what_; ///< buffer for generating the detailed description on demand @@ -105,68 +105,68 @@ namespace cinelerra * can be considered a severe design flaw; we can just * add some diagnostics prior to halting. */ - void cinelerra_unexpectedException () throw(); + void lumiera_unexpectedException () throw(); /** throw an error::Fatal indicating "assertion failure" */ void assertion_terminate (const string& location); /* constants to be used as error IDs */ - CINELERRA_ERROR_DECLARE (LOGIC ); ///< contradiction to internal logic assumptions detected - CINELERRA_ERROR_DECLARE (FATAL ); ///< unable to cope with, internal logic floundered - CINELERRA_ERROR_DECLARE (CONFIG ); ///< execution aborted due to misconfiguration - CINELERRA_ERROR_DECLARE (STATE ); ///< unforeseen internal state - CINELERRA_ERROR_DECLARE (INVALID ); ///< invalid input or parameters encountered - CINELERRA_ERROR_DECLARE (EXTERNAL ); ///< failure in external service the application relies on - CINELERRA_ERROR_DECLARE (ASSERTION); ///< assertion failure + LUMIERA_ERROR_DECLARE (LOGIC ); ///< contradiction to internal logic assumptions detected + LUMIERA_ERROR_DECLARE (FATAL ); ///< unable to cope with, internal logic floundered + LUMIERA_ERROR_DECLARE (CONFIG ); ///< execution aborted due to misconfiguration + LUMIERA_ERROR_DECLARE (STATE ); ///< unforeseen internal state + LUMIERA_ERROR_DECLARE (INVALID ); ///< invalid input or parameters encountered + LUMIERA_ERROR_DECLARE (EXTERNAL ); ///< failure in external service the application relies on + LUMIERA_ERROR_DECLARE (ASSERTION); ///< assertion failure /** Macro for creating derived exception classes properly - * integrated into cinelerra's exception hierarchy. Using - * this macro ensures that the new class will get the full + * integrated into Lumiera's exception hierarchy. Using + * this macro asures that the new class will get the full * set of constructors and behaviour common to all exception * classes, so it should be used when creating an derived * exception type for more then stricly local purposes */ -#define CINELERRA_EXCEPTION_DECLARE(CLASS, PARENT, _ID_) \ - class CLASS : public PARENT \ - { \ - public: \ - CLASS (std::string description="", \ - const char* id=_ID_) throw() \ - : PARENT (description, id) {} \ - \ - CLASS (std::exception& cause, \ - std::string description="", \ - const char* id=_ID_) throw() \ - : PARENT (cause, description, id) {} \ +#define LUMIERA_EXCEPTION_DECLARE(CLASS, PARENT, _ID_) \ + class CLASS : public PARENT \ + { \ + public: \ + CLASS (std::string description="", \ + const char* id=_ID_) throw() \ + : PARENT (description, id) {} \ + \ + CLASS (std::exception& cause, \ + std::string description="", \ + const char* id=_ID_) throw() \ + : PARENT (cause, description, id) {} \ }; - //---------------------------CLASS-----PARENT--ID---------------------- - CINELERRA_EXCEPTION_DECLARE (Logic, Error, CINELERRA_ERROR_LOGIC); - CINELERRA_EXCEPTION_DECLARE (Fatal, Logic, CINELERRA_ERROR_FATAL); - CINELERRA_EXCEPTION_DECLARE (Config, Error, CINELERRA_ERROR_CONFIG); - CINELERRA_EXCEPTION_DECLARE (State, Error, CINELERRA_ERROR_STATE); - CINELERRA_EXCEPTION_DECLARE (Invalid, Error, CINELERRA_ERROR_INVALID); - CINELERRA_EXCEPTION_DECLARE (External, Error, CINELERRA_ERROR_EXTERNAL); + //-------------------------CLASS-----PARENT--ID---------------------- + LUMIERA_EXCEPTION_DECLARE (Logic, Error, LUMIERA_ERROR_LOGIC); + LUMIERA_EXCEPTION_DECLARE (Fatal, Logic, LUMIERA_ERROR_FATAL); + LUMIERA_EXCEPTION_DECLARE (Config, Error, LUMIERA_ERROR_CONFIG); + LUMIERA_EXCEPTION_DECLARE (State, Error, LUMIERA_ERROR_STATE); + LUMIERA_EXCEPTION_DECLARE (Invalid, Error, LUMIERA_ERROR_INVALID); + LUMIERA_EXCEPTION_DECLARE (External, Error, LUMIERA_ERROR_EXTERNAL); } // namespace error -} // namespace cinelerra +} // namespace lumiera /****************************************************** * if NoBug is used, redefine some macros - * to rather throw Cinelerra Errors instead of aborting + * to rather throw Lumiera Errors instead of aborting */ #ifdef NOBUG_ABORT #undef NOBUG_ABORT -#define CIN_NOBUG_LOCATION \ +#define LUMIERA_NOBUG_LOCATION \ std::string (NOBUG_BASENAME(__FILE__)) +":"+ NOBUG_STRINGIZE(__LINE__) + ", function " + __func__ #define NOBUG_ABORT \ - cinelerra::error::assertion_terminate (CIN_NOBUG_LOCATION); + lumiera::error::assertion_terminate (LUMIERA_NOBUG_LOCATION); #endif -#endif // CINELERRA_ERROR_HPP_ +#endif // LUMIERA_ERROR_HPP_ diff --git a/src/common/factory.hpp b/src/common/factory.hpp index 8c96fd14c..5645cfba6 100644 --- a/src/common/factory.hpp +++ b/src/common/factory.hpp @@ -1,8 +1,8 @@ /* FACTORY.hpp - template for object/smart-pointer factories - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,14 +21,14 @@ */ -#ifndef CINELERRA_FACTORY_H -#define CINELERRA_FACTORY_H +#ifndef LUMIERA_FACTORY_H +#define LUMIERA_FACTORY_H #include -namespace cinelerra +namespace lumiera { namespace factory { @@ -141,5 +141,5 @@ namespace cinelerra using factory::Factory; -} // namespace cinelerra +} // namespace lumiera #endif diff --git a/src/common/multithread.hpp b/src/common/multithread.hpp index 0dc79e7c2..1dbbac519 100644 --- a/src/common/multithread.hpp +++ b/src/common/multithread.hpp @@ -1,8 +1,8 @@ /* MULTITHREAD.hpp - generic interface for multithreading primitives - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, Christian Thaeter Hermann Vosseler This program is free software; you can redistribute it and/or @@ -23,21 +23,21 @@ -#ifndef CINELERRA_MULTITHREAD_H -#define CINELERRA_MULTITHREAD_H +#ifndef LUMIERA_MULTITHREAD_H +#define LUMIERA_MULTITHREAD_H #include "nobugcfg.h" -namespace cinelerra +namespace lumiera { /** * Interface/Policy for managing parallelism issues. * Basically everything is forwarded to the corresponding backend functions, - * because managing threads and locking belongs to the cinelerra backend layer. + * because managing threads and locking belongs to the Lumiera backend layer. * - * @todo actually implement this policy using the cinelerra databackend. + * @todo actually implement this policy using the Lumiera databackend. */ struct Thread { @@ -52,5 +52,5 @@ namespace cinelerra }; -} // namespace cinelerra +} // namespace lumiera #endif diff --git a/src/common/query.cpp b/src/common/query.cpp index 152086bc3..266c628e5 100644 --- a/src/common/query.cpp +++ b/src/common/query.cpp @@ -1,8 +1,8 @@ /* Query - interface for capability queries - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -39,7 +39,7 @@ using boost::algorithm::is_alpha; using util::contains; -namespace cinelerra +namespace lumiera { namespace query @@ -92,4 +92,4 @@ namespace cinelerra /** */ -} // namespace cinelerra +} // namespace lumiera diff --git a/src/common/query.hpp b/src/common/query.hpp index 9bdb3a389..591c45c74 100644 --- a/src/common/query.hpp +++ b/src/common/query.hpp @@ -1,8 +1,8 @@ /* QUERY.hpp - interface for capability queries - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,8 +21,8 @@ */ -#ifndef CINELERRA_QUERY_H -#define CINELERRA_QUERY_H +#ifndef LUMIERA_QUERY_H +#define LUMIERA_QUERY_H #include @@ -31,7 +31,7 @@ #include -namespace cinelerra +namespace lumiera { using std::string; using boost::format; @@ -75,5 +75,5 @@ namespace cinelerra } // namespace query -} // namespace cinelerra +} // namespace lumiera #endif diff --git a/src/common/query/mockconfigrules.cpp b/src/common/query/mockconfigrules.cpp index 54ba5aaf1..6a4303cd0 100644 --- a/src/common/query/mockconfigrules.cpp +++ b/src/common/query/mockconfigrules.cpp @@ -1,8 +1,8 @@ /* MockConfigRules - mock implementation of the config rules system - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -33,7 +33,7 @@ -namespace cinelerra +namespace lumiera { namespace query @@ -149,4 +149,4 @@ namespace cinelerra /** */ -} // namespace cinelerra +} // namespace lumiera diff --git a/src/common/query/mockconfigrules.hpp b/src/common/query/mockconfigrules.hpp index 7466f7050..909f7ee50 100644 --- a/src/common/query/mockconfigrules.hpp +++ b/src/common/query/mockconfigrules.hpp @@ -1,8 +1,8 @@ /* MOCKCONFIGRULES.hpp - mock implementation of the config rules system - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -29,14 +29,14 @@ ** -- later on, when we use a real Prolog interpreter, it still may be useful for ** testing and debugging. ** - ** @see cinelerra::Query - ** @see cinelerra::ConfigRules + ** @see lumiera::Query + ** @see lumiera::ConfigRules ** */ -#ifndef CINELERRA_MOCKCONFIGRULES_H -#define CINELERRA_MOCKCONFIGRULES_H +#ifndef LUMIERA_MOCKCONFIGRULES_H +#define LUMIERA_MOCKCONFIGRULES_H #include "common/configrules.hpp" #include "common/util.hpp" @@ -48,7 +48,7 @@ -namespace cinelerra +namespace lumiera { //using std::string; @@ -77,7 +77,7 @@ namespace cinelerra * the actual table holding preconfigured answers * packaged as boost::any objects. */ - class MockTable : public cinelerra::ConfigRules + class MockTable : public lumiera::ConfigRules { typedef std::map Tab; typedef boost::scoped_ptr PTab; @@ -134,7 +134,7 @@ namespace cinelerra { protected: MockConfigRules (); ///< to be used only by the singleton factory - friend class cinelerra::singleton::StaticCreate; + friend class lumiera::singleton::StaticCreate; virtual ~MockConfigRules() {} @@ -148,5 +148,5 @@ namespace cinelerra } // namespace query -} // namespace cinelerra +} // namespace lumiera #endif diff --git a/src/common/singleton.hpp b/src/common/singleton.hpp index 677b454d3..c5de1474d 100644 --- a/src/common/singleton.hpp +++ b/src/common/singleton.hpp @@ -1,8 +1,8 @@ /* SINGLETON.hpp - configuration header for singleton factory - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -30,7 +30,7 @@ ** 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 cinelerra::singleton in singletonpreconfigure.hpp + ** definition of type lumiera::singleton in singletonpreconfigure.hpp ** ** @see SingletonFactory ** @see singleton::StaticCreate @@ -40,8 +40,8 @@ */ -#ifndef CINELERRA_SINGLETON_H -#define CINELERRA_SINGLETON_H +#ifndef LUMIERA_SINGLETON_H +#define LUMIERA_SINGLETON_H #include "common/singletonpolicies.hpp" diff --git a/src/common/singletonfactory.hpp b/src/common/singletonfactory.hpp index a0f63c978..9fdf21d21 100644 --- a/src/common/singletonfactory.hpp +++ b/src/common/singletonfactory.hpp @@ -1,8 +1,8 @@ /* SINGLETONFACTORY.hpp - template for implementing the singleton pattern - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -31,8 +31,8 @@ This code is heavily inspired by -#ifndef CINELERRA_SINGLETONFACTORY_H -#define CINELERRA_SINGLETONFACTORY_H +#ifndef LUMIERA_SINGLETONFACTORY_H +#define LUMIERA_SINGLETONFACTORY_H #include "common/singletonpolicies.hpp" ///< several Policies usable together with SingletonFactory @@ -42,7 +42,7 @@ This code is heavily inspired by -namespace cinelerra +namespace lumiera { /** @@ -135,5 +135,5 @@ namespace cinelerra ///// It seems this would either cost us much of the flexibility or get complicated ///// to a point where we could as well implement our own Depenency Injection Manager. -} // namespace cinelerra +} // namespace lumiera #endif diff --git a/src/common/singletonpolicies.hpp b/src/common/singletonpolicies.hpp index 7e6f90acf..f0b448305 100644 --- a/src/common/singletonpolicies.hpp +++ b/src/common/singletonpolicies.hpp @@ -1,8 +1,8 @@ /* SINGLETONPOLICIES.hpp - how to manage creation, lifecycle and multithreading - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -31,8 +31,8 @@ This code is heavily inspired by -#ifndef CINELERRA_SINGLETONPOLICIES_H -#define CINELERRA_SINGLETONPOLICIES_H +#ifndef LUMIERA_SINGLETONPOLICIES_H +#define LUMIERA_SINGLETONPOLICIES_H #include "common/multithread.hpp" #include "common/error.hpp" @@ -40,11 +40,11 @@ This code is heavily inspired by #include -namespace cinelerra +namespace lumiera { namespace singleton { - /* == several Policies usable in conjunction with cinelerra::Singleton == */ + /* === several Policies usable in conjunction with lumiera::Singleton === */ /** * Policy placing the Singleton instance into a statically allocated buffer @@ -133,13 +133,13 @@ namespace cinelerra /** * Policy for handling multithreaded access to the singleton instance - * @todo actually implement this policy using the cinelerra databackend. + * @todo actually implement this policy using the Lumiera databackend. */ template struct Multithreaded { typedef volatile S VolatileType; - typedef cinelerra::Thread::Lock Lock; + typedef lumiera::Thread::Lock Lock; }; @@ -156,5 +156,5 @@ namespace cinelerra } // namespace singleton -} // namespace cinelerra +} // namespace lumiera #endif diff --git a/src/common/singletonpreconfigure.hpp b/src/common/singletonpreconfigure.hpp index c7f08ae6a..e9b12e3d6 100644 --- a/src/common/singletonpreconfigure.hpp +++ b/src/common/singletonpreconfigure.hpp @@ -1,8 +1,8 @@ /* SINGLETONPRECONFIGURE - declare the configuration of some Singleton types in advance - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -31,7 +31,7 @@ ** One reason why one wants special Singleton behaviour is testing: Without ** altering the executable, for running some tests we need to inject a Test Mock ** in place of some service object, so we can verify the behaviour of the code - ** using this service. For this, we mix cinelerra::test::MockInjector + ** using this service. For this, we mix lumiera::test::MockInjector ** into the actual Singleton type. ** ** @note we declare the specialisations into the target namespace @@ -41,13 +41,13 @@ */ -#ifndef CINELERRA_SINGLETONPRECONFIGURE_H -#define CINELERRA_SINGLETONPRECONFIGURE_H +#ifndef LUMIERA_SINGLETONPRECONFIGURE_H +#define LUMIERA_SINGLETONPRECONFIGURE_H #include "common/test/mockinjector.hpp" -namespace cinelerra +namespace lumiera { /** * Default Singleton configuration @@ -67,15 +67,15 @@ namespace cinelerra namespace test { class TestSingletonO; - using cinelerra::Singleton; + using lumiera::Singleton; } // namespace test -} // namespace cinelerra +} // namespace lumiera namespace backend_interface { class MediaAccessFacade; - using cinelerra::Singleton; + using lumiera::Singleton; } // namespace backend_interface @@ -87,7 +87,7 @@ namespace backend_interface /* Specialisation Definitions */ /* ************************** */ -namespace cinelerra +namespace lumiera { using test::MockInjector; @@ -104,7 +104,7 @@ namespace cinelerra : public MockInjector { }; -} // namespace cinelerra +} // namespace lumiera diff --git a/src/common/singletonsubclass.hpp b/src/common/singletonsubclass.hpp index 269351185..a7e800487 100644 --- a/src/common/singletonsubclass.hpp +++ b/src/common/singletonsubclass.hpp @@ -1,8 +1,8 @@ /* SINGLETONSUBCLASS.hpp - variant of the singleton (factory) creating a subclass - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -35,8 +35,8 @@ */ -#ifndef CINELERRA_SINGLETONSUBCLASS_H -#define CINELERRA_SINGLETONSUBCLASS_H +#ifndef LUMIERA_SINGLETONSUBCLASS_H +#define LUMIERA_SINGLETONSUBCLASS_H #include "common/singleton.hpp" @@ -45,7 +45,7 @@ #include -namespace cinelerra +namespace lumiera { using boost::scoped_ptr; @@ -53,7 +53,7 @@ namespace cinelerra namespace singleton { /** - * Helper template to use the general policy classes of the cinelerra::Singleton, + * Helper template to use the general policy classes of the lumiera::Singleton, * but change the way they are parametrized on-the-fly. */ template class POL, class I> @@ -174,6 +174,6 @@ namespace cinelerra }; -} // namespace cinelerra +} // namespace lumiera #endif diff --git a/src/common/test/mockinjector.hpp b/src/common/test/mockinjector.hpp index 8e567fe5d..4daf78081 100644 --- a/src/common/test/mockinjector.hpp +++ b/src/common/test/mockinjector.hpp @@ -1,8 +1,8 @@ /* MOCKINJECTOR.hpp - replacement singleton factory for injecting Test-Mock objects - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -22,8 +22,8 @@ -#ifndef CINELERRA_TEST_MOCKINJECTOR_H -#define CINELERRA_TEST_MOCKINJECTOR_H +#ifndef LUMIERA_TEST_MOCKINJECTOR_H +#define LUMIERA_TEST_MOCKINJECTOR_H #include "common/singletonfactory.hpp" @@ -31,7 +31,7 @@ #include -namespace cinelerra +namespace lumiera { namespace test { @@ -90,5 +90,5 @@ namespace cinelerra } // namespace test -} // namespace cinelerra +} // namespace lumiera #endif diff --git a/src/common/test/run.hpp b/src/common/test/run.hpp index 0cee56674..b38729d8a 100644 --- a/src/common/test/run.hpp +++ b/src/common/test/run.hpp @@ -1,8 +1,8 @@ /* RUN.hpp - helper class for grouping, registering and invoking testcases - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, Christian Thaeter Hermann Vosseler This program is free software; you can redistribute it and/or diff --git a/src/common/test/suite.cpp b/src/common/test/suite.cpp index cca65903f..897a7d04f 100644 --- a/src/common/test/suite.cpp +++ b/src/common/test/suite.cpp @@ -1,8 +1,8 @@ /* Suite - helper class for running collections of tests - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -133,7 +133,7 @@ namespace test TRACE(test, "Test-Suite( groupID=%s )\n", groupID.c_str () ); if (!testcases.getGroup(groupID)) - throw cinelerra::error::Invalid (); + throw lumiera::error::Invalid (); //throw "empty testsuite"; /////////// TODO Errorhandling! } @@ -155,7 +155,7 @@ namespace test { PTestMap tests = testcases.getGroup(groupID_); if (!tests) - throw cinelerra::error::Invalid (); ///////// TODO: pass error description + throw lumiera::error::Invalid (); ///////// TODO: pass error description if (0 < cmdline.size()) { @@ -209,7 +209,7 @@ namespace test } catch (...) { - std::cout << "PLANNED ============= " << cinelerra_error() << "\n"; + std::cout << "PLANNED ============= " << lumiera_error() << "\n"; } std::cout << "END\n"; } diff --git a/src/common/test/suite.hpp b/src/common/test/suite.hpp index 4e525a7cd..afdb9e3d6 100644 --- a/src/common/test/suite.hpp +++ b/src/common/test/suite.hpp @@ -1,8 +1,8 @@ /* SUITE.hpp - helper class for running collections of tests - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/common/test/testoption.cpp b/src/common/test/testoption.cpp index 3e40a063c..aaaff32b8 100644 --- a/src/common/test/testoption.cpp +++ b/src/common/test/testoption.cpp @@ -1,8 +1,8 @@ /* Suite - helper class for running collections of tests - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/common/test/testoption.hpp b/src/common/test/testoption.hpp index 8b1a012d3..28a82ff55 100644 --- a/src/common/test/testoption.hpp +++ b/src/common/test/testoption.hpp @@ -1,8 +1,8 @@ /* TESTOPTION.hpp - handle cmdline for invoking Testsuite - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/common/time.cpp b/src/common/time.cpp index 12798a58d..a37979c6b 100644 --- a/src/common/time.cpp +++ b/src/common/time.cpp @@ -1,8 +1,8 @@ /* Time - unified representation of a time point, including conversion functions - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -25,7 +25,7 @@ #include -namespace cinelerra +namespace lumiera { // TODO: dummy values; should be adjusted when switching to the real time implementation provided by the backend @@ -34,4 +34,4 @@ namespace cinelerra const Time Time::MIN = -std::numeric_limits::max(); -} // namespace cinelerra +} // namespace lumiera diff --git a/src/common/time.hpp b/src/common/time.hpp index c0d832098..d065c3f36 100644 --- a/src/common/time.hpp +++ b/src/common/time.hpp @@ -1,8 +1,8 @@ /* TIME.hpp - unified representation of a time point, including conversion functions - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,13 +21,13 @@ */ -#ifndef CINELERRA_TIME_H -#define CINELERRA_TIME_H +#ifndef LUMIERA_TIME_H +#define LUMIERA_TIME_H #include -namespace cinelerra +namespace lumiera { @@ -56,5 +56,5 @@ namespace cinelerra -} // namespace cinelerra +} // namespace lumiera #endif diff --git a/src/common/typelist.hpp b/src/common/typelist.hpp index 11bfd355c..f358a605e 100644 --- a/src/common/typelist.hpp +++ b/src/common/typelist.hpp @@ -1,8 +1,8 @@ /* TYPELIST.hpp - typelist meta programming facilities - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -47,19 +47,19 @@ This code is heavily inspired by ** ** Interface for using this facility is the template Types(.....) for up to 20 Type parameters ** - ** @see cinelerra::visitor::Applicable usage example + ** @see lumiera::visitor::Applicable usage example ** @see typelisttest.cpp ** */ -#ifndef CINELERRA_TYPELIST_H -#define CINELERRA_TYPELIST_H +#ifndef LUMIERA_TYPELIST_H +#define LUMIERA_TYPELIST_H -namespace cinelerra +namespace lumiera { namespace typelist { @@ -116,5 +116,5 @@ namespace cinelerra } // namespace typelist -} // namespace cinelerra +} // namespace lumiera #endif diff --git a/src/common/typelistutil.hpp b/src/common/typelistutil.hpp index 3f3ec1a02..4e382df3d 100644 --- a/src/common/typelistutil.hpp +++ b/src/common/typelistutil.hpp @@ -1,8 +1,8 @@ /* TYPELISTUTIL.hpp - metaprogramming utilities for lists-of-types - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -39,22 +39,22 @@ This code is heavily inspired by /** @file typelistutil.hpp - ** Helpers for working with cinelerra::typelist::Types (i.e. lists-of-types). + ** Helpers for working with lumiera::typelist::Types (i.e. lists-of-types). ** - ** @see cinelerra::query::ConfigRules usage example + ** @see lumiera::query::ConfigRules usage example ** @see typelist.hpp ** */ -#ifndef CINELERRA_TYPELISTUTIL_H -#define CINELERRA_TYPELISTUTIL_H +#ifndef LUMIERA_TYPELISTUTIL_H +#define LUMIERA_TYPELISTUTIL_H #include "common/typelist.hpp" -namespace cinelerra +namespace lumiera { namespace typelist { @@ -143,5 +143,5 @@ namespace cinelerra } // namespace typelist -} // namespace cinelerra +} // namespace lumiera #endif diff --git a/src/common/util.cpp b/src/common/util.cpp index f80b5d2b6..32e5bc84f 100644 --- a/src/common/util.cpp +++ b/src/common/util.cpp @@ -1,8 +1,8 @@ /* util.cpp - helper functions implementation - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/common/util.hpp b/src/common/util.hpp index 6b3a35096..a4c3c4b54 100644 --- a/src/common/util.hpp +++ b/src/common/util.hpp @@ -1,8 +1,8 @@ /* UTIL.hpp - collection of small helper functions used "everywhere" - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/common/visitor.cpp b/src/common/visitor.cpp index 4903b6d5d..91b195623 100644 --- a/src/common/visitor.cpp +++ b/src/common/visitor.cpp @@ -1,8 +1,8 @@ /* Vistitable,Tool,Applicable - Acyclic Visitor library - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -23,7 +23,7 @@ #include "common/visitor.hpp" -namespace cinelerra +namespace lumiera { namespace visitor { @@ -32,4 +32,4 @@ namespace cinelerra } // namespace visitor -} // namespace cinelerra +} // namespace lumiera diff --git a/src/common/visitor.hpp b/src/common/visitor.hpp index ed37c1963..837ddf713 100644 --- a/src/common/visitor.hpp +++ b/src/common/visitor.hpp @@ -1,8 +1,8 @@ /* VISITOR.hpp - Generic Visitor library implementation - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -37,7 +37,7 @@ Credits for many further implementation ideas go to /** @file visitor.hpp ** A library implementation of the Visitor Pattern taylored specifically - ** to cinelerra's needs within the Proc Layer. Visitor enables double dispatch + ** to Lumiera's needs within the Proc Layer. Visitor enables double dispatch ** calls, based both on the concrete type of some target object and the concrete type of ** a tool object being applied to this target. The code carrying out this tool application ** (and thus triggering the double dispatch) need not know any of these concret types and is @@ -73,8 +73,8 @@ Credits for many further implementation ideas go to -#ifndef CINELERRA_VISITOR_H -#define CINELERRA_VISITOR_H +#ifndef LUMIERA_VISITOR_H +#define LUMIERA_VISITOR_H #include "common/visitorpolicies.hpp" #include "common/visitordispatcher.hpp" @@ -82,7 +82,7 @@ Credits for many further implementation ideas go to #include "common/typelist.hpp" -namespace cinelerra +namespace lumiera { namespace visitor { @@ -229,5 +229,5 @@ namespace cinelerra } // namespace visitor -} // namespace cinelerra +} // namespace lumiera #endif diff --git a/src/common/visitordispatcher.hpp b/src/common/visitordispatcher.hpp index 50d726761..dcc28391b 100644 --- a/src/common/visitordispatcher.hpp +++ b/src/common/visitordispatcher.hpp @@ -1,8 +1,8 @@ /* VISITORDISPATCHER.hpp - visitor implementation details - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -22,8 +22,8 @@ -#ifndef CINELERRA_VISITORDISPATCHER_H -#define CINELERRA_VISITORDISPATCHER_H +#ifndef LUMIERA_VISITORDISPATCHER_H +#define LUMIERA_VISITORDISPATCHER_H #include "common/error.hpp" #include "common/util.hpp" @@ -33,7 +33,7 @@ #include -namespace cinelerra +namespace lumiera { namespace visitor { @@ -211,5 +211,5 @@ namespace cinelerra } // namespace visitor -} // namespace cinelerra +} // namespace lumiera #endif diff --git a/src/common/visitorpolicies.hpp b/src/common/visitorpolicies.hpp index 2fd0cb37f..e59a2f5b2 100644 --- a/src/common/visitorpolicies.hpp +++ b/src/common/visitorpolicies.hpp @@ -1,8 +1,8 @@ /* VISITOR.hpp - Acyclic Visitor library - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -22,20 +22,20 @@ /** @file visitorpolicies.hpp - ** Policies usable for configuring the cinelerra::visitor::Tool for different kinds of error handling. + ** Policies usable for configuring the lumiera::visitor::Tool for different kinds of error handling. ** @see buildertool.hpp for another flavor (calling and catch-all-function) ** */ -#ifndef CINELERRA_VISITORPOLICIES_H -#define CINELERRA_VISITORPOLICIES_H +#ifndef LUMIERA_VISITORPOLICIES_H +#define LUMIERA_VISITORPOLICIES_H #include "common/error.hpp" -namespace cinelerra +namespace lumiera { namespace visitor { @@ -65,7 +65,7 @@ namespace cinelerra RET onUnknown (TAR&) { - throw cinelerra::error::Config("unable to decide what tool operation to call"); + throw lumiera::error::Config("unable to decide what tool operation to call"); } }; @@ -73,5 +73,5 @@ namespace cinelerra } // namespace visitor -} // namespace cinelerra +} // namespace lumiera #endif diff --git a/src/lib/DIR_INFO b/src/lib/DIR_INFO index 1bc5bfed3..6946a8b7e 100644 --- a/src/lib/DIR_INFO +++ b/src/lib/DIR_INFO @@ -1,2 +1,2 @@ -cinelerra support library +Lumiera support library This dir contains the code for some tools and library code which will be used in many places diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index f0b6b2792..89da7dc19 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) CinelerraCV +# Copyright (C) Lumiera.org # 2007, Christian Thaeter # # This program is free software; you can redistribute it and/or @@ -15,31 +15,31 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -libcin3_a_srcdir = $(top_srcdir)/src/lib -noinst_LIBRARIES += libcin3.a +liblumi_a_srcdir = $(top_srcdir)/src/lib +noinst_LIBRARIES += liblumi.a -libcin3_a_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror -libcin3_a_CPPFLAGS = -I$(top_srcdir)/src/ +liblumi_a_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror +liblumi_a_CPPFLAGS = -I$(top_srcdir)/src/ -libcin3_a_SOURCES = \ - $(libcin3_a_srcdir)/plugin.c \ - $(libcin3_a_srcdir)/error.c \ - $(libcin3_a_srcdir)/time.c \ - $(libcin3_a_srcdir)/framerate.c \ - $(libcin3_a_srcdir)/mutex.c \ - $(libcin3_a_srcdir)/rwlock.c \ - $(libcin3_a_srcdir)/condition.c \ - $(libcin3_a_srcdir)/references.c +liblumi_a_SOURCES = \ + $(liblumi_a_srcdir)/plugin.c \ + $(liblumi_a_srcdir)/error.c \ + $(liblumi_a_srcdir)/time.c \ + $(liblumi_a_srcdir)/framerate.c \ + $(liblumi_a_srcdir)/mutex.c \ + $(liblumi_a_srcdir)/rwlock.c \ + $(liblumi_a_srcdir)/condition.c \ + $(liblumi_a_srcdir)/references.c noinst_HEADERS += \ - $(libcin3_a_srcdir)/plugin.h \ - $(libcin3_a_srcdir)/error.h \ - $(libcin3_a_srcdir)/time.h \ - $(libcin3_a_srcdir)/framerate.h \ - $(libcin3_a_srcdir)/locking.h \ - $(libcin3_a_srcdir)/mutex.h \ - $(libcin3_a_srcdir)/rwlock.h \ - $(libcin3_a_srcdir)/condition.h \ - $(libcin3_a_srcdir)/references.h + $(liblumi_a_srcdir)/plugin.h \ + $(liblumi_a_srcdir)/error.h \ + $(liblumi_a_srcdir)/time.h \ + $(liblumi_a_srcdir)/framerate.h \ + $(liblumi_a_srcdir)/locking.h \ + $(liblumi_a_srcdir)/mutex.h \ + $(liblumi_a_srcdir)/rwlock.h \ + $(liblumi_a_srcdir)/condition.h \ + $(liblumi_a_srcdir)/references.h diff --git a/src/lib/condition.c b/src/lib/condition.c index dfc79c7c5..7427b431d 100644 --- a/src/lib/condition.c +++ b/src/lib/condition.c @@ -1,8 +1,8 @@ /* condition.c - condition variable - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -30,8 +30,8 @@ * @param self is a pointer to the condition variable to be initialized * @return self as given */ -CinelerraCondition -cinelerra_condition_init (CinelerraCondition self) +LumieraCondition +lumiera_condition_init (LumieraCondition self) { if (self) { @@ -47,15 +47,15 @@ cinelerra_condition_init (CinelerraCondition self) * @param self is a pointer to the condition variable to be destroyed * @return self as given */ -CinelerraCondition -cinelerra_condition_destroy (CinelerraCondition self) +LumieraCondition +lumiera_condition_destroy (LumieraCondition self) { if (self) { if (pthread_mutex_destroy (&self->mutex)) - CINELERRA_DIE; + LUMIERA_DIE; else if (pthread_cond_destroy (&self->cond)) - CINELERRA_DIE; + LUMIERA_DIE; } return self; } diff --git a/src/lib/condition.h b/src/lib/condition.h index 7925fd993..b2fd76c63 100644 --- a/src/lib/condition.h +++ b/src/lib/condition.h @@ -1,8 +1,8 @@ /* condition.h - condition variables - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -19,8 +19,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef CINELERRA_CONDITION_H -#define CINELERRA_CONDITION_H +#ifndef LUMIERA_CONDITION_H +#define LUMIERA_CONDITION_H #include "lib/locking.h" @@ -33,21 +33,21 @@ * Condition variables. * */ -struct cinelerra_condition_struct +struct lumiera_condition_struct { pthread_cond_t cond; pthread_mutex_t mutex; }; -typedef struct cinelerra_condition_struct cinelerra_condition; -typedef cinelerra_condition* CinelerraCondition; +typedef struct lumiera_condition_struct lumiera_condition; +typedef lumiera_condition* LumieraCondition; -CinelerraCondition -cinelerra_condition_init (CinelerraCondition self); +LumieraCondition +lumiera_condition_init (LumieraCondition self); -CinelerraCondition -cinelerra_condition_destroy (CinelerraCondition self); +LumieraCondition +lumiera_condition_destroy (LumieraCondition self); /** @@ -55,14 +55,14 @@ cinelerra_condition_destroy (CinelerraCondition self); * @param self condition variable to be signaled, must be given, all errors are fatal */ static inline void -cinelerra_condition_signal (CinelerraCondition self) +lumiera_condition_signal (LumieraCondition self) { REQUIRE (self); if (pthread_mutex_lock (&self->mutex)) - CINELERRA_DIE; + LUMIERA_DIE; pthread_cond_signal (&self->cond); if (pthread_mutex_unlock (&self->mutex)) - CINELERRA_DIE; + LUMIERA_DIE; } /** @@ -70,14 +70,14 @@ cinelerra_condition_signal (CinelerraCondition self) * @param self condition variable to be signaled, must be given, all errors are fatal */ static inline void -cinelerra_condition_broadcast (CinelerraCondition self) +lumiera_condition_broadcast (LumieraCondition self) { REQUIRE (self); if (pthread_mutex_lock (&self->mutex)) - CINELERRA_DIE; + LUMIERA_DIE; pthread_cond_broadcast (&self->cond); if (pthread_mutex_unlock (&self->mutex)) - CINELERRA_DIE; + LUMIERA_DIE; } @@ -87,44 +87,44 @@ cinelerra_condition_broadcast (CinelerraCondition self) /** * conditionacquirer used to manage the state of a condition variable. */ -struct cinelerra_conditionacquirer_struct +struct lumiera_conditionacquirer_struct { - CinelerraCondition cond; - enum cinelerra_lockstate state; + LumieraCondition cond; + enum lumiera_lockstate state; }; -typedef struct cinelerra_conditionacquirer_struct cinelerra_conditionacquirer; -typedef struct cinelerra_conditionacquirer_struct* CinelerraConditionacquirer; +typedef struct lumiera_conditionacquirer_struct lumiera_conditionacquirer; +typedef struct lumiera_conditionacquirer_struct* LumieraConditionacquirer; /* helper function for nobug */ static inline void -cinelerra_conditionacquirer_ensureunlocked (CinelerraConditionacquirer self) +lumiera_conditionacquirer_ensureunlocked (LumieraConditionacquirer self) { - ENSURE (self->state == CINELERRA_UNLOCKED, "forgot to unlock the condition mutex"); + ENSURE (self->state == LUMIERA_UNLOCKED, "forgot to unlock the condition mutex"); } /* override with a macro to use the cleanup checker */ -#define cinelerra_conditionacquirer \ -cinelerra_conditionacquirer NOBUG_CLEANUP(cinelerra_conditionacquirer_ensureunlocked) +#define lumiera_conditionacquirer \ +lumiera_conditionacquirer NOBUG_CLEANUP(lumiera_conditionacquirer_ensureunlocked) /** * initialize a conditionacquirer state * @param self conditionacquirer to be initialized, must be an automatic variable * @param cond associated condition variable - * @param state initial state of the mutex, either CINELERRA_LOCKED or CINELERRA_UNLOCKED + * @param state initial state of the mutex, either LUMIERA_LOCKED or LUMIERA_UNLOCKED * @return self as given * errors are fatal */ -static inline CinelerraConditionacquirer -cinelerra_conditionacquirer_init (CinelerraConditionacquirer self, CinelerraCondition cond, enum cinelerra_lockstate state) +static inline LumieraConditionacquirer +lumiera_conditionacquirer_init (LumieraConditionacquirer self, LumieraCondition cond, enum lumiera_lockstate state) { REQUIRE (self); REQUIRE (cond); self->cond = cond; self->state = state; - if (state == CINELERRA_LOCKED) + if (state == LUMIERA_LOCKED) if (pthread_mutex_lock (&cond->mutex)) - CINELERRA_DIE; + LUMIERA_DIE; return self; } @@ -135,15 +135,15 @@ cinelerra_conditionacquirer_init (CinelerraConditionacquirer self, CinelerraCond * @param self conditionacquirer associated with a condition variable */ static inline void -cinelerra_conditionacquirer_lock (CinelerraConditionacquirer self) +lumiera_conditionacquirer_lock (LumieraConditionacquirer self) { REQUIRE (self); - REQUIRE (self->state == CINELERRA_UNLOCKED, "mutex already locked"); + REQUIRE (self->state == LUMIERA_UNLOCKED, "mutex already locked"); if (pthread_mutex_lock (&self->cond->mutex)) - CINELERRA_DIE; + LUMIERA_DIE; - self->state = CINELERRA_LOCKED; + self->state = LUMIERA_LOCKED; } @@ -153,10 +153,10 @@ cinelerra_conditionacquirer_lock (CinelerraConditionacquirer self) * @param self conditionacquirer associated with a condition variable */ static inline void -cinelerra_conditionacquirer_wait (CinelerraConditionacquirer self) +lumiera_conditionacquirer_wait (LumieraConditionacquirer self) { REQUIRE (self); - REQUIRE (self->state == CINELERRA_LOCKED, "mutex must be locked"); + REQUIRE (self->state == LUMIERA_LOCKED, "mutex must be locked"); pthread_cond_wait (&self->cond->cond, &self->cond->mutex); } @@ -167,13 +167,13 @@ cinelerra_conditionacquirer_wait (CinelerraConditionacquirer self) * @param self conditionacquirer associated with a condition variable */ static inline int -cinelerra_conditionacquirer_unlock (CinelerraConditionacquirer self) +lumiera_conditionacquirer_unlock (LumieraConditionacquirer self) { REQUIRE (self); - REQUIRE (self->state == CINELERRA_LOCKED, "mutex was not locked"); + REQUIRE (self->state == LUMIERA_LOCKED, "mutex was not locked"); if (pthread_mutex_unlock (&self->cond->mutex)) - CINELERRA_DIE; - self->state = CINELERRA_UNLOCKED; + LUMIERA_DIE; + self->state = LUMIERA_UNLOCKED; } @@ -182,10 +182,10 @@ cinelerra_conditionacquirer_unlock (CinelerraConditionacquirer self) * @param self conditionacquirer associated with the condition variable to be signaled */ static inline void -cinelerra_conditionacquirer_signal (CinelerraConditionacquirer self) +lumiera_conditionacquirer_signal (LumieraConditionacquirer self) { REQUIRE (self); - REQUIRE (self->state == CINELERRA_LOCKED, "mutex was not locked"); + REQUIRE (self->state == LUMIERA_LOCKED, "mutex was not locked"); pthread_cond_signal (&self->cond->cond); } @@ -195,10 +195,10 @@ cinelerra_conditionacquirer_signal (CinelerraConditionacquirer self) * @param self conditionacquirer associated with the condition variable to be signaled */ static inline int -cinelerra_conditionacquirer_broadcast (CinelerraConditionacquirer self) +lumiera_conditionacquirer_broadcast (LumieraConditionacquirer self) { REQUIRE (self); - REQUIRE (self->state == CINELERRA_LOCKED, "mutex was not locked"); + REQUIRE (self->state == LUMIERA_LOCKED, "mutex was not locked"); pthread_cond_broadcast (&self->cond->cond); } diff --git a/src/lib/error.c b/src/lib/error.c index d5ea88f01..81e24bad8 100644 --- a/src/lib/error.c +++ b/src/lib/error.c @@ -1,8 +1,8 @@ /* - error.c - Cinelerra Error handling + error.c - Lumiera Error handling - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -24,41 +24,41 @@ #include "lib/error.h" /** - * @file C Error handling in Cinelerra. + * @file C Error handling in Lumiera. */ /* predefined errors */ -CINELERRA_ERROR_DEFINE (ERRNO, "errno"); +LUMIERA_ERROR_DEFINE (ERRNO, "errno"); /* Thread local storage */ -static pthread_key_t cinelerra_error_tls; -static pthread_once_t cinelerra_error_initialized = PTHREAD_ONCE_INIT; +static pthread_key_t lumiera_error_tls; +static pthread_once_t lumiera_error_initialized = PTHREAD_ONCE_INIT; static void -cinelerra_error_tls_init (void) +lumiera_error_tls_init (void) { - pthread_key_create (&cinelerra_error_tls, NULL); + pthread_key_create (&lumiera_error_tls, NULL); } /** * Set error state for the current thread. * If the error state of the current thread was cleared, then set it, else preserve the old state. - * @param nerr name of the error with 'CINELERRA_ERROR_' prefix (example: CINELERRA_ERROR_NO_MEMORY) + * @param nerr name of the error with 'LUMIERA_ERROR_' prefix (example: LUMIERA_ERROR_NO_MEMORY) * @return old state, that is NULL for success, when the state was cleared and a pointer to a pending * error when the error state was already set */ const char* -cinelerra_error_set (const char * nerr) +lumiera_error_set (const char * nerr) { - pthread_once (&cinelerra_error_initialized, cinelerra_error_tls_init); + pthread_once (&lumiera_error_initialized, lumiera_error_tls_init); - const char* err = pthread_getspecific (cinelerra_error_tls); + const char* err = pthread_getspecific (lumiera_error_tls); if (!err) - pthread_setspecific (cinelerra_error_tls, nerr); + pthread_setspecific (lumiera_error_tls, nerr); return err; } @@ -71,12 +71,12 @@ cinelerra_error_set (const char * nerr) * @return pointer to any pending error of this thread, NULL if no error is pending */ const char* -cinelerra_error () +lumiera_error () { - pthread_once (&cinelerra_error_initialized, cinelerra_error_tls_init); + pthread_once (&lumiera_error_initialized, lumiera_error_tls_init); - const char* err = pthread_getspecific (cinelerra_error_tls); + const char* err = pthread_getspecific (lumiera_error_tls); if (err) - pthread_setspecific (cinelerra_error_tls, NULL); + pthread_setspecific (lumiera_error_tls, NULL); return err; } diff --git a/src/lib/error.h b/src/lib/error.h index 2b5051652..24c73f0a5 100644 --- a/src/lib/error.h +++ b/src/lib/error.h @@ -1,8 +1,8 @@ /* - error.h - Cinelerra Error handling + error.h - Lumiera Error handling - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -18,8 +18,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef CINELERRA_ERROR_H -#define CINELERRA_ERROR_H +#ifndef LUMIERA_ERROR_H +#define LUMIERA_ERROR_H #ifdef __cplusplus extern "C" { @@ -31,7 +31,7 @@ extern "C" { #include /** - * @file C Error handling in Cinelerra, header. + * @file C Error handling in Lumiera, header. */ @@ -39,46 +39,46 @@ extern "C" { * Abort unconditionally with a 'Fatal Error!' message. * This macro is used whenever the program end up in a invalid state from which no runtime recovery is possible */ -#define CINELERRA_DIE do { NOBUG_ERROR(NOBUG_ON, "Fatal Error!"); abort(); } while(0) +#define LUMIERA_DIE do { NOBUG_ERROR(NOBUG_ON, "Fatal Error!"); abort(); } while(0) /** * Forward declare an error constant. * This macro eases the error declaration in header files - * @param err name of the error without the 'CINELERRA_ERROR_' prefix (example: NO_MEMORY) + * @param err name of the error without the 'LUMIERA_ERROR_' prefix (example: NO_MEMORY) */ -#define CINELERRA_ERROR_DECLARE(err) \ -extern const char* CINELERRA_ERROR_##err +#define LUMIERA_ERROR_DECLARE(err) \ +extern const char* LUMIERA_ERROR_##err /** * Definition and initialization of an error constant. * This macro eases the error definition in implementation files - * @param err name of the error without the 'CINELERRA_ERROR_' prefix (example: NO_MEMORY) + * @param err name of the error without the 'LUMIERA_ERROR_' prefix (example: NO_MEMORY) * @param msg message describing the error in plain english (example: "memory allocation failed") */ -#define CINELERRA_ERROR_DEFINE(err, msg) \ -const char* CINELERRA_ERROR_##err = "CINELERRA_ERROR_" #err ":" msg +#define LUMIERA_ERROR_DEFINE(err, msg) \ +const char* LUMIERA_ERROR_##err = "LUMIERA_ERROR_" #err ":" msg /** Helper macro to raise an error for the current thread. * This macro eases setting an error. It adds NoBug logging support to the low level error handling. * @param flag NoBug flag describing the subsystem where the error was raised - * @param err name of the error without the 'CINELERRA_ERROR_' prefix (example: NO_MEMORY) + * @param err name of the error without the 'LUMIERA_ERROR_' prefix (example: NO_MEMORY) */ -#define CINELERRA_ERROR_SET(flag, err) \ -(({ERROR (flag, "%s", strchr(CINELERRA_ERROR_##err, ':')+1);}), \ -cinelerra_error_set(CINELERRA_ERROR_##err)) +#define LUMIERA_ERROR_SET(flag, err) \ +(({ERROR (flag, "%s", strchr(LUMIERA_ERROR_##err, ':')+1);}), \ +lumiera_error_set(LUMIERA_ERROR_##err)) const char* -cinelerra_error_set (const char * err); +lumiera_error_set (const char * err); const char* -cinelerra_error (); +lumiera_error (); /* predefined errors */ -CINELERRA_ERROR_DECLARE (ERRNO); +LUMIERA_ERROR_DECLARE (ERRNO); #ifdef __cplusplus } /* extern "C" */ #endif -#endif /* CINELERRA_ERROR_H */ +#endif /* LUMIERA_ERROR_H */ diff --git a/src/lib/framerate.c b/src/lib/framerate.c index b70121a37..d8a2fa830 100644 --- a/src/lib/framerate.c +++ b/src/lib/framerate.c @@ -1,8 +1,8 @@ /* framerate.c - framerate calculations - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -26,5 +26,5 @@ */ -CINELERRA_ERROR_DEFINE(FRAMERATE_ILLEGAL_TIME, "invalid time given"); -CINELERRA_ERROR_DEFINE(FRAMERATE_ILLEGAL_FRAME, "invalid frame given"); +LUMIERA_ERROR_DEFINE(FRAMERATE_ILLEGAL_TIME, "invalid time given"); +LUMIERA_ERROR_DEFINE(FRAMERATE_ILLEGAL_FRAME, "invalid frame given"); diff --git a/src/lib/framerate.h b/src/lib/framerate.h index 1e862ed0d..6b050c86e 100644 --- a/src/lib/framerate.h +++ b/src/lib/framerate.h @@ -1,8 +1,8 @@ /* framerate.h - framerate calculations - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -19,8 +19,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef CINELERRA_FRAMERATE_H -#define CINELERRA_FRAMERATE_H +#ifndef LUMIERA_FRAMERATE_H +#define LUMIERA_FRAMERATE_H #include @@ -36,37 +36,37 @@ * framerates are defined as a rational number * for example NTSC with 30000/1001fps */ -struct cinelerra_framerate_struct +struct lumiera_framerate_struct { unsigned n; //numerator unsigned d; //denominator }; -typedef struct cinelerra_framerate_struct cinelerra_framerate; -typedef cinelerra_framerate* CinelerraFramerate; +typedef struct lumiera_framerate_struct lumiera_framerate; +typedef lumiera_framerate* LumieraFramerate; -typedef signed long cinelerra_framepos; +typedef signed long lumiera_framepos; -CINELERRA_ERROR_DECLARE(FRAMERATE_ILLEGAL_TIME); -CINELERRA_ERROR_DECLARE(FRAMERATE_ILLEGAL_FRAME); +LUMIERA_ERROR_DECLARE(FRAMERATE_ILLEGAL_TIME); +LUMIERA_ERROR_DECLARE(FRAMERATE_ILLEGAL_FRAME); -#define CINELERRA_FRAMEPOS_ERROR LONG_MIN +#define LUMIERA_FRAMEPOS_ERROR LONG_MIN /** * Get the frame number of a given time at a given frame rate. * frame indexing starts with 1 * @param framerate is a pointer to the framerate used, defined as rational number. Must be given. - * @param time is a pointer to a cinelerra_time which shall be converted. - * @return frame at the given time or CINELERRA_FRAMEPOS_ERROR on error. + * @param time is a pointer to a lumiera_time which shall be converted. + * @return frame at the given time or LUMIERA_FRAMEPOS_ERROR on error. */ -static inline cinelerra_framepos -cinelerra_framerate_frame_get_time (const CinelerraFramerate framerate, CinelerraTime time) +static inline lumiera_framepos +lumiera_framerate_frame_get_time (const LumieraFramerate framerate, LumieraTime time) { REQUIRE (framerate); if (!time || time->tv_sec == (time_t)-1) { - cinelerra_error_set(CINELERRA_ERROR_FRAMERATE_ILLEGAL_TIME); - return CINELERRA_FRAMEPOS_ERROR; + lumiera_error_set(LUMIERA_ERROR_FRAMERATE_ILLEGAL_TIME); + return LUMIERA_FRAMEPOS_ERROR; } /* we add a magic microsecond for rounding, because of integer truncation frames may be calculated at most 1us earlier, @@ -79,21 +79,21 @@ cinelerra_framerate_frame_get_time (const CinelerraFramerate framerate, Cinelerr * Get the start time for a frame. * frame indexing starts with 1 * @param framerate is a pointer to the framerate used, defined as rational number. Must be given. - * @param time is a pointer to a cinelerra_time which shall take the result. + * @param time is a pointer to a lumiera_time which shall take the result. * @param frame frame number to be converted to time. This frame number must be greater than 0. * @return the pointer given in time or NULL on error (or when it was given as time). */ -static inline CinelerraTime -cinelerra_framerate_time_get_time_frame (const CinelerraFramerate framerate, - CinelerraTime time, - cinelerra_framepos frame) +static inline LumieraTime +lumiera_framerate_time_get_time_frame (const LumieraFramerate framerate, + LumieraTime time, + lumiera_framepos frame) { REQUIRE (framerate); if (time) { if (frame < 1) { - cinelerra_error_set(CINELERRA_ERROR_FRAMERATE_ILLEGAL_FRAME); + lumiera_error_set(LUMIERA_ERROR_FRAMERATE_ILLEGAL_FRAME); return NULL; } diff --git a/src/lib/llist.h b/src/lib/llist.h index 032210a35..4f77b20dc 100644 --- a/src/lib/llist.h +++ b/src/lib/llist.h @@ -3,8 +3,8 @@ Copyright (C) 2003, 2005 Christian Thaeter - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 diff --git a/src/lib/locking.h b/src/lib/locking.h index 6e53fee97..01ad8bb29 100644 --- a/src/lib/locking.h +++ b/src/lib/locking.h @@ -1,8 +1,8 @@ /* locking.h - shared declarations for all locking primitives - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -19,8 +19,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef CINELERRA_LOCKING_H -#define CINELERRA_LOCKING_H +#ifndef LUMIERA_LOCKING_H +#define LUMIERA_LOCKING_H #include #include @@ -37,12 +37,12 @@ * * */ -enum cinelerra_lockstate +enum lumiera_lockstate { - CINELERRA_UNLOCKED, - CINELERRA_LOCKED, - CINELERRA_RDLOCKED, - CINELERRA_WRLOCKED + LUMIERA_UNLOCKED, + LUMIERA_LOCKED, + LUMIERA_RDLOCKED, + LUMIERA_WRLOCKED }; #endif diff --git a/src/lib/mutex.c b/src/lib/mutex.c index 1425fdd02..a08d89e51 100644 --- a/src/lib/mutex.c +++ b/src/lib/mutex.c @@ -1,8 +1,8 @@ /* mutex.c - mutex - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -31,8 +31,8 @@ * @param self is a pointer to the mutex to be initialized * @return self as given */ -CinelerraMutex -cinelerra_mutex_init (CinelerraMutex self) +LumieraMutex +lumiera_mutex_init (LumieraMutex self) { if (self) { @@ -46,13 +46,13 @@ cinelerra_mutex_init (CinelerraMutex self) * @param self is a pointer to the mutex to be destroyed * @return self as given */ -CinelerraMutex -cinelerra_mutex_destroy (CinelerraMutex self) +LumieraMutex +lumiera_mutex_destroy (LumieraMutex self) { if (self) { if (pthread_mutex_destroy (&self->mutex)) - CINELERRA_DIE; + LUMIERA_DIE; } return self; } diff --git a/src/lib/mutex.h b/src/lib/mutex.h index a359d9b75..ced7118e2 100644 --- a/src/lib/mutex.h +++ b/src/lib/mutex.h @@ -1,8 +1,8 @@ /* mutex.h - mutal exclusion locking - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -19,8 +19,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef CINELERRA_MUTEX_H -#define CINELERRA_MUTEX_H +#ifndef LUMIERA_MUTEX_H +#define LUMIERA_MUTEX_H #include "lib/locking.h" @@ -33,58 +33,58 @@ * Mutex. * */ -struct cinelerra_mutex_struct +struct lumiera_mutex_struct { pthread_mutex_t mutex; }; -typedef struct cinelerra_mutex_struct cinelerra_mutex; -typedef cinelerra_mutex* CinelerraMutex; +typedef struct lumiera_mutex_struct lumiera_mutex; +typedef lumiera_mutex* LumieraMutex; -CinelerraMutex -cinelerra_mutex_init (CinelerraMutex self); +LumieraMutex +lumiera_mutex_init (LumieraMutex self); -CinelerraMutex -cinelerra_mutex_destroy (CinelerraMutex self); +LumieraMutex +lumiera_mutex_destroy (LumieraMutex self); /** * mutexacquirer used to manage the state of a mutex variable. */ -struct cinelerra_mutexacquirer_struct +struct lumiera_mutexacquirer_struct { - CinelerraMutex mutex; - enum cinelerra_lockstate state; + LumieraMutex mutex; + enum lumiera_lockstate state; }; -typedef struct cinelerra_mutexacquirer_struct cinelerra_mutexacquirer; -typedef struct cinelerra_mutexacquirer_struct* CinelerraMutexacquirer; +typedef struct lumiera_mutexacquirer_struct lumiera_mutexacquirer; +typedef struct lumiera_mutexacquirer_struct* LumieraMutexacquirer; /* helper function for nobug */ static inline void -cinelerra_mutexacquirer_ensureunlocked (CinelerraMutexacquirer self) +lumiera_mutexacquirer_ensureunlocked (LumieraMutexacquirer self) { - ENSURE (self->state == CINELERRA_UNLOCKED, "forgot to unlock mutex"); + ENSURE (self->state == LUMIERA_UNLOCKED, "forgot to unlock mutex"); } /* override with a macro to use the cleanup checker */ -#define cinelerra_mutexacquirer \ -cinelerra_mutexacquirer NOBUG_CLEANUP(cinelerra_mutexacquirer_ensureunlocked) +#define lumiera_mutexacquirer \ +lumiera_mutexacquirer NOBUG_CLEANUP(lumiera_mutexacquirer_ensureunlocked) /** * initialize a mutexacquirer state without mutex. * @param self mutexacquirer to be initialized, must be an automatic variable * @return self as given - * This initialization is used when cinelerra_mutexacquirer_try_mutex shall be used later + * This initialization is used when lumiera_mutexacquirer_try_mutex shall be used later */ -static inline CinelerraMutexacquirer -cinelerra_mutexacquirer_init (CinelerraMutexacquirer self) +static inline LumieraMutexacquirer +lumiera_mutexacquirer_init (LumieraMutexacquirer self) { REQUIRE (self); self->mutex = NULL; - self->state = CINELERRA_UNLOCKED; + self->state = LUMIERA_UNLOCKED; return self; } @@ -93,20 +93,20 @@ cinelerra_mutexacquirer_init (CinelerraMutexacquirer self) * initialize a mutexacquirer state * @param self mutexacquirer to be initialized, must be an automatic variable * @param mutex associated mutex - * @param state initial state of the mutex, either CINELERRA_LOCKED or CINELERRA_UNLOCKED + * @param state initial state of the mutex, either LUMIERA_LOCKED or LUMIERA_UNLOCKED * @return self as given * errors are fatal */ -static inline CinelerraMutexacquirer -cinelerra_mutexacquirer_init_mutex (CinelerraMutexacquirer self, CinelerraMutex mutex, enum cinelerra_lockstate state) +static inline LumieraMutexacquirer +lumiera_mutexacquirer_init_mutex (LumieraMutexacquirer self, LumieraMutex mutex, enum lumiera_lockstate state) { REQUIRE (self); REQUIRE (mutex); self->mutex = mutex; self->state = state; - if (state == CINELERRA_LOCKED) + if (state == LUMIERA_LOCKED) if (pthread_mutex_lock (&mutex->mutex)) - CINELERRA_DIE; + LUMIERA_DIE; return self; } @@ -118,25 +118,25 @@ cinelerra_mutexacquirer_init_mutex (CinelerraMutexacquirer self, CinelerraMutex * @param self mutexacquirer associated with a mutex variable */ static inline void -cinelerra_mutexacquirer_lock (CinelerraMutexacquirer self) +lumiera_mutexacquirer_lock (LumieraMutexacquirer self) { REQUIRE (self); - REQUIRE (self->state == CINELERRA_UNLOCKED, "mutex already locked"); + REQUIRE (self->state == LUMIERA_UNLOCKED, "mutex already locked"); if (pthread_mutex_lock (&self->mutex->mutex)) - CINELERRA_DIE; + LUMIERA_DIE; - self->state = CINELERRA_LOCKED; + self->state = LUMIERA_LOCKED; } /** * get the state of a lock. * @param self mutexacquirer associated with a mutex variable - * @return CINELERRA_LOCKED when the mutex is locked by this thead + * @return LUMIERA_LOCKED when the mutex is locked by this thead */ -static inline enum cinelerra_lockstate -cinelerra_mutexacquirer_state (CinelerraMutexacquirer self) +static inline enum lumiera_lockstate +lumiera_mutexacquirer_state (LumieraMutexacquirer self) { REQUIRE (self); return self->state; @@ -148,23 +148,23 @@ cinelerra_mutexacquirer_state (CinelerraMutexacquirer self) * must not already be locked * @param self mutexacquirer associated with a mutex variable * @param mutex pointer to a mutex which should be tried - * @return CINELERRA_LOCKED when the mutex got locked + * @return LUMIERA_LOCKED when the mutex got locked */ -static inline enum cinelerra_lockstate -cinelerra_mutexacquirer_try_mutex (CinelerraMutexacquirer self, CinelerraMutex mutex) +static inline enum lumiera_lockstate +lumiera_mutexacquirer_try_mutex (LumieraMutexacquirer self, LumieraMutex mutex) { REQUIRE (self); - REQUIRE (self->state == CINELERRA_UNLOCKED, "mutex already locked"); + REQUIRE (self->state == LUMIERA_UNLOCKED, "mutex already locked"); self->mutex=mutex; switch (pthread_mutex_trylock (&self->mutex->mutex)) { case 0: - return self->state = CINELERRA_LOCKED; + return self->state = LUMIERA_LOCKED; case EBUSY: - return CINELERRA_UNLOCKED; + return LUMIERA_UNLOCKED; default: - CINELERRA_DIE; + LUMIERA_DIE; } } @@ -175,13 +175,13 @@ cinelerra_mutexacquirer_try_mutex (CinelerraMutexacquirer self, CinelerraMutex m * @param self mutexacquirer associated with a mutex variable */ static inline void -cinelerra_mutexacquirer_unlock (CinelerraMutexacquirer self) +lumiera_mutexacquirer_unlock (LumieraMutexacquirer self) { REQUIRE (self); - REQUIRE (self->state == CINELERRA_LOCKED, "mutex was not locked"); + REQUIRE (self->state == LUMIERA_LOCKED, "mutex was not locked"); if (pthread_mutex_unlock (&self->mutex->mutex)) - CINELERRA_DIE; - self->state = CINELERRA_UNLOCKED; + LUMIERA_DIE; + self->state = LUMIERA_UNLOCKED; } #endif diff --git a/src/lib/plugin.c b/src/lib/plugin.c index 184b0cb06..87939533d 100644 --- a/src/lib/plugin.c +++ b/src/lib/plugin.c @@ -1,8 +1,8 @@ /* - plugin.c - Cinelerra Plugin loader + plugin.c - Lumiera Plugin loader - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -34,48 +34,48 @@ /* TODO should be set by the build system to the actual plugin path */ -#define CINELERRA_PLUGIN_PATH "~/.cinelerra3/plugins:/usr/local/lib/cinelerra3/plugins:.libs" +#define LUMIERA_PLUGIN_PATH "~/.lumiera/plugins:/usr/local/lib/lumiera/plugins:.libs" -NOBUG_DEFINE_FLAG (cinelerra_plugin); +NOBUG_DEFINE_FLAG (lumiera_plugin); /* errors */ -CINELERRA_ERROR_DEFINE(PLUGIN_DLOPEN, "Could not open plugin"); -CINELERRA_ERROR_DEFINE(PLUGIN_HOOK, "Hook function failed"); -CINELERRA_ERROR_DEFINE(PLUGIN_NFILE, "No such plugin"); -CINELERRA_ERROR_DEFINE(PLUGIN_NIFACE, "No such interface"); -CINELERRA_ERROR_DEFINE(PLUGIN_REVISION, "Interface revision too old"); +LUMIERA_ERROR_DEFINE(PLUGIN_DLOPEN, "Could not open plugin"); +LUMIERA_ERROR_DEFINE(PLUGIN_HOOK, "Hook function failed"); +LUMIERA_ERROR_DEFINE(PLUGIN_NFILE, "No such plugin"); +LUMIERA_ERROR_DEFINE(PLUGIN_NIFACE, "No such interface"); +LUMIERA_ERROR_DEFINE(PLUGIN_REVISION, "Interface revision too old"); /* supported (planned) plugin types and their file extensions */ -enum cinelerra_plugin_type +enum lumiera_plugin_type { - CINELERRA_PLUGIN_NULL, - CINELERRA_PLUGIN_DYNLIB, - CINELERRA_PLUGIN_CSOURCE + LUMIERA_PLUGIN_NULL, + LUMIERA_PLUGIN_DYNLIB, + LUMIERA_PLUGIN_CSOURCE }; static const struct { const char* const ext; - enum cinelerra_plugin_type type; -} cinelerra_plugin_extensions [] = + enum lumiera_plugin_type type; +} lumiera_plugin_extensions [] = { - {"so", CINELERRA_PLUGIN_DYNLIB}, - {"o", CINELERRA_PLUGIN_DYNLIB}, - {"c", CINELERRA_PLUGIN_CSOURCE}, + {"so", LUMIERA_PLUGIN_DYNLIB}, + {"o", LUMIERA_PLUGIN_DYNLIB}, + {"c", LUMIERA_PLUGIN_CSOURCE}, /* extend here */ - {NULL, CINELERRA_PLUGIN_NULL} + {NULL, LUMIERA_PLUGIN_NULL} }; -struct cinelerra_plugin +struct lumiera_plugin { /* short name as queried ("effects/audio/normalize") used for sorting/finding */ const char* name; - /* long names as looked up ("/usr/local/lib/cinelerra3/plugins/effects/audio/normalize.so") */ + /* long names as looked up ("/usr/local/lib/lumiera/plugins/effects/audio/normalize.so") */ const char* pathname; /* use count for all interfaces of this plugin */ @@ -85,7 +85,7 @@ struct cinelerra_plugin time_t last; /* kind of plugin */ - enum cinelerra_plugin_type type; + enum lumiera_plugin_type type; /* dlopen handle */ void* handle; @@ -93,19 +93,19 @@ struct cinelerra_plugin /* global plugin registry */ -void* cinelerra_plugin_registry = NULL; +void* lumiera_plugin_registry = NULL; /* plugin operations are protected by one big mutex */ -pthread_mutex_t cinelerra_plugin_mutex = PTHREAD_MUTEX_INITIALIZER; +pthread_mutex_t lumiera_plugin_mutex = PTHREAD_MUTEX_INITIALIZER; /** * the compare function for the registry tree. - * Compares the names of two struct cinelerra_plugin. + * Compares the names of two struct lumiera_plugin. * @return 0 if a and b are equal, just like strcmp. */ static int -cinelerra_plugin_name_cmp (const void* a, const void* b) +lumiera_plugin_name_cmp (const void* a, const void* b) { - return strcmp (((struct cinelerra_plugin*) a)->name, ((struct cinelerra_plugin*) b)->name); + return strcmp (((struct lumiera_plugin*) a)->name, ((struct lumiera_plugin*) b)->name); } /** @@ -113,21 +113,21 @@ cinelerra_plugin_name_cmp (const void* a, const void* b) * always succeeds or aborts */ void -cinelerra_init_plugin (void) +lumiera_init_plugin (void) { - NOBUG_INIT_FLAG (cinelerra_plugin); + NOBUG_INIT_FLAG (lumiera_plugin); } /** * Find and set pathname for the plugin. * Searches through given path for given plugin, trying to find the file's location in the filesystem. * If found, self->pathname will be set to the found plugin file. - * @param self The cinelerra_plugin to open look for. + * @param self The lumiera_plugin to open look for. * @param path The path to search trough (paths seperated by ":") * @return 0 on success. -1 on error, or if plugin not found in path. */ int -cinelerra_plugin_lookup (struct cinelerra_plugin* self, const char* path) +lumiera_plugin_lookup (struct lumiera_plugin* self, const char* path) { if (!path) return -1; @@ -146,22 +146,22 @@ cinelerra_plugin_lookup (struct cinelerra_plugin* self, const char* path) for (char* tok = strtok_r (tpath, ":", &tmp); tok; tok = strtok_r (NULL, ":", &tmp)) { /*for each extension*/ - for (int i = 0; cinelerra_plugin_extensions[i].ext; ++i) + for (int i = 0; lumiera_plugin_extensions[i].ext; ++i) { /* path/name.extension */ - int r = snprintf(pathname, 1024, "%s/%s.%s", tok, self->name, cinelerra_plugin_extensions[i].ext); + int r = snprintf(pathname, 1024, "%s/%s.%s", tok, self->name, lumiera_plugin_extensions[i].ext); if (r >= 1024) return -1; /*TODO error handling, name too long*/ - TRACE (cinelerra_plugin, "trying %s", pathname); + TRACE (lumiera_plugin, "trying %s", pathname); if (!access(pathname, R_OK)) { /* got it */ - TRACE (cinelerra_plugin, "found %s", pathname); + TRACE (lumiera_plugin, "found %s", pathname); self->pathname = strdup (pathname); - if (!self->pathname) CINELERRA_DIE; - self->type = cinelerra_plugin_extensions[i].type; + if (!self->pathname) LUMIERA_DIE; + self->type = lumiera_plugin_extensions[i].type; return 0; } } @@ -181,44 +181,44 @@ cinelerra_plugin_lookup (struct cinelerra_plugin* self, const char* path) * @return handle to the interface or NULL in case of a error. The application shall cast this handle to * the actual interface type. */ -struct cinelerra_interface* -cinelerra_interface_open (const char* name, const char* interface, size_t min_revision) +struct lumiera_interface* +lumiera_interface_open (const char* name, const char* interface, size_t min_revision) { - //REQUIRE (min_revision > sizeof(struct cinelerra_interface), "try to use an empty interface eh?"); + //REQUIRE (min_revision > sizeof(struct lumiera_interface), "try to use an empty interface eh?"); REQUIRE (interface, "interface name must be given"); - pthread_mutex_lock (&cinelerra_plugin_mutex); + pthread_mutex_lock (&lumiera_plugin_mutex); - struct cinelerra_plugin plugin; - struct cinelerra_plugin** found; + struct lumiera_plugin plugin; + struct lumiera_plugin** found; plugin.name = name; /* for searching */ - found = tsearch (&plugin, &cinelerra_plugin_registry, cinelerra_plugin_name_cmp); - if (!found) CINELERRA_DIE; + found = tsearch (&plugin, &lumiera_plugin_registry, lumiera_plugin_name_cmp); + if (!found) LUMIERA_DIE; if (*found == &plugin) { - NOTICE (cinelerra_plugin, "new plugin"); + NOTICE (lumiera_plugin, "new plugin"); /* now really create new item */ - *found = malloc (sizeof (struct cinelerra_plugin)); - if (!*found) CINELERRA_DIE; + *found = malloc (sizeof (struct lumiera_plugin)); + if (!*found) LUMIERA_DIE; if (name) /* NULL is main app, no lookup needed */ { - /*lookup for $CINELERRA_PLUGIN_PATH*/ + /*lookup for $LUMIERA_PLUGIN_PATH*/ (*found)->name = strdup (name); - if (!(*found)->name) CINELERRA_DIE; + if (!(*found)->name) LUMIERA_DIE; - if (!!cinelerra_plugin_lookup (*found, getenv("CINELERRA_PLUGIN_PATH")) -#ifdef CINELERRA_PLUGIN_PATH - /* else lookup for -DCINELERRA_PLUGIN_PATH */ - && !!cinelerra_plugin_lookup (*found, CINELERRA_PLUGIN_PATH) + if (!!lumiera_plugin_lookup (*found, getenv("LUMIERA_PLUGIN_PATH")) +#ifdef LUMIERA_PLUGIN_PATH + /* else lookup for -DLUMIERA_PLUGIN_PATH */ + && !!lumiera_plugin_lookup (*found, LUMIERA_PLUGIN_PATH) #endif ) { - CINELERRA_ERROR_SET (cinelerra_plugin, PLUGIN_NFILE); + LUMIERA_ERROR_SET (lumiera_plugin, PLUGIN_NFILE); goto elookup; } } @@ -233,46 +233,46 @@ cinelerra_interface_open (const char* name, const char* interface, size_t min_re PLANNED("if .so like then dlopen; else if .c like tcc compile"); TODO("factor dlopen and dlsym out"); - TRACE(cinelerra_plugin, "trying to open %s", (*found)->pathname); + TRACE(lumiera_plugin, "trying to open %s", (*found)->pathname); (*found)->handle = dlopen ((*found)->pathname, RTLD_LAZY|RTLD_LOCAL); if (!(*found)->handle) { - ERROR (cinelerra_plugin, "dlopen failed: %s", dlerror()); - CINELERRA_ERROR_SET (cinelerra_plugin, PLUGIN_DLOPEN); + ERROR (lumiera_plugin, "dlopen failed: %s", dlerror()); + LUMIERA_ERROR_SET (lumiera_plugin, PLUGIN_DLOPEN); goto edlopen; } - /* if the plugin defines a 'cinelerra_plugin_init' function, we call it, must return 0 on success */ - int (*init)(void) = dlsym((*found)->handle, "cinelerra_plugin_init"); + /* if the plugin defines a 'lumiera_plugin_init' function, we call it, must return 0 on success */ + int (*init)(void) = dlsym((*found)->handle, "lumiera_plugin_init"); if (init && init()) { - //ERROR (cinelerra_plugin, "cinelerra_plugin_init failed: %s: %s", name, interface); - CINELERRA_ERROR_SET (cinelerra_plugin, PLUGIN_HOOK); + //ERROR (lumiera_plugin, "lumiera_plugin_init failed: %s: %s", name, interface); + LUMIERA_ERROR_SET (lumiera_plugin, PLUGIN_HOOK); goto einit; } } /* we have the plugin, now get the interface descriptor */ - struct cinelerra_interface* ret; + struct lumiera_interface* ret; dlerror(); ret = dlsym ((*found)->handle, interface); const char *dlerr = dlerror(); - TRACE(cinelerra_plugin, "%s", dlerr); - TODO ("need some way to tell 'interface not provided by plugin', maybe cinelerra_plugin_error()?"); + TRACE(lumiera_plugin, "%s", dlerr); + TODO ("need some way to tell 'interface not provided by plugin', maybe lumiera_plugin_error()?"); if (dlerr) { - //ERROR (cinelerra_plugin, "plugin %s doesnt provide interface %s", name, interface); - CINELERRA_ERROR_SET (cinelerra_plugin, PLUGIN_NIFACE); + //ERROR (lumiera_plugin, "plugin %s doesnt provide interface %s", name, interface); + LUMIERA_ERROR_SET (lumiera_plugin, PLUGIN_NIFACE); goto edlsym; } /* is the interface older than required? */ if (ret->size < min_revision) { - ERROR (cinelerra_plugin, "plugin %s provides older interface %s revision than required", name, interface); - CINELERRA_ERROR_SET (cinelerra_plugin, PLUGIN_REVISION); + ERROR (lumiera_plugin, "plugin %s provides older interface %s revision than required", name, interface); + LUMIERA_ERROR_SET (lumiera_plugin, PLUGIN_REVISION); goto erevision; } @@ -281,8 +281,8 @@ cinelerra_interface_open (const char* name, const char* interface, size_t min_re /* if the interface provides a 'open' function, call it now, must return 0 on success */ if (ret->open && ret->open()) { - ERROR (cinelerra_plugin, "open hook indicated an error"); - CINELERRA_ERROR_SET (cinelerra_plugin, PLUGIN_HOOK); + ERROR (lumiera_plugin, "open hook indicated an error"); + LUMIERA_ERROR_SET (lumiera_plugin, PLUGIN_HOOK); goto eopen; } @@ -290,7 +290,7 @@ cinelerra_interface_open (const char* name, const char* interface, size_t min_re (*found)->last = time (NULL); ret->use_count++; - pthread_mutex_unlock (&cinelerra_plugin_mutex); + pthread_mutex_unlock (&lumiera_plugin_mutex); return ret; /* Error cleanup */ @@ -304,8 +304,8 @@ cinelerra_interface_open (const char* name, const char* interface, size_t min_re free ((char*)(*found)->name); free (*found); *found = &plugin; - tdelete (&plugin, &cinelerra_plugin_registry, cinelerra_plugin_name_cmp); - pthread_mutex_unlock (&cinelerra_plugin_mutex); + tdelete (&plugin, &lumiera_plugin_registry, lumiera_plugin_name_cmp); + pthread_mutex_unlock (&lumiera_plugin_mutex); return NULL; } @@ -315,17 +315,17 @@ cinelerra_interface_open (const char* name, const char* interface, size_t min_re * @param ptr interface to be closed */ void -cinelerra_interface_close (void* ptr) +lumiera_interface_close (void* ptr) { - TRACE (cinelerra_plugin, "%p", ptr); + TRACE (lumiera_plugin, "%p", ptr); if(!ptr) return; - struct cinelerra_interface* self = (struct cinelerra_interface*) ptr; + struct lumiera_interface* self = (struct lumiera_interface*) ptr; - pthread_mutex_lock (&cinelerra_plugin_mutex); + pthread_mutex_lock (&lumiera_plugin_mutex); - struct cinelerra_plugin* plugin = self->plugin; + struct lumiera_plugin* plugin = self->plugin; plugin->use_count--; self->use_count--; @@ -339,16 +339,16 @@ cinelerra_interface_close (void* ptr) { TODO ("we dont want to close here, instead store time of recent use and make a expire run, already planned in my head"); - /* if the plugin defines a 'cinelerra_plugin_destroy' function, we call it */ - int (*destroy)(void) = dlsym(plugin->handle, "cinelerra_plugin_destroy"); + /* if the plugin defines a 'lumiera_plugin_destroy' function, we call it */ + int (*destroy)(void) = dlsym(plugin->handle, "lumiera_plugin_destroy"); if (destroy) destroy(); /* and now cleanup */ - tdelete (plugin, &cinelerra_plugin_registry, cinelerra_plugin_name_cmp); + tdelete (plugin, &lumiera_plugin_registry, lumiera_plugin_name_cmp); free ((char*)plugin->name); dlclose(plugin->handle); free (plugin); } - pthread_mutex_unlock (&cinelerra_plugin_mutex); + pthread_mutex_unlock (&lumiera_plugin_mutex); } diff --git a/src/lib/plugin.h b/src/lib/plugin.h index a31e69199..f8916ae96 100644 --- a/src/lib/plugin.h +++ b/src/lib/plugin.h @@ -1,8 +1,8 @@ /* plugin.h - Plugin loader - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -18,8 +18,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef CINELERRA_PLUGIN_H -#define CINELERRA_PLUGIN_H +#ifndef LUMIERA_PLUGIN_H +#define LUMIERA_PLUGIN_H #ifdef __cplusplus extern "C" { @@ -37,55 +37,55 @@ extern "C" { */ -NOBUG_DECLARE_FLAG (cinelerra_plugin); +NOBUG_DECLARE_FLAG (lumiera_plugin); /* tool macros*/ -#define CINELERRA_INTERFACE_TYPE(name, version) struct cinelerra_interface_##name##_##version -#define CINELERRA_INTERFACE_CAST(name, version) (CINELERRA_INTERFACE_TYPE(name, version)*) +#define LUMIERA_INTERFACE_TYPE(name, version) struct lumiera_interface_##name##_##version +#define LUMIERA_INTERFACE_CAST(name, version) (LUMIERA_INTERFACE_TYPE(name, version)*) /* Interface definition */ -#define CINELERRA_INTERFACE(name, version, ...) \ -CINELERRA_INTERFACE_TYPE(name, version) \ +#define LUMIERA_INTERFACE(name, version, ...) \ +LUMIERA_INTERFACE_TYPE(name, version) \ { \ - struct cinelerra_interface interface_header_; \ + struct lumiera_interface interface_header_; \ __VA_ARGS__ \ } -#define CINELERRA_INTERFACE_PROTO(ret, name, params) ret (*name) params; +#define LUMIERA_INTERFACE_PROTO(ret, name, params) ret (*name) params; /* Interface instantiation */ -#define CINELERRA_INTERFACE_IMPLEMENT(iname, version, name, open, close, ...) \ -CINELERRA_INTERFACE_TYPE(iname, version) name##_##version = \ -{ \ - { \ - version, \ - sizeof(CINELERRA_INTERFACE_TYPE(iname, version)), \ - NULL, \ - 0, \ - open, \ - close \ - }, \ - __VA_ARGS__ \ +#define LUMIERA_INTERFACE_IMPLEMENT(iname, version, name, open, close, ...) \ +LUMIERA_INTERFACE_TYPE(iname, version) name##_##version = \ +{ \ + { \ + version, \ + sizeof(LUMIERA_INTERFACE_TYPE(iname, version)), \ + NULL, \ + 0, \ + open, \ + close \ + }, \ + __VA_ARGS__ \ } /* internally used */ -struct cinelerra_plugin; +struct lumiera_plugin; /** * This is the header for any interface exported by plugins. * Real interfaces append their functions at the end. There are few standard functions on each Interface * Every function is required to be implemnted. */ -struct cinelerra_interface +struct lumiera_interface { /// interface version number unsigned version; /// size of the full structure is used to determine the revision (adding a new function increments the size) size_t size; /// back reference to plugin - struct cinelerra_plugin* plugin; + struct lumiera_plugin* plugin; /// incremented for each user of this interface and decremented when closed unsigned use_count; @@ -96,15 +96,15 @@ struct cinelerra_interface }; void -cinelerra_init_plugin (void); +lumiera_init_plugin (void); -struct cinelerra_interface* -cinelerra_interface_open (const char* plugin, const char* name, size_t min_revision); +struct lumiera_interface* +lumiera_interface_open (const char* plugin, const char* name, size_t min_revision); void -cinelerra_interface_close (void* self); +lumiera_interface_close (void* self); /** * Tries to unload a plugin. @@ -113,24 +113,24 @@ cinelerra_interface_close (void* self); * @return 0 on success, else the number if users which keeping the plugin loaded */ int -cinelerra_plugin_unload (const char* plugin); +lumiera_plugin_unload (const char* plugin); /** * Tries to unload plugins which are not in use. - * Calls cinelerra_plugin_unload() for each Plugin which is not used for more than age seconds. + * Calls lumiera_plugin_unload() for each Plugin which is not used for more than age seconds. * This function might be infrequently called by the scheduler to remove things which are not needed. * @param age timeout in seconds when to unload plugins */ void -cinelerra_plugin_expire (time_t age); +lumiera_plugin_expire (time_t age); -CINELERRA_ERROR_DECLARE(PLUGIN_DLOPEN); -CINELERRA_ERROR_DECLARE(PLUGIN_HOOK); -CINELERRA_ERROR_DECLARE(PLUGIN_NFILE); -CINELERRA_ERROR_DECLARE(PLUGIN_NIFACE); -CINELERRA_ERROR_DECLARE(PLUGIN_REVISION); +LUMIERA_ERROR_DECLARE(PLUGIN_DLOPEN); +LUMIERA_ERROR_DECLARE(PLUGIN_HOOK); +LUMIERA_ERROR_DECLARE(PLUGIN_NFILE); +LUMIERA_ERROR_DECLARE(PLUGIN_NIFACE); +LUMIERA_ERROR_DECLARE(PLUGIN_REVISION); #ifdef __cplusplus } /* extern "C" */ #endif -#endif /* CINELERRA_PLUGIN_H */ +#endif /* LUMIERA_PLUGIN_H */ diff --git a/src/lib/references.c b/src/lib/references.c index 6dfdcf011..ad4f9562f 100644 --- a/src/lib/references.c +++ b/src/lib/references.c @@ -1,8 +1,8 @@ /* references.c - strong and weak references - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -40,17 +40,17 @@ * @param dtor destructor function which will be called on obj when the last strong reference gets deleted * @return self as given */ -CinelerraReference -cinelerra_reference_strong_init_once (CinelerraReference self, void* obj, void (*dtor)(void*)) +LumieraReference +lumiera_reference_strong_init_once (LumieraReference self, void* obj, void (*dtor)(void*)) { - CinelerraReftarget target = malloc (sizeof(cinelerra_reftarget)); - if (!target) CINELERRA_DIE; + LumieraReftarget target = malloc (sizeof(lumiera_reftarget)); + if (!target) LUMIERA_DIE; target->object = obj; target->dtor = dtor; target->strong_cnt = 1; target->weak_cnt = 0; - cinelerra_mutex_init (&target->lock); + lumiera_mutex_init (&target->lock); self->object = obj; self->target = target; @@ -66,16 +66,16 @@ cinelerra_reference_strong_init_once (CinelerraReference self, void* obj, void ( * @return self as given * destroying a reference is not thread safe as far as 2 threads try to concurrently destroy it! */ -CinelerraReference -cinelerra_reference_destroy (CinelerraReference self) +LumieraReference +lumiera_reference_destroy (LumieraReference self) { - CinelerraReftarget target = self->target; + LumieraReftarget target = self->target; /* defensive, lets detect errors if anything still tries to use this reference */ self->target = NULL; - cinelerra_mutexacquirer lock; - cinelerra_mutexacquirer_init_mutex (&lock, &target->lock, CINELERRA_LOCKED); + lumiera_mutexacquirer lock; + lumiera_mutexacquirer_init_mutex (&lock, &target->lock, LUMIERA_LOCKED); if (self->object) { @@ -89,8 +89,8 @@ cinelerra_reference_destroy (CinelerraReference self) if (!target->weak_cnt) { /* no weak refs either, destroy it */ - cinelerra_mutexacquirer_unlock (&lock); - cinelerra_mutex_destroy (&target->lock); + lumiera_mutexacquirer_unlock (&lock); + lumiera_mutex_destroy (&target->lock); free (target); return self; } @@ -102,13 +102,13 @@ cinelerra_reference_destroy (CinelerraReference self) if (!--target->weak_cnt && !target->strong_cnt) { /* was last weak reference, and no strong refs left */ - cinelerra_mutexacquirer_unlock (&lock); - cinelerra_mutex_destroy (&target->lock); + lumiera_mutexacquirer_unlock (&lock); + lumiera_mutex_destroy (&target->lock); free (target); return self; } } - cinelerra_mutexacquirer_unlock (&lock); + lumiera_mutexacquirer_unlock (&lock); return self; } @@ -118,11 +118,11 @@ cinelerra_reference_destroy (CinelerraReference self) * @return self as strong reference (always for strong references) or NULL if source is an invalidated weak reference, * in the later case the reference is constructed as weak reference barely to allow it be destroyed */ -CinelerraReference -cinelerra_reference_strong_init (CinelerraReference self, CinelerraReference source) +LumieraReference +lumiera_reference_strong_init (LumieraReference self, LumieraReference source) { - cinelerra_mutexacquirer lock; - cinelerra_mutexacquirer_init_mutex (&lock, &source->target->lock, CINELERRA_LOCKED); + lumiera_mutexacquirer lock; + lumiera_mutexacquirer_init_mutex (&lock, &source->target->lock, LUMIERA_LOCKED); self->object = source->target->object; self->target = source->target; @@ -136,7 +136,7 @@ cinelerra_reference_strong_init (CinelerraReference self, CinelerraReference sou ++self->target->weak_cnt; self = NULL; } - cinelerra_mutexacquirer_unlock (&lock); + lumiera_mutexacquirer_unlock (&lock); return self; } @@ -145,11 +145,11 @@ cinelerra_reference_strong_init (CinelerraReference self, CinelerraReference sou * @param source reference to copy * @return self (always for strong references) or NULL if self is an invalidated weak reference */ -CinelerraReference -cinelerra_reference_weak_init (CinelerraReference self, CinelerraReference source) +LumieraReference +lumiera_reference_weak_init (LumieraReference self, LumieraReference source) { - cinelerra_mutexacquirer lock; - cinelerra_mutexacquirer_init_mutex (&lock, &source->target->lock, CINELERRA_LOCKED); + lumiera_mutexacquirer lock; + lumiera_mutexacquirer_init_mutex (&lock, &source->target->lock, LUMIERA_LOCKED); self->object = NULL; self->target = source->target; @@ -159,7 +159,7 @@ cinelerra_reference_weak_init (CinelerraReference self, CinelerraReference sourc /* already invalidated */ self = NULL; - cinelerra_mutexacquirer_unlock (&lock); + lumiera_mutexacquirer_unlock (&lock); return self; } @@ -169,14 +169,14 @@ cinelerra_reference_weak_init (CinelerraReference self, CinelerraReference sourc * do nothing if the referene is already weak * @return self or NULL if the final strong reference got removed, */ -CinelerraReference -cinelerra_reference_weaken (restrict CinelerraReference self) +LumieraReference +lumiera_reference_weaken (restrict LumieraReference self) { /* is this a strong reference? */ if (self->object) { - cinelerra_mutexacquirer lock; - cinelerra_mutexacquirer_init_mutex (&lock, &self->target->lock, CINELERRA_LOCKED); + lumiera_mutexacquirer lock; + lumiera_mutexacquirer_init_mutex (&lock, &self->target->lock, LUMIERA_LOCKED); self->object = NULL; ++self->target->weak_cnt; @@ -187,7 +187,7 @@ cinelerra_reference_weaken (restrict CinelerraReference self) self->target->object = NULL; self = NULL; } - cinelerra_mutexacquirer_unlock (&lock); + lumiera_mutexacquirer_unlock (&lock); } return self; } @@ -198,14 +198,14 @@ cinelerra_reference_weaken (restrict CinelerraReference self) * only references of object which are not already destroyed can be strengthened * @return self when successful, NULL when the object was already destroyed, 'self' stays a dead weak reference in that case */ -CinelerraReference -cinelerra_reference_strengthen (CinelerraReference self) +LumieraReference +lumiera_reference_strengthen (LumieraReference self) { /* is this a weak reference? */ if (!self->object) { - cinelerra_mutexacquirer lock; - cinelerra_mutexacquirer_init_mutex (&lock, &self->target->lock, CINELERRA_LOCKED); + lumiera_mutexacquirer lock; + lumiera_mutexacquirer_init_mutex (&lock, &self->target->lock, LUMIERA_LOCKED); if (self->target->object) { @@ -215,7 +215,7 @@ cinelerra_reference_strengthen (CinelerraReference self) } else self = NULL; - cinelerra_mutexacquirer_unlock (&lock); + lumiera_mutexacquirer_unlock (&lock); } return self; } diff --git a/src/lib/references.h b/src/lib/references.h index 5f5543787..3e00457e7 100644 --- a/src/lib/references.h +++ b/src/lib/references.h @@ -1,8 +1,8 @@ /* references.h - strong and weak references - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -19,8 +19,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef CINELERRA_REFERENCES_H -#define CINELERRA_REFERENCES_H +#ifndef LUMIERA_REFERENCES_H +#define LUMIERA_REFERENCES_H #include @@ -29,77 +29,77 @@ */ -typedef struct cinelerra_reference_struct cinelerra_reference; -typedef cinelerra_reference* CinelerraReference; +typedef struct lumiera_reference_struct lumiera_reference; +typedef lumiera_reference* LumieraReference; #include "lib/error.h" #include "lib/mutex.h" /* Implementation detail */ -struct cinelerra_reftarget_struct +struct lumiera_reftarget_struct { void* object; void (*dtor)(void*); unsigned strong_cnt; /*when strong becomes 0 obj is destroyed, if weak is 0 destroy target too*/ unsigned weak_cnt; /*when weak becomes 0 and !obj and lock strong is 0, destroy target */ - cinelerra_mutex lock; + lumiera_mutex lock; }; -typedef struct cinelerra_reftarget_struct cinelerra_reftarget; -typedef cinelerra_reftarget* CinelerraReftarget; +typedef struct lumiera_reftarget_struct lumiera_reftarget; +typedef lumiera_reftarget* LumieraReftarget; /** * A reference pointing to some other object */ -struct cinelerra_reference_struct +struct lumiera_reference_struct { void* object; /*set for strong, NULL for weak*/ - CinelerraReftarget target; + LumieraReftarget target; }; -#define cinelerra_reference \ -cinelerra_reference NOBUG_CLEANUP(cinelerra_reference_ensuredestroyed) +#define lumiera_reference \ +lumiera_reference NOBUG_CLEANUP(lumiera_reference_ensuredestroyed) /* helper function for nobug */ static inline void -cinelerra_reference_ensuredestroyed (CinelerraReference self) +lumiera_reference_ensuredestroyed (LumieraReference self) { ENSURE (!self->target, "forgot to destroy reference"); } -CinelerraReference -cinelerra_reference_strong_init_once (CinelerraReference self, void* obj, void (*dtor)(void*)); +LumieraReference +lumiera_reference_strong_init_once (LumieraReference self, void* obj, void (*dtor)(void*)); -CinelerraReference -cinelerra_reference_destroy (CinelerraReference self); +LumieraReference +lumiera_reference_destroy (LumieraReference self); /** * Get object from a strong reference. * @return pointer to object, NULL if applied to a weak reference */ static inline void* -cinelerra_reference_get (CinelerraReference self) +lumiera_reference_get (LumieraReference self) { ENSURE (self->target, "illegal reference (not initialized or already destroyed?)"); return self->object; } -CinelerraReference -cinelerra_reference_strong_init (CinelerraReference self, CinelerraReference source); +LumieraReference +lumiera_reference_strong_init (LumieraReference self, LumieraReference source); -CinelerraReference -cinelerra_reference_weak_init (CinelerraReference self, CinelerraReference source); +LumieraReference +lumiera_reference_weak_init (LumieraReference self, LumieraReference source); -CinelerraReference -cinelerra_reference_weaken (restrict CinelerraReference self); +LumieraReference +lumiera_reference_weaken (restrict LumieraReference self); -CinelerraReference -cinelerra_reference_strengthen (CinelerraReference self); +LumieraReference +lumiera_reference_strengthen (LumieraReference self); #endif diff --git a/src/lib/rwlock.c b/src/lib/rwlock.c index 48becb14d..c7ee3a37d 100644 --- a/src/lib/rwlock.c +++ b/src/lib/rwlock.c @@ -1,8 +1,8 @@ /* rwlock.c - read/write locks - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -23,8 +23,8 @@ #include #include "lib/rwlock.h" -CINELERRA_ERROR_DEFINE(RWLOCK_AGAIN, "maximum number of readlocks exceed"); -CINELERRA_ERROR_DEFINE(RWLOCK_DEADLOCK, "deadlock detected"); +LUMIERA_ERROR_DEFINE(RWLOCK_AGAIN, "maximum number of readlocks exceed"); +LUMIERA_ERROR_DEFINE(RWLOCK_DEADLOCK, "deadlock detected"); /** * @file Read/write locks. @@ -36,8 +36,8 @@ CINELERRA_ERROR_DEFINE(RWLOCK_DEADLOCK, "deadlock detected"); * @param self is a pointer to the rwlock to be initialized * @return self as given */ -CinelerraRWLock -cinelerra_rwlock_init (CinelerraRWLock self) +LumieraRWLock +lumiera_rwlock_init (LumieraRWLock self) { if (self) { @@ -51,13 +51,13 @@ cinelerra_rwlock_init (CinelerraRWLock self) * @param self is a pointer to the rwlock to be initialized * @return self on success or NULL at error */ -CinelerraRWLock -cinelerra_rwlock_destroy (CinelerraRWLock self) +LumieraRWLock +lumiera_rwlock_destroy (LumieraRWLock self) { if (self) { if (pthread_rwlock_destroy (&self->rwlock)) - CINELERRA_DIE; + LUMIERA_DIE; } return self; } @@ -69,44 +69,44 @@ cinelerra_rwlock_destroy (CinelerraRWLock self) * initialize a rwlockacquirer state * @param self rwlockacquirer to be initialized, must be an automatic variable * @param rwlock associated rwlock - * @param state initial state of the mutex, either CINELERRA_RDLOCKED, CINELERRA_WRLOCKED or CINELERRA_UNLOCKED + * @param state initial state of the mutex, either LUMIERA_RDLOCKED, LUMIERA_WRLOCKED or LUMIERA_UNLOCKED * @return self as given or NULL on error */ -CinelerraRWLockacquirer -cinelerra_rwlockacquirer_init (CinelerraRWLockacquirer self, CinelerraRWLock rwlock, enum cinelerra_lockstate state) +LumieraRWLockacquirer +lumiera_rwlockacquirer_init (LumieraRWLockacquirer self, LumieraRWLock rwlock, enum lumiera_lockstate state) { REQUIRE (self); REQUIRE (rwlock); - REQUIRE (state != CINELERRA_LOCKED, "illegal state for rwlock"); + REQUIRE (state != LUMIERA_LOCKED, "illegal state for rwlock"); self->rwlock = rwlock; self->state = state; switch (state) { - case CINELERRA_RDLOCKED: + case LUMIERA_RDLOCKED: switch (pthread_rwlock_rdlock (&rwlock->rwlock)) { case 0: break; case EAGAIN: - cinelerra_error_set (CINELERRA_ERROR_RWLOCK_AGAIN); + lumiera_error_set (LUMIERA_ERROR_RWLOCK_AGAIN); return NULL; case EDEADLK: - cinelerra_error_set (CINELERRA_ERROR_RWLOCK_DEADLOCK); + lumiera_error_set (LUMIERA_ERROR_RWLOCK_DEADLOCK); return NULL; default: - CINELERRA_DIE; + LUMIERA_DIE; } - case CINELERRA_WRLOCKED: + case LUMIERA_WRLOCKED: switch (pthread_rwlock_wrlock (&rwlock->rwlock)) { case 0: break; case EDEADLK: - cinelerra_error_set (CINELERRA_ERROR_RWLOCK_DEADLOCK); + lumiera_error_set (LUMIERA_ERROR_RWLOCK_DEADLOCK); return NULL; default: - CINELERRA_DIE; + LUMIERA_DIE; } default: break; @@ -121,27 +121,27 @@ cinelerra_rwlockacquirer_init (CinelerraRWLockacquirer self, CinelerraRWLock rwl * @param self rwlockacquirer associated with a rwlock * @return self as given or NULL on error */ -CinelerraRWLockacquirer -cinelerra_rwlockacquirer_rdlock (CinelerraRWLockacquirer self) +LumieraRWLockacquirer +lumiera_rwlockacquirer_rdlock (LumieraRWLockacquirer self) { REQUIRE (self); - REQUIRE (self->state == CINELERRA_UNLOCKED, "rwlock already locked"); + REQUIRE (self->state == LUMIERA_UNLOCKED, "rwlock already locked"); switch (pthread_rwlock_rdlock (&self->rwlock->rwlock)) { case 0: break; case EAGAIN: - cinelerra_error_set (CINELERRA_ERROR_RWLOCK_AGAIN); + lumiera_error_set (LUMIERA_ERROR_RWLOCK_AGAIN); return NULL; case EDEADLK: - cinelerra_error_set (CINELERRA_ERROR_RWLOCK_DEADLOCK); + lumiera_error_set (LUMIERA_ERROR_RWLOCK_DEADLOCK); return NULL; default: - CINELERRA_DIE; + LUMIERA_DIE; } - self->state = CINELERRA_RDLOCKED; + self->state = LUMIERA_RDLOCKED; return self; } @@ -152,24 +152,24 @@ cinelerra_rwlockacquirer_rdlock (CinelerraRWLockacquirer self) * @param self rwlockacquirer associated with a rwlock * @return self as given or NULL on error */ -CinelerraRWLockacquirer -cinelerra_rwlockacquirer_wrlock (CinelerraRWLockacquirer self) +LumieraRWLockacquirer +lumiera_rwlockacquirer_wrlock (LumieraRWLockacquirer self) { REQUIRE (self); - REQUIRE (self->state == CINELERRA_UNLOCKED, "rwlock already locked"); + REQUIRE (self->state == LUMIERA_UNLOCKED, "rwlock already locked"); switch (pthread_rwlock_wrlock (&self->rwlock->rwlock)) { case 0: break; case EDEADLK: - cinelerra_error_set (CINELERRA_ERROR_RWLOCK_DEADLOCK); + lumiera_error_set (LUMIERA_ERROR_RWLOCK_DEADLOCK); return NULL; default: - CINELERRA_DIE; + LUMIERA_DIE; } - self->state = CINELERRA_WRLOCKED; + self->state = LUMIERA_WRLOCKED; return self; } diff --git a/src/lib/rwlock.h b/src/lib/rwlock.h index 21ad1e054..922a05e7b 100644 --- a/src/lib/rwlock.h +++ b/src/lib/rwlock.h @@ -1,8 +1,8 @@ /* rwlock.h - read/write locks - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -19,8 +19,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef CINELERRA_RWLOCK_H -#define CINELERRA_RWLOCK_H +#ifndef LUMIERA_RWLOCK_H +#define LUMIERA_RWLOCK_H #ifndef _GNU_SOURCE #error "This header must be included with _GNU_SOURCE or _POSIX_C_SOURCE >= 200112L defined" @@ -31,8 +31,8 @@ #include "lib/locking.h" -CINELERRA_ERROR_DECLARE(RWLOCK_AGAIN); -CINELERRA_ERROR_DECLARE(RWLOCK_DEADLOCK); +LUMIERA_ERROR_DECLARE(RWLOCK_AGAIN); +LUMIERA_ERROR_DECLARE(RWLOCK_DEADLOCK); /** * @file Read/write locks, header. @@ -43,20 +43,20 @@ CINELERRA_ERROR_DECLARE(RWLOCK_DEADLOCK); * RWLock. * */ -struct cinelerra_rwlock_struct +struct lumiera_rwlock_struct { pthread_rwlock_t rwlock; }; -typedef struct cinelerra_rwlock_struct cinelerra_rwlock; -typedef cinelerra_rwlock* CinelerraRWLock; +typedef struct lumiera_rwlock_struct lumiera_rwlock; +typedef lumiera_rwlock* LumieraRWLock; -CinelerraRWLock -cinelerra_rwlock_init (CinelerraRWLock self); +LumieraRWLock +lumiera_rwlock_init (LumieraRWLock self); -CinelerraRWLock -cinelerra_rwlock_destroy (CinelerraRWLock self); +LumieraRWLock +lumiera_rwlock_destroy (LumieraRWLock self); @@ -64,35 +64,35 @@ cinelerra_rwlock_destroy (CinelerraRWLock self); /** * rwlockacquirer used to manage the state of a rwlock variable. */ -struct cinelerra_rwlockacquirer_struct +struct lumiera_rwlockacquirer_struct { - CinelerraRWLock rwlock; - enum cinelerra_lockstate state; + LumieraRWLock rwlock; + enum lumiera_lockstate state; }; -typedef struct cinelerra_rwlockacquirer_struct cinelerra_rwlockacquirer; -typedef struct cinelerra_rwlockacquirer_struct* CinelerraRWLockacquirer; +typedef struct lumiera_rwlockacquirer_struct lumiera_rwlockacquirer; +typedef struct lumiera_rwlockacquirer_struct* LumieraRWLockacquirer; /* helper function for nobug */ static inline void -cinelerra_rwlockacquirer_ensureunlocked (CinelerraRWLockacquirer self) +lumiera_rwlockacquirer_ensureunlocked (LumieraRWLockacquirer self) { - ENSURE (self->state == CINELERRA_UNLOCKED, "forgot to unlock the rwlock mutex"); + ENSURE (self->state == LUMIERA_UNLOCKED, "forgot to unlock the rwlock mutex"); } /* override with a macro to use the cleanup checker */ -#define cinelerra_rwlockacquirer \ -cinelerra_rwlockacquirer NOBUG_CLEANUP(cinelerra_rwlockacquirer_ensureunlocked) +#define lumiera_rwlockacquirer \ +lumiera_rwlockacquirer NOBUG_CLEANUP(lumiera_rwlockacquirer_ensureunlocked) -CinelerraRWLockacquirer -cinelerra_rwlockacquirer_init (CinelerraRWLockacquirer self, CinelerraRWLock rwlock, enum cinelerra_lockstate state); +LumieraRWLockacquirer +lumiera_rwlockacquirer_init (LumieraRWLockacquirer self, LumieraRWLock rwlock, enum lumiera_lockstate state); -CinelerraRWLockacquirer -cinelerra_rwlockacquirer_rdlock (CinelerraRWLockacquirer self); +LumieraRWLockacquirer +lumiera_rwlockacquirer_rdlock (LumieraRWLockacquirer self); -CinelerraRWLockacquirer -cinelerra_rwlockacquirer_wrlock (CinelerraRWLockacquirer self); +LumieraRWLockacquirer +lumiera_rwlockacquirer_wrlock (LumieraRWLockacquirer self); /** @@ -101,13 +101,13 @@ cinelerra_rwlockacquirer_wrlock (CinelerraRWLockacquirer self); * @param self rwlockacquirer associated with a rwlock variable */ static inline void -cinelerra_rwlockacquirer_unlock (CinelerraRWLockacquirer self) +lumiera_rwlockacquirer_unlock (LumieraRWLockacquirer self) { REQUIRE (self); - REQUIRE (self->state != CINELERRA_UNLOCKED, "rwlock was not locked"); + REQUIRE (self->state != LUMIERA_UNLOCKED, "rwlock was not locked"); if (pthread_rwlock_unlock (&self->rwlock->rwlock)) - CINELERRA_DIE; - self->state = CINELERRA_UNLOCKED; + LUMIERA_DIE; + self->state = LUMIERA_UNLOCKED; } diff --git a/src/lib/time.c b/src/lib/time.c index 6cbdde6ee..83bfd9797 100644 --- a/src/lib/time.c +++ b/src/lib/time.c @@ -1,8 +1,8 @@ /* time.h - Time and frame calculations - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -21,6 +21,6 @@ #include "lib/error.h" -CINELERRA_ERROR_DEFINE(TIME_OVERFLOW, "Time overflow"); -CINELERRA_ERROR_DEFINE(TIME_UNDERFLOW, "Time underflow"); -CINELERRA_ERROR_DEFINE(TIME_NEGATIVE, "Time negative"); +LUMIERA_ERROR_DEFINE(TIME_OVERFLOW, "Time overflow"); +LUMIERA_ERROR_DEFINE(TIME_UNDERFLOW, "Time underflow"); +LUMIERA_ERROR_DEFINE(TIME_NEGATIVE, "Time negative"); diff --git a/src/lib/time.h b/src/lib/time.h index 4203ece49..26b698742 100644 --- a/src/lib/time.h +++ b/src/lib/time.h @@ -1,8 +1,8 @@ /* time.h - Time calculations - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -19,8 +19,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef CINELERRA_TIME_H -#define CINELERRA_TIME_H +#ifndef LUMIERA_TIME_H +#define LUMIERA_TIME_H #include #include @@ -35,31 +35,31 @@ timehandling is a delicate business, be careful of precision errors accumulating - cinelerra_time is starting from zero, never becomes negative. + lumiera_time is starting from zero, never becomes negative. TODO explain how to use time */ /* over or underflow (tried to make a movie which has negative length? or more than some hundreds days?) */ -CINELERRA_ERROR_DECLARE(TIME_OVERFLOW); -CINELERRA_ERROR_DECLARE(TIME_UNDERFLOW); -CINELERRA_ERROR_DECLARE(TIME_NEGATIVE); +LUMIERA_ERROR_DECLARE(TIME_OVERFLOW); +LUMIERA_ERROR_DECLARE(TIME_UNDERFLOW); +LUMIERA_ERROR_DECLARE(TIME_NEGATIVE); /* Note: we measure time starting from zero, time never becomes negative (I didnt checked if the time types are signed) */ -typedef struct timeval cinelerra_time; -typedef cinelerra_time* CinelerraTime; +typedef struct timeval lumiera_time; +typedef lumiera_time* LumieraTime; /** * normalize time after operations. * used internally */ static inline void -cinelerra_time_normalize (CinelerraTime time) +lumiera_time_normalize (LumieraTime time) { REQUIRE (time); if (time->tv_usec >= 1000000) @@ -75,8 +75,8 @@ cinelerra_time_normalize (CinelerraTime time) * @param time Time to clear * @return time as given */ -static inline CinelerraTime -cinelerra_time_clear (CinelerraTime time) +static inline LumieraTime +lumiera_time_clear (LumieraTime time) { if(time) { @@ -91,14 +91,14 @@ cinelerra_time_clear (CinelerraTime time) * @param time Time to put current time into. * @return time as given */ -static inline CinelerraTime -cinelerra_time_current (CinelerraTime time) +static inline LumieraTime +lumiera_time_current (LumieraTime time) { if (time) { /* gettime should never ever fail in a correct program */ if (gettimeofday (time, NULL)) - CINELERRA_DIE; + LUMIERA_DIE; } return time; } @@ -110,8 +110,8 @@ cinelerra_time_current (CinelerraTime time) * @return time as given upon success, NULL if double time given was negative or given time didn't point * anywhere */ -static inline CinelerraTime -cinelerra_time_set_double (CinelerraTime time, double fp) +static inline LumieraTime +lumiera_time_set_double (LumieraTime time, double fp) { if (time) { @@ -125,7 +125,7 @@ cinelerra_time_set_double (CinelerraTime time, double fp) { time->tv_sec = (time_t)-1; time->tv_usec = (suseconds_t)-1; - cinelerra_error_set(CINELERRA_ERROR_TIME_NEGATIVE); + lumiera_error_set(LUMIERA_ERROR_TIME_NEGATIVE); } } return NULL; @@ -138,14 +138,14 @@ cinelerra_time_set_double (CinelerraTime time, double fp) * @param usec Microseconds to set * @param Time as given */ -static inline CinelerraTime -cinelerra_time_init (CinelerraTime time, time_t sec, suseconds_t usec) +static inline LumieraTime +lumiera_time_init (LumieraTime time, time_t sec, suseconds_t usec) { if (time) { time->tv_sec = sec; time->tv_usec = usec; - cinelerra_time_normalize (time); + lumiera_time_normalize (time); } return time; } @@ -156,7 +156,7 @@ cinelerra_time_init (CinelerraTime time, time_t sec, suseconds_t usec) * @return Seconds elapsed, -1 on error */ static inline time_t -cinelerra_time_sec (CinelerraTime time) +lumiera_time_sec (LumieraTime time) { if (time) return time->tv_sec; @@ -170,7 +170,7 @@ cinelerra_time_sec (CinelerraTime time) * @return Microseconds elapsed, -1 on error */ static inline suseconds_t -cinelerra_time_usec (CinelerraTime time) +lumiera_time_usec (LumieraTime time) { if (time) return time->tv_usec; @@ -184,7 +184,7 @@ cinelerra_time_usec (CinelerraTime time) * @return Floating point representation of time. NAN on error. */ static inline double -cinelerra_time_double_get (CinelerraTime time) +lumiera_time_double_get (LumieraTime time) { if (time) { @@ -204,8 +204,8 @@ cinelerra_time_double_get (CinelerraTime time) * @param src Time-source to copy from * @return dest as given */ -static inline CinelerraTime -cinelerra_time_copy (CinelerraTime dest, const CinelerraTime src) +static inline LumieraTime +lumiera_time_copy (LumieraTime dest, const LumieraTime src) { if (dest && src) { @@ -221,8 +221,8 @@ cinelerra_time_copy (CinelerraTime dest, const CinelerraTime src) * @param src Time to add to dest * @return dest as given, or NULL on overflow. */ -static inline CinelerraTime -cinelerra_time_add (CinelerraTime dest, const CinelerraTime src) +static inline LumieraTime +lumiera_time_add (LumieraTime dest, const LumieraTime src) { if (dest && src) { @@ -231,11 +231,11 @@ cinelerra_time_add (CinelerraTime dest, const CinelerraTime src) dest->tv_sec += src->tv_sec; dest->tv_usec += src->tv_usec; - cinelerra_time_normalize (dest); + lumiera_time_normalize (dest); if (dest->tv_sec < t) { - cinelerra_error_set (CINELERRA_ERROR_TIME_OVERFLOW); + lumiera_error_set (LUMIERA_ERROR_TIME_OVERFLOW); return NULL; } } @@ -248,8 +248,8 @@ cinelerra_time_add (CinelerraTime dest, const CinelerraTime src) * @param src Time to subtract from dest * @return dest as given, or NULL on underflow. */ -static inline CinelerraTime -cinelerra_time_sub (CinelerraTime dest, const CinelerraTime src) +static inline LumieraTime +lumiera_time_sub (LumieraTime dest, const LumieraTime src) { if (dest && src) { @@ -264,11 +264,11 @@ cinelerra_time_sub (CinelerraTime dest, const CinelerraTime src) dest->tv_usec += 1000000 - src->tv_usec; } - cinelerra_time_normalize (dest); + lumiera_time_normalize (dest); if (dest->tv_sec > t) { - cinelerra_error_set (CINELERRA_ERROR_TIME_UNDERFLOW); + lumiera_error_set (LUMIERA_ERROR_TIME_UNDERFLOW); return NULL; } } diff --git a/src/cinelerra.h b/src/lumiera.h similarity index 84% rename from src/cinelerra.h rename to src/lumiera.h index c2b95dd8c..12b1578b9 100644 --- a/src/cinelerra.h +++ b/src/lumiera.h @@ -1,9 +1,9 @@ /* - CINELERRA.h - global definitions and common types + LUMIERA.h - global definitions and common types - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, Christian Thaeter Hermann Vosseler This program is free software; you can redistribute it and/or @@ -22,8 +22,8 @@ */ -#ifndef CINELERRA_H -#define CINELERRA_H +#ifndef LUMIERA_H +#define LUMIERA_H @@ -54,13 +54,13 @@ extern "C" { #include "common/error.hpp" -namespace cinelerra +namespace lumiera { /* additional global configuration goes here... */ -} // namespace cinelerra +} // namespace lumiera #endif /* ===================== (End) C++-Part ================= */ -#endif /*CINELERRA_H*/ +#endif /*LUMIERA_H*/ diff --git a/src/main.cpp b/src/main.cpp index ae1d20e9c..398cdc3df 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,8 +1,8 @@ /* - main.cpp - start the Cinelerra Application + main.cpp - start the Lumiera Application - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, Christian Thaeter Hermann Vosseler This program is free software; you can redistribute it and/or @@ -23,17 +23,16 @@ #include -#include "cinelerra.h" +#include "lumiera.h" using std::cout; using std::endl; -using cinelerra::Appconfig; +using lumiera::Appconfig; int main (int argc, char* argv[]) { - cout << "*** Cinelerra NLE for Linux ***" << endl + cout << "*** Lumiera NLE for Linux ***" << endl << " Version: " << Appconfig::get("version") << endl; - assert(true); return 0; } diff --git a/src/nobugcfg.h b/src/nobugcfg.h index 7907d50a1..916f28663 100644 --- a/src/nobugcfg.h +++ b/src/nobugcfg.h @@ -2,8 +2,8 @@ NOBUGCFG.h - global configuration and definitions for NoBug - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, Christian Thaeter Hermann Vosseler This program is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ ** The idea is that configuration and some globally used flag ** declarations are to be kept in one central location. Normally, ** this header will be included by appconfig.hpp, which in turn gets - ** included by cinelerra.h + ** included by lumiera.h ** @par Besides the usual guarded declarations, this header contains ** one section with the corresponding definitions. This section ** is to be called by appconfig.cpp only, which deals with application diff --git a/src/plugin/helloplugin.c b/src/plugin/helloplugin.c index 62a033f4e..d75f55f94 100644 --- a/src/plugin/helloplugin.c +++ b/src/plugin/helloplugin.c @@ -1,12 +1,12 @@ /* * hello.c - demonstrates how to build a standalone tool (C source) - * integrated into the SCons based build system of Cinelerra + * integrated into the SCons based build system of Lumiera */ #include int main(int argc, char* argv[]) { - printf("hello cinelerra world"); + printf("hello lumiera world"); return 0; } diff --git a/src/pre.hpp b/src/pre.hpp index af83dd9a2..19717c2bb 100644 --- a/src/pre.hpp +++ b/src/pre.hpp @@ -2,8 +2,8 @@ PRE.hpp - precompiled header collection - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, Christian Thaeter Hermann Vosseler This program is free software; you can redistribute it and/or @@ -33,8 +33,8 @@ ** @see mobject.hpp usage example */ -#ifndef CINELERRA_PRE_HPP -#define CINELERRA_PRE_HPP +#ifndef LUMIERA_PRE_HPP +#define LUMIERA_PRE_HPP #include #include @@ -44,8 +44,8 @@ #include #include -#include "cinelerra.h" +#include "lumiera.h" -#endif /*CINELERRA_PRE_HPP*/ +#endif /*LUMIERA_PRE_HPP*/ diff --git a/src/proc/DIR_INFO b/src/proc/DIR_INFO index e709101eb..dac54f26c 100644 --- a/src/proc/DIR_INFO +++ b/src/proc/DIR_INFO @@ -1 +1 @@ -cinelerra processing core +Lumiera processing core diff --git a/src/proc/asset.cpp b/src/proc/asset.cpp index 7547b9597..923b61248 100644 --- a/src/proc/asset.cpp +++ b/src/proc/asset.cpp @@ -1,8 +1,8 @@ /* Asset} - Superinterface: bookeeping view of "things" present in the session - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -111,7 +111,7 @@ namespace asset /**change the enablement status of this asset. */ bool - Asset::enable (bool on) throw(cinelerra::error::State) + Asset::enable (bool on) throw(lumiera::error::State) { if (on == this->enabled) return true; diff --git a/src/proc/asset.hpp b/src/proc/asset.hpp index 7375d25af..bc587cc96 100644 --- a/src/proc/asset.hpp +++ b/src/proc/asset.hpp @@ -1,8 +1,8 @@ /* ASSET.hpp - Superinterface: bookeeping view of "things" present in the session - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -156,7 +156,7 @@ namespace asset /** origin or authorship id. * Can be a project abbreviation, a package id or just the authors nickname or UID. * This allows for the compnent name to be more generic (e.g. "blur"). - * Default for all assets provided by the core cinelerra-3 codebase is "cin3". + * Default for all assets provided by the core Lumiera codebase is "lumi". */ const string org; @@ -171,7 +171,7 @@ namespace asset Ident (const string& n, const Category& cat, - const string& o = "cin3", + const string& o = "lumi", const uint ver=1); /** @note equality ignores version differences */ @@ -285,7 +285,7 @@ namespace asset * @return \c false if the state could not be changed * due to parent objects being disabled */ - bool enable (bool on=true) throw(cinelerra::error::State); + bool enable (bool on=true) throw(lumiera::error::State); }; diff --git a/src/proc/asset/buildinstruct.hpp b/src/proc/asset/buildinstruct.hpp index d6eeaec0d..577a108c1 100644 --- a/src/proc/asset/buildinstruct.hpp +++ b/src/proc/asset/buildinstruct.hpp @@ -1,8 +1,8 @@ /* BUILDINSTRUCT.hpp - Instructions for building some configuration of render nodes. - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/category.cpp b/src/proc/asset/category.cpp index 41f6e1c03..490f1f0d6 100644 --- a/src/proc/asset/category.cpp +++ b/src/proc/asset/category.cpp @@ -1,8 +1,8 @@ /* Category - tree like classification of Assets - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/category.hpp b/src/proc/asset/category.hpp index b70f34943..9e0526cc2 100644 --- a/src/proc/asset/category.hpp +++ b/src/proc/asset/category.hpp @@ -1,8 +1,8 @@ /* CATEGORY.hpp - tree like classification of Assets - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/clip.cpp b/src/proc/asset/clip.cpp index e643d96d7..ddaa5a22a 100644 --- a/src/proc/asset/clip.cpp +++ b/src/proc/asset/clip.cpp @@ -1,8 +1,8 @@ /* Clip(Asset) - bookkeeping (asset) view of a media clip. - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/clip.hpp b/src/proc/asset/clip.hpp index 47f6e2860..f5e1ea629 100644 --- a/src/proc/asset/clip.hpp +++ b/src/proc/asset/clip.hpp @@ -1,8 +1,8 @@ /* CLIP.hpp - bookkeeping (asset) view of a media clip. - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/codec.cpp b/src/proc/asset/codec.cpp index ecfcb0313..8604a89d6 100644 --- a/src/proc/asset/codec.cpp +++ b/src/proc/asset/codec.cpp @@ -1,8 +1,8 @@ /* Codec(Asset) - description of some media data decoder or encoder facility - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/codec.hpp b/src/proc/asset/codec.hpp index 890eaa422..40ee70370 100644 --- a/src/proc/asset/codec.hpp +++ b/src/proc/asset/codec.hpp @@ -1,8 +1,8 @@ /* CODEC.hpp - description of some media data decoder or encoder facility - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/compoundmedia.cpp b/src/proc/asset/compoundmedia.cpp index 8b53c97e8..1a00458b6 100644 --- a/src/proc/asset/compoundmedia.cpp +++ b/src/proc/asset/compoundmedia.cpp @@ -1,8 +1,8 @@ /* CompoundMedia - multichannel media - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/compoundmedia.hpp b/src/proc/asset/compoundmedia.hpp index 0e7b0bd97..534993391 100644 --- a/src/proc/asset/compoundmedia.hpp +++ b/src/proc/asset/compoundmedia.hpp @@ -1,8 +1,8 @@ /* COMPOUNDMEDIA.hpp - multichannel media - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/dataset.cpp b/src/proc/asset/dataset.cpp index 7b1ddf997..f82460fed 100644 --- a/src/proc/asset/dataset.cpp +++ b/src/proc/asset/dataset.cpp @@ -1,8 +1,8 @@ /* Dataset - meta asset describing a collection of control data - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/dataset.hpp b/src/proc/asset/dataset.hpp index 8ce580cbe..31fcb8982 100644 --- a/src/proc/asset/dataset.hpp +++ b/src/proc/asset/dataset.hpp @@ -1,8 +1,8 @@ /* DATASET.hpp - meta asset describing a collection of control data - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/db.hpp b/src/proc/asset/db.hpp index ee6ea753d..0f385f96d 100644 --- a/src/proc/asset/db.hpp +++ b/src/proc/asset/db.hpp @@ -1,8 +1,8 @@ /* DB.hpp - registry holding known Asset instances. - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -87,7 +87,7 @@ namespace asset DB () : table() { } ~DB () {clear();} - friend class cinelerra::singleton::StaticCreate; + friend class lumiera::singleton::StaticCreate; public: @@ -125,7 +125,7 @@ namespace asset table.clear(); } - catch (cinelerra::Error& EX) + catch (lumiera::Error& EX) { WARN (oper, "Problems while clearing Asset registry: %s", EX.what()); } diff --git a/src/proc/asset/effect.cpp b/src/proc/asset/effect.cpp index 7ff288876..e8203996e 100644 --- a/src/proc/asset/effect.cpp +++ b/src/proc/asset/effect.cpp @@ -1,8 +1,8 @@ /* Effect(Asset) - Effect or media processing component - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/effect.hpp b/src/proc/asset/effect.hpp index 78c990c98..5d00e44b8 100644 --- a/src/proc/asset/effect.hpp +++ b/src/proc/asset/effect.hpp @@ -1,8 +1,8 @@ /* EFFECT.hpp - Effect or media processing component - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/media.cpp b/src/proc/asset/media.cpp index 769863ff3..477ac4d9d 100644 --- a/src/proc/asset/media.cpp +++ b/src/proc/asset/media.cpp @@ -1,8 +1,8 @@ /* Media(Asset) - key abstraction: media-like assets - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -116,7 +116,7 @@ namespace asset } - cinelerra::Time + lumiera::Time Media::getLength() const { return len_; @@ -177,7 +177,7 @@ namespace asset MediaFactory::PType MediaFactory::operator() (const string& file, const Category& cat) { - Asset::Ident key(extractName(file), cat, "cin3", 1); + Asset::Ident key(extractName(file), cat, "lumi", 1); return operator() (key, file); } @@ -220,21 +220,21 @@ namespace asset * but rather part or a multichannel (compound) media */ shared_ptr - MediaFactory::operator() (asset::Media& mediaref) throw(cinelerra::error::Invalid) + MediaFactory::operator() (asset::Media& mediaref) throw(lumiera::error::Invalid) { if (mediaref.checkCompound()) - throw cinelerra::error::Invalid (str(format("Attempt to create a asset::Clip from the media %s, " - "which is not toplevel but rather part or a compound " - "(multichannel) media. Found parent Media %s.") - % string(mediaref) - % string(*mediaref.checkCompound())) - ,CINELERRA_ERROR_PART_OF_COMPOUND - ); + throw lumiera::error::Invalid (str(format("Attempt to create a asset::Clip from the media %s, " + "which is not toplevel but rather part or a compound " + "(multichannel) media. Found parent Media %s.") + % string(mediaref) + % string(*mediaref.checkCompound())) + ,LUMIERA_ERROR_PART_OF_COMPOUND + ); asset::Clip* pC = new asset::Clip (mediaref); return AssetManager::instance().wrap (*pC); } - CINELERRA_ERROR_DEFINE (PART_OF_COMPOUND, "part of compound used as toplevel element"); + LUMIERA_ERROR_DEFINE (PART_OF_COMPOUND, "part of compound used as toplevel element"); diff --git a/src/proc/asset/media.hpp b/src/proc/asset/media.hpp index 9c1a85627..ce43d6231 100644 --- a/src/proc/asset/media.hpp +++ b/src/proc/asset/media.hpp @@ -1,8 +1,8 @@ /* MEDIA.hpp - key abstraction: media-like assets - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -50,7 +50,7 @@ namespace asset class MediaFactory; class ProcPatt; - using cinelerra::Time; + using lumiera::Time; template<> @@ -137,7 +137,7 @@ namespace asset /** * Factory specialized for creating Media Asset objects. */ - class MediaFactory : public cinelerra::Factory + class MediaFactory : public lumiera::Factory { public: typedef shared_ptr PType; @@ -151,11 +151,11 @@ namespace asset PType operator() (const char* file, asset::Kind); shared_ptr - operator() (asset::Media& mediaref) throw(cinelerra::error::Invalid); + operator() (asset::Media& mediaref) throw(lumiera::error::Invalid); }; - CINELERRA_ERROR_DECLARE (PART_OF_COMPOUND); + LUMIERA_ERROR_DECLARE (PART_OF_COMPOUND); diff --git a/src/proc/asset/meta.cpp b/src/proc/asset/meta.cpp index 0395d3ea8..bdfd1c411 100644 --- a/src/proc/asset/meta.cpp +++ b/src/proc/asset/meta.cpp @@ -1,8 +1,8 @@ /* Meta(Asset) - key abstraction: metadata and organisational asset - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/meta.hpp b/src/proc/asset/meta.hpp index e1b2f48fc..89500c226 100644 --- a/src/proc/asset/meta.hpp +++ b/src/proc/asset/meta.hpp @@ -1,8 +1,8 @@ /* META.hpp - key abstraction: metadata and organisational asset - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -90,7 +90,7 @@ namespace asset /** * Factory specialized for createing Metadata Asset objects. */ - class MetaFactory : public cinelerra::Factory + class MetaFactory : public lumiera::Factory { public: typedef shared_ptr PType; diff --git a/src/proc/asset/pipe.cpp b/src/proc/asset/pipe.cpp index 78899e844..719b91246 100644 --- a/src/proc/asset/pipe.cpp +++ b/src/proc/asset/pipe.cpp @@ -1,8 +1,8 @@ /* Pipe - structural asset denoting a processing pipe generating media output - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/pipe.hpp b/src/proc/asset/pipe.hpp index ea354361d..110dd1975 100644 --- a/src/proc/asset/pipe.hpp +++ b/src/proc/asset/pipe.hpp @@ -1,8 +1,8 @@ /* PIPE.hpp - structural asset denoting a processing pipe generating media output - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/preview.cpp b/src/proc/asset/preview.cpp index 888681f35..2753f8cc9 100644 --- a/src/proc/asset/preview.cpp +++ b/src/proc/asset/preview.cpp @@ -1,8 +1,8 @@ /* Preview(Asset) - alternative version of the media data, probably with lower resolution - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/preview.hpp b/src/proc/asset/preview.hpp index 2a8c3c8a3..e36e22ea4 100644 --- a/src/proc/asset/preview.hpp +++ b/src/proc/asset/preview.hpp @@ -1,8 +1,8 @@ /* PREVIEW.hpp - alternative version of the media data, probably with lower resolution - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/proc.cpp b/src/proc/asset/proc.cpp index cff302a24..87aa48da6 100644 --- a/src/proc/asset/proc.cpp +++ b/src/proc/asset/proc.cpp @@ -1,8 +1,8 @@ /* Proc(Asset) - key abstraction: media-like assets - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/proc.hpp b/src/proc/asset/proc.hpp index f2a72cecd..12e69812c 100644 --- a/src/proc/asset/proc.hpp +++ b/src/proc/asset/proc.hpp @@ -1,8 +1,8 @@ /* PROC.hpp - key abstraction: media-like assets - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -92,7 +92,7 @@ namespace asset /** * Factory specialized for createing Processor Asset objects. */ - class ProcFactory : public cinelerra::Factory + class ProcFactory : public lumiera::Factory { public: typedef shared_ptr PType; diff --git a/src/proc/asset/procpatt.cpp b/src/proc/asset/procpatt.cpp index f7ce8895d..1adf8736c 100644 --- a/src/proc/asset/procpatt.cpp +++ b/src/proc/asset/procpatt.cpp @@ -1,8 +1,8 @@ /* ProcPatt - template for building some render processing network - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/procpatt.hpp b/src/proc/asset/procpatt.hpp index 593c57a0f..6c8cf37e0 100644 --- a/src/proc/asset/procpatt.hpp +++ b/src/proc/asset/procpatt.hpp @@ -1,8 +1,8 @@ /* PROCPATT.hpp - template for building some render processing network - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -35,7 +35,7 @@ using std::vector; namespace asset { - using cinelerra::Symbol; + using lumiera::Symbol; class Proc; class ProcPatt; diff --git a/src/proc/asset/struct.cpp b/src/proc/asset/struct.cpp index bcaff3118..10eaf15ef 100644 --- a/src/proc/asset/struct.cpp +++ b/src/proc/asset/struct.cpp @@ -1,8 +1,8 @@ /* Struct(Asset) - key abstraction: structural asset - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -37,10 +37,10 @@ using boost::format; -using cinelerra::Symbol; -using cinelerra::query::normalizeID; -using cinelerra::query::QueryHandler; -using cinelerra::ConfigRules; +using lumiera::Symbol; +using lumiera::query::normalizeID; +using lumiera::query::QueryHandler; +using lumiera::ConfigRules; using util::contains; @@ -57,7 +57,7 @@ namespace asset const string Struct::queryStreamID() const { - return cinelerra::query::extractID ("stream", this->ident.name); + return lumiera::query::extractID ("stream", this->ident.name); } /** query the currently defined properties of this @@ -65,7 +65,7 @@ namespace asset const string Struct::queryPipeID() const { - return cinelerra::query::extractID ("pipe", this->ident.name); + return lumiera::query::extractID ("pipe", this->ident.name); } @@ -92,8 +92,9 @@ namespace asset shared_ptr StructFactory::operator() (const Query& capabilities) { + shared_ptr res; QueryHandler& typeHandler = ConfigRules::instance(); - shared_ptr res = typeHandler.resolve (capabilities); + typeHandler.resolve (res, capabilities); if (res) return res; diff --git a/src/proc/asset/struct.hpp b/src/proc/asset/struct.hpp index ed6642690..25a14ee25 100644 --- a/src/proc/asset/struct.hpp +++ b/src/proc/asset/struct.hpp @@ -1,8 +1,8 @@ /* STRUCT.hpp - key abstraction: structural asset - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -52,7 +52,7 @@ using boost::scoped_ptr; namespace asset { - using cinelerra::Query; + using lumiera::Query; class Struct; class StructFactory; @@ -108,7 +108,7 @@ namespace asset /** * Factory specialized for createing Structural Asset objects. */ - class StructFactory : public cinelerra::Factory + class StructFactory : public lumiera::Factory { scoped_ptr impl_; diff --git a/src/proc/asset/structfactoryimpl.hpp b/src/proc/asset/structfactoryimpl.hpp index 3d78920d3..fb8e5245f 100644 --- a/src/proc/asset/structfactoryimpl.hpp +++ b/src/proc/asset/structfactoryimpl.hpp @@ -1,8 +1,8 @@ /* STRUCTFACTORYIMPL.hpp - crating structural assets (impl details) - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -48,8 +48,8 @@ using mobject::Session; using util::isnil; using util::contains; using asset::Query; -using cinelerra::query::CINELERRA_ERROR_CAPABILITY_QUERY; -using cinelerra::query::extractID; +using lumiera::query::LUMIERA_ERROR_CAPABILITY_QUERY; +using lumiera::query::extractID; namespace asset { @@ -135,8 +135,8 @@ namespace asset template STRU* fabricate (const Query& caps) { - throw cinelerra::error::Config ( str(format("The following Query could not be resolved: %s.") % caps.asKey()) - , CINELERRA_ERROR_CAPABILITY_QUERY ); + throw lumiera::error::Config ( str(format("The following Query could not be resolved: %s.") % caps.asKey()) + , LUMIERA_ERROR_CAPABILITY_QUERY ); } }; diff --git a/src/proc/asset/track.cpp b/src/proc/asset/track.cpp index efbb3aaf9..0eac2b10f 100644 --- a/src/proc/asset/track.cpp +++ b/src/proc/asset/track.cpp @@ -1,8 +1,8 @@ /* Track - structural asset holding the configuration of a track in the EDL - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/track.hpp b/src/proc/asset/track.hpp index def842250..6a0ab6c88 100644 --- a/src/proc/asset/track.hpp +++ b/src/proc/asset/track.hpp @@ -1,8 +1,8 @@ /* TRACK.hpp - structural asset holding the configuration of a track in the EDL - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/asset/unknown.cpp b/src/proc/asset/unknown.cpp index 57da632df..b47a60113 100644 --- a/src/proc/asset/unknown.cpp +++ b/src/proc/asset/unknown.cpp @@ -1,8 +1,8 @@ /* Unknown - placeholder for unknown or unavailable media source - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -48,19 +48,19 @@ namespace asset * try to access the "real" media it stands for. */ Media::PMedia - Unknown::getOrg() throw(cinelerra::error::Invalid) + Unknown::getOrg() throw(lumiera::error::Invalid) { UNIMPLEMENTED ("how to get at the original media from a »Unknown« placeholder"); if (1==0) - throw cinelerra::error::Invalid (str(format("Unable to locate original media " - "for ID=%s, filename=\"%s\".") - % string(this->ident) - % string(this->getFilename())) - ,CINELERRA_ERROR_ORIG_NOT_FOUND - ); + throw lumiera::error::Invalid (str(format("Unable to locate original media " + "for ID=%s, filename=\"%s\".") + % string(this->ident) + % string(this->getFilename())) + ,LUMIERA_ERROR_ORIG_NOT_FOUND + ); } - CINELERRA_ERROR_DEFINE (ORIG_NOT_FOUND, "Media refered by placeholder not found"); + LUMIERA_ERROR_DEFINE (ORIG_NOT_FOUND, "Media refered by placeholder not found"); diff --git a/src/proc/asset/unknown.hpp b/src/proc/asset/unknown.hpp index 8f11518b4..48b1faa09 100644 --- a/src/proc/asset/unknown.hpp +++ b/src/proc/asset/unknown.hpp @@ -1,8 +1,8 @@ /* UNKNOWN.hpp - placeholder for unknown or unavailable media source - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -32,7 +32,7 @@ namespace asset { - const cinelerra::Time DUMMY_TIME (25); ///< @todo solve konfig management + const lumiera::Time DUMMY_TIME (25); ///< @todo solve config management /** * Placeholder Asset for unknown or unavailable media source. @@ -47,11 +47,11 @@ namespace asset friend class MediaFactory; public: - virtual Media::PMedia getOrg() throw(cinelerra::error::Invalid); + virtual Media::PMedia getOrg() throw(lumiera::error::Invalid); }; - CINELERRA_ERROR_DECLARE (ORIG_NOT_FOUND); + LUMIERA_ERROR_DECLARE (ORIG_NOT_FOUND); diff --git a/src/proc/assetmanager.cpp b/src/proc/assetmanager.cpp index 1da043dbc..47b11f52e 100644 --- a/src/proc/assetmanager.cpp +++ b/src/proc/assetmanager.cpp @@ -1,8 +1,8 @@ /* AssetManager - Facade for the Asset subsystem - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -38,8 +38,8 @@ using boost::format; using boost::bind; using util::for_each; -using cinelerra::Singleton; -using cinelerra::Thread; +using lumiera::Singleton; +using lumiera::Thread; namespace asset @@ -49,23 +49,23 @@ namespace asset * AssetManager error responses, caused by querying * invalid Asset IDs from the internal DB. */ - class IDErr : public cinelerra::error::Invalid + class IDErr : public lumiera::error::Invalid { public: IDErr (const char* eID, format fmt) - : cinelerra::error::Invalid(fmt.str(),eID) {} + : lumiera::error::Invalid(fmt.str(),eID) {} }; // ------pre-defined-common-error-cases--------------- // - CINELERRA_ERROR_DEFINE (UNKNOWN_ASSET_ID, "non-registered Asset ID"); - CINELERRA_ERROR_DEFINE (WRONG_ASSET_KIND, "wrong Asset kind, unable to cast"); + LUMIERA_ERROR_DEFINE (UNKNOWN_ASSET_ID, "non-registered Asset ID"); + LUMIERA_ERROR_DEFINE (WRONG_ASSET_KIND, "wrong Asset kind, unable to cast"); class UnknownID : public IDErr { public: - UnknownID (ID aID) : IDErr (CINELERRA_ERROR_UNKNOWN_ASSET_ID, + UnknownID (ID aID) : IDErr (LUMIERA_ERROR_UNKNOWN_ASSET_ID, format("Query for Asset with ID=%d, which up to now " "hasn't been created or encountered.") % aID) {} }; @@ -73,7 +73,7 @@ namespace asset class WrongKind : public IDErr { public: - WrongKind (Asset::Ident idi) : IDErr (CINELERRA_ERROR_WRONG_ASSET_KIND, + WrongKind (Asset::Ident idi) : IDErr (LUMIERA_ERROR_WRONG_ASSET_KIND, format("Request for Asset(%s), specifying an Asset kind, " "that doesn't match the actual type (and can't be " "casted either).") % string(idi)) {} @@ -110,7 +110,7 @@ namespace asset template ID AssetManager::reg (KIND* obj, const Asset::Ident& idi) - throw(cinelerra::error::Invalid) + throw(lumiera::error::Invalid) { typedef shared_ptr PType; AssetManager& _aMang (AssetManager::instance()); @@ -133,7 +133,7 @@ namespace asset template shared_ptr AssetManager::getAsset (const ID& id) - throw(cinelerra::error::Invalid) + throw(lumiera::error::Invalid) { if (shared_ptr obj = registry.get (id)) return obj; @@ -246,11 +246,11 @@ namespace asset template ID AssetManager::reg (Asset* obj, const Asset::Ident& idi); - template shared_ptr AssetManager::getAsset (const ID& id) throw(cinelerra::error::Invalid); - template shared_ptr AssetManager::getAsset (const ID& id) throw(cinelerra::error::Invalid); - template shared_ptr AssetManager::getAsset (const ID& id) throw(cinelerra::error::Invalid); - template shared_ptr AssetManager::getAsset (const ID& id) throw(cinelerra::error::Invalid); - template shared_ptr AssetManager::getAsset (const ID& id) throw(cinelerra::error::Invalid); + template shared_ptr AssetManager::getAsset (const ID& id) throw(lumiera::error::Invalid); + template shared_ptr AssetManager::getAsset (const ID& id) throw(lumiera::error::Invalid); + template shared_ptr AssetManager::getAsset (const ID& id) throw(lumiera::error::Invalid); + template shared_ptr AssetManager::getAsset (const ID& id) throw(lumiera::error::Invalid); + template shared_ptr AssetManager::getAsset (const ID& id) throw(lumiera::error::Invalid); template shared_ptr AssetManager::wrap (const Asset& asset); template shared_ptr AssetManager::wrap (const Media& asset); diff --git a/src/proc/assetmanager.hpp b/src/proc/assetmanager.hpp index c035b38fa..610e0d1dc 100644 --- a/src/proc/assetmanager.hpp +++ b/src/proc/assetmanager.hpp @@ -1,8 +1,8 @@ /* ASSETMANAGER.hpp - Facade for the Asset subsystem - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -66,7 +66,7 @@ namespace asset public: - static cinelerra::Singleton instance; + static lumiera::Singleton instance; /** provide the unique ID for given Asset::Ident tuple */ static ID getID (const Asset::Ident&); @@ -77,7 +77,7 @@ namespace asset /** find and return corresponging object */ template - shared_ptr getAsset (const ID& id) throw(cinelerra::error::Invalid); + shared_ptr getAsset (const ID& id) throw(lumiera::error::Invalid); /** @return true if the given id is registered in the internal asset DB */ @@ -101,7 +101,7 @@ namespace asset */ template static ID reg (KIND* obj, const Asset::Ident& idi) - throw(cinelerra::error::Invalid); + throw(lumiera::error::Invalid); /** deleter function used by the Asset smart pointers to delete Asset objects */ static void destroy (Asset* aa) { delete aa; } @@ -110,13 +110,13 @@ namespace asset AssetManager (); - friend class cinelerra::singleton::StaticCreate; + friend class lumiera::singleton::StaticCreate; }; - CINELERRA_ERROR_DECLARE (UNKNOWN_ASSET_ID); ///< use of a non-registered Asset ID. - CINELERRA_ERROR_DECLARE (WRONG_ASSET_KIND); ///< Asset ID of wrong Asset kind, unable to cast. + LUMIERA_ERROR_DECLARE (UNKNOWN_ASSET_ID); ///< use of a non-registered Asset ID. + LUMIERA_ERROR_DECLARE (WRONG_ASSET_KIND); ///< Asset ID of wrong Asset kind, unable to cast. } // namespace asset diff --git a/src/proc/controllerfacade.cpp b/src/proc/controllerfacade.cpp index 52ce4889e..cff9e43d0 100644 --- a/src/proc/controllerfacade.cpp +++ b/src/proc/controllerfacade.cpp @@ -1,8 +1,8 @@ /* ControllerFacade - Facade and service access point for the Proc Layer Controller - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/controllerfacade.hpp b/src/proc/controllerfacade.hpp index 7fd07a8aa..faa213e9b 100644 --- a/src/proc/controllerfacade.hpp +++ b/src/proc/controllerfacade.hpp @@ -1,8 +1,8 @@ /* CONTROLLERFACADE.hpp - Facade and service access point for the Proc Layer Controller - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/aframe.cpp b/src/proc/engine/aframe.cpp index 067feaf5b..e8713897b 100644 --- a/src/proc/engine/aframe.cpp +++ b/src/proc/engine/aframe.cpp @@ -1,8 +1,8 @@ /* AFrame - buffer holding a Audio samples for the render process - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/aframe.hpp b/src/proc/engine/aframe.hpp index 234bce578..0d77e15ca 100644 --- a/src/proc/engine/aframe.hpp +++ b/src/proc/engine/aframe.hpp @@ -1,8 +1,8 @@ /* AFRAME.hpp - buffer holding a Audio samples for the render process - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/arender.cpp b/src/proc/engine/arender.cpp index e9fbc4897..ac7171998 100644 --- a/src/proc/engine/arender.cpp +++ b/src/proc/engine/arender.cpp @@ -1,8 +1,8 @@ /* ARender - Representation of a Audio Render process - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/arender.hpp b/src/proc/engine/arender.hpp index 98c929c7a..79c70c460 100644 --- a/src/proc/engine/arender.hpp +++ b/src/proc/engine/arender.hpp @@ -1,8 +1,8 @@ /* ARENDER.hpp - Representation of a Audio Render process - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/codecadapter.cpp b/src/proc/engine/codecadapter.cpp index 28ce9317e..b65694679 100644 --- a/src/proc/engine/codecadapter.cpp +++ b/src/proc/engine/codecadapter.cpp @@ -1,8 +1,8 @@ /* CodecAdapter - Processing Node for (de)coding media data - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/codecadapter.hpp b/src/proc/engine/codecadapter.hpp index e6d1eec02..724763eaa 100644 --- a/src/proc/engine/codecadapter.hpp +++ b/src/proc/engine/codecadapter.hpp @@ -1,8 +1,8 @@ /* CODECADAPTER.hpp - Processing Node for (de)coding media data - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -38,7 +38,7 @@ namespace engine * process thus is integrated into the framework * of the Renderengine, while the actual implementation * can be delegated to an external library accessed - * through Cinelerra's datat backend. + * through Lumiera's data backend. */ class CodecAdapter : public Trafo {}; diff --git a/src/proc/engine/exitnode.cpp b/src/proc/engine/exitnode.cpp index 7f1539af2..8c26b7cd9 100644 --- a/src/proc/engine/exitnode.cpp +++ b/src/proc/engine/exitnode.cpp @@ -1,8 +1,8 @@ /* ExitNode - special Processing Node providing "pullable" output - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/exitnode.hpp b/src/proc/engine/exitnode.hpp index e0b7ffc2e..1cb6e51c2 100644 --- a/src/proc/engine/exitnode.hpp +++ b/src/proc/engine/exitnode.hpp @@ -1,8 +1,8 @@ /* EXITNODE.hpp - special Processing Node providing "pullable" output - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/glbuf.cpp b/src/proc/engine/glbuf.cpp index d383174ae..6970a3114 100644 --- a/src/proc/engine/glbuf.cpp +++ b/src/proc/engine/glbuf.cpp @@ -1,8 +1,8 @@ /* GLBuf - a buffer and render process holding a Video frame for OpenGL rendering - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/glbuf.hpp b/src/proc/engine/glbuf.hpp index 59735595e..8e8ee2ea5 100644 --- a/src/proc/engine/glbuf.hpp +++ b/src/proc/engine/glbuf.hpp @@ -1,8 +1,8 @@ /* GLBUF.hpp - a buffer and render process holding a Video frame for OpenGL rendering - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/glpipe.cpp b/src/proc/engine/glpipe.cpp index 41139b7cd..9d4d28b48 100644 --- a/src/proc/engine/glpipe.cpp +++ b/src/proc/engine/glpipe.cpp @@ -1,8 +1,8 @@ /* GLPipe - specialized connection element for handling OpenGL implementation details - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/glpipe.hpp b/src/proc/engine/glpipe.hpp index b0c2c66f0..39a98a7ab 100644 --- a/src/proc/engine/glpipe.hpp +++ b/src/proc/engine/glpipe.hpp @@ -1,8 +1,8 @@ /* GLPIPE.hpp - specialized connection element for handling OpenGL implementation details - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/glrender.cpp b/src/proc/engine/glrender.cpp index a15a369e7..32420201b 100644 --- a/src/proc/engine/glrender.cpp +++ b/src/proc/engine/glrender.cpp @@ -1,8 +1,8 @@ /* GLRender - Representation of a OpenGL accellerated Video render process - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/glrender.hpp b/src/proc/engine/glrender.hpp index 99af3fb5a..e9c73c3a3 100644 --- a/src/proc/engine/glrender.hpp +++ b/src/proc/engine/glrender.hpp @@ -1,8 +1,8 @@ /* GLRENDER.hpp - Representation of a OpenGL accellerated Video render process - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/hub.cpp b/src/proc/engine/hub.cpp index 30a4b62fa..394d24197 100644 --- a/src/proc/engine/hub.cpp +++ b/src/proc/engine/hub.cpp @@ -1,8 +1,8 @@ /* Hub - special ProcNode used to build data distributing connections - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/hub.hpp b/src/proc/engine/hub.hpp index 161e8bfd8..b6ec69fcb 100644 --- a/src/proc/engine/hub.hpp +++ b/src/proc/engine/hub.hpp @@ -1,8 +1,8 @@ /* HUB.hpp - special ProcNode used to build data distributing connections - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/link.cpp b/src/proc/engine/link.cpp index 089ca35c5..aac01ed41 100644 --- a/src/proc/engine/link.cpp +++ b/src/proc/engine/link.cpp @@ -1,8 +1,8 @@ /* Link - forwarding, adapting or connecting ProcNode - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/link.hpp b/src/proc/engine/link.hpp index 78accf220..ad2f3a625 100644 --- a/src/proc/engine/link.hpp +++ b/src/proc/engine/link.hpp @@ -1,8 +1,8 @@ /* LINK.hpp - forwarding, adapting or connecting ProcNode - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/mask.cpp b/src/proc/engine/mask.cpp index 8f0b61156..beecb86d3 100644 --- a/src/proc/engine/mask.cpp +++ b/src/proc/engine/mask.cpp @@ -1,8 +1,8 @@ /* Mask - Video ProcNode for masking regions of the image (automatable) - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/mask.hpp b/src/proc/engine/mask.hpp index 2bbcedd14..ccbac5bcf 100644 --- a/src/proc/engine/mask.hpp +++ b/src/proc/engine/mask.hpp @@ -1,8 +1,8 @@ /* MASK.hpp - Video ProcNode for masking regions of the image (automatable) - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/pluginadapter.cpp b/src/proc/engine/pluginadapter.cpp index 9d9f9c621..fb57ae58a 100644 --- a/src/proc/engine/pluginadapter.cpp +++ b/src/proc/engine/pluginadapter.cpp @@ -1,8 +1,8 @@ /* PluginAdapter - Adapter for integrating various Effect processors in the render pipeline - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/pluginadapter.hpp b/src/proc/engine/pluginadapter.hpp index cfbd0ac78..b771f1fbc 100644 --- a/src/proc/engine/pluginadapter.hpp +++ b/src/proc/engine/pluginadapter.hpp @@ -1,8 +1,8 @@ /* PLUGINADAPTER.hpp - Adapter for integrating various Effect processors in the render pipeline - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -35,7 +35,7 @@ namespace engine /** * Adapter used to integrate an effects processor in the render pipeline. * Effects processors are typically defined in a separate library and - * will be loaded at runtime using Cinelerra's plugin interface. + * will be loaded at runtime using Lumiera's plugin interface. */ class PluginAdapter : public Trafo { diff --git a/src/proc/engine/processor.cpp b/src/proc/engine/processor.cpp index 4db2f793e..c8a228845 100644 --- a/src/proc/engine/processor.cpp +++ b/src/proc/engine/processor.cpp @@ -1,8 +1,8 @@ /* Processor - a single render pipeline for one segment of the timeline - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/processor.hpp b/src/proc/engine/processor.hpp index 2856fec3d..6b7317886 100644 --- a/src/proc/engine/processor.hpp +++ b/src/proc/engine/processor.hpp @@ -1,8 +1,8 @@ /* PROCESSOR.hpp - a single render pipeline for one segment of the timeline - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -24,7 +24,7 @@ #ifndef ENGINE_PROCESSOR_H #define ENGINE_PROCESSOR_H -#include "cinelerra.h" +#include "lumiera.h" #include "proc/stateproxy.hpp" @@ -40,10 +40,10 @@ namespace engine ExitNode * output; /** begin of the timerange covered by this processor */ - cinelerra::Time start; + lumiera::Time start; /**end (exclusive) of the timerange */ - cinelerra::Time end; + lumiera::Time end; }; diff --git a/src/proc/engine/procnode.cpp b/src/proc/engine/procnode.cpp index 0e7af64ca..48e33c498 100644 --- a/src/proc/engine/procnode.cpp +++ b/src/proc/engine/procnode.cpp @@ -1,8 +1,8 @@ /* ProcNode - Key abstraction of the Render Engine: a Processing Node - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/procnode.hpp b/src/proc/engine/procnode.hpp index 9fe4a053d..ae210f96b 100644 --- a/src/proc/engine/procnode.hpp +++ b/src/proc/engine/procnode.hpp @@ -1,8 +1,8 @@ /* PROCNODE.hpp - Key abstraction of the Render Engine: a Processing Node - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/projector.cpp b/src/proc/engine/projector.cpp index 38d44631d..14fcecabb 100644 --- a/src/proc/engine/projector.cpp +++ b/src/proc/engine/projector.cpp @@ -1,8 +1,8 @@ /* Projector - video ProcNode for scaling and translating image data - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/projector.hpp b/src/proc/engine/projector.hpp index fa60a30d8..0908eec38 100644 --- a/src/proc/engine/projector.hpp +++ b/src/proc/engine/projector.hpp @@ -1,8 +1,8 @@ /* PROJECTOR.hpp - video ProcNode for scaling and translating image data - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/renderengine.cpp b/src/proc/engine/renderengine.cpp index 23afb432a..daa7084ca 100644 --- a/src/proc/engine/renderengine.cpp +++ b/src/proc/engine/renderengine.cpp @@ -1,8 +1,8 @@ /* RenderEngine - a complete network of processing nodes usable for rendering - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/renderengine.hpp b/src/proc/engine/renderengine.hpp index 10a6e80e3..121d0618c 100644 --- a/src/proc/engine/renderengine.hpp +++ b/src/proc/engine/renderengine.hpp @@ -1,8 +1,8 @@ /* RENDERENGINE.hpp - a complete network of processing nodes usable for rendering - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/source.cpp b/src/proc/engine/source.cpp index dec53e998..73da9add5 100644 --- a/src/proc/engine/source.cpp +++ b/src/proc/engine/source.cpp @@ -1,8 +1,8 @@ /* Source - Representation of a Media source - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/source.hpp b/src/proc/engine/source.hpp index e8a6063cc..37af97841 100644 --- a/src/proc/engine/source.hpp +++ b/src/proc/engine/source.hpp @@ -1,8 +1,8 @@ /* SOURCE.hpp - Representation of a Media source - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/trafo.cpp b/src/proc/engine/trafo.cpp index ab96fae91..28c3db772 100644 --- a/src/proc/engine/trafo.cpp +++ b/src/proc/engine/trafo.cpp @@ -1,8 +1,8 @@ /* Trafo - transforming processing Node - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/trafo.hpp b/src/proc/engine/trafo.hpp index 7367415ea..8d2155661 100644 --- a/src/proc/engine/trafo.hpp +++ b/src/proc/engine/trafo.hpp @@ -1,8 +1,8 @@ /* TRAFO.hpp - transforming processing Node - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/vframe.cpp b/src/proc/engine/vframe.cpp index d96b1a07c..180faca70 100644 --- a/src/proc/engine/vframe.cpp +++ b/src/proc/engine/vframe.cpp @@ -1,8 +1,8 @@ /* VFrame - a buffer holding a Video frame for the render process - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/vframe.hpp b/src/proc/engine/vframe.hpp index ebd400dfc..6b1e8153b 100644 --- a/src/proc/engine/vframe.hpp +++ b/src/proc/engine/vframe.hpp @@ -1,8 +1,8 @@ /* VFRAME.hpp - a buffer holding a Video frame for the render process - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/vrender.cpp b/src/proc/engine/vrender.cpp index 5b13999d0..2bed41099 100644 --- a/src/proc/engine/vrender.cpp +++ b/src/proc/engine/vrender.cpp @@ -1,8 +1,8 @@ /* VRender - Representation of a Video render process - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/engine/vrender.hpp b/src/proc/engine/vrender.hpp index f47e40ca9..c6a34bda2 100644 --- a/src/proc/engine/vrender.hpp +++ b/src/proc/engine/vrender.hpp @@ -1,8 +1,8 @@ /* VRENDER.hpp - Representation of a Video render process - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/frame.cpp b/src/proc/frame.cpp index 8cc62841a..46ad06950 100644 --- a/src/proc/frame.cpp +++ b/src/proc/frame.cpp @@ -1,8 +1,8 @@ /* Frame - Key Abstraction: render process and buffer holding frame data. - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/frame.hpp b/src/proc/frame.hpp index 5072ca00b..239987e97 100644 --- a/src/proc/frame.hpp +++ b/src/proc/frame.hpp @@ -1,8 +1,8 @@ /* FRAME.hpp - Key Abstraction: render process and buffer holding frame data. - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/builder/assembler.cpp b/src/proc/mobject/builder/assembler.cpp index c20850012..8542860f3 100644 --- a/src/proc/mobject/builder/assembler.cpp +++ b/src/proc/mobject/builder/assembler.cpp @@ -1,8 +1,8 @@ /* Assembler - building facility (implementation of the build process) - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/builder/assembler.hpp b/src/proc/mobject/builder/assembler.hpp index 7f3a70a14..f0274f171 100644 --- a/src/proc/mobject/builder/assembler.hpp +++ b/src/proc/mobject/builder/assembler.hpp @@ -1,8 +1,8 @@ /* ASSEMBLER.hpp - building facility (implementation of the build process) - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/builder/buildertool.hpp b/src/proc/mobject/builder/buildertool.hpp index 61bb7913c..0985567d1 100644 --- a/src/proc/mobject/builder/buildertool.hpp +++ b/src/proc/mobject/builder/buildertool.hpp @@ -1,8 +1,8 @@ /* BUILDERTOOL.hpp - Interface, (visiting) tool for processing MObjects - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -59,7 +59,7 @@ namespace mobject * an instantiation of the "Applicable" template parametrized with all * concrete Buildable classes, for which it wants calls to be dispatched. */ - typedef cinelerra::visitor::Tool BuilderTool; + typedef lumiera::visitor::Tool BuilderTool; template @@ -67,11 +67,11 @@ namespace mobject class TYPELIST // list of all concrete Buildables to be treated > class Applicable - : public cinelerra::visitor::Applicable + : public lumiera::visitor::Applicable { } ; - using cinelerra::typelist::Types; // convienience for the users of "Applicable" + using lumiera::typelist::Types; // convienience for the users of "Applicable" } // namespace mobject::builder @@ -80,7 +80,7 @@ namespace mobject /** * Marker Interface for classes Visitable by Builder tools. */ - class Buildable : public cinelerra::visitor::Visitable + class Buildable : public lumiera::visitor::Visitable { }; } // namespace mobject diff --git a/src/proc/mobject/builder/conmanager.cpp b/src/proc/mobject/builder/conmanager.cpp index 15b6def9c..e32ecf92b 100644 --- a/src/proc/mobject/builder/conmanager.cpp +++ b/src/proc/mobject/builder/conmanager.cpp @@ -1,8 +1,8 @@ /* ConManager - manages the creation of additional ProcNode connections for the Renderengine - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/builder/conmanager.hpp b/src/proc/mobject/builder/conmanager.hpp index d59e53d48..3cd75cc6d 100644 --- a/src/proc/mobject/builder/conmanager.hpp +++ b/src/proc/mobject/builder/conmanager.hpp @@ -1,8 +1,8 @@ /* CONMANAGER.hpp - manages the creation of additional ProcNode connections for the Renderengine - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/builder/nodecreatertool.cpp b/src/proc/mobject/builder/nodecreatertool.cpp index d4e0d78dd..89a35fa46 100644 --- a/src/proc/mobject/builder/nodecreatertool.cpp +++ b/src/proc/mobject/builder/nodecreatertool.cpp @@ -1,8 +1,8 @@ /* NodeCreaterTool - central Tool implementing the Renderengine building - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/builder/nodecreatertool.hpp b/src/proc/mobject/builder/nodecreatertool.hpp index 6eebc98c4..26a033d26 100644 --- a/src/proc/mobject/builder/nodecreatertool.hpp +++ b/src/proc/mobject/builder/nodecreatertool.hpp @@ -1,8 +1,8 @@ /* NODECREATERTOOL.hpp - central Tool implementing the Renderengine building - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/builder/segmentationtool.cpp b/src/proc/mobject/builder/segmentationtool.cpp index a98a63f83..6f07e7d4f 100644 --- a/src/proc/mobject/builder/segmentationtool.cpp +++ b/src/proc/mobject/builder/segmentationtool.cpp @@ -1,8 +1,8 @@ /* SegmentationTool - Tool for creating a partitioning of the current timeline - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/builder/segmentationtool.hpp b/src/proc/mobject/builder/segmentationtool.hpp index f913836ca..aa09d80d3 100644 --- a/src/proc/mobject/builder/segmentationtool.hpp +++ b/src/proc/mobject/builder/segmentationtool.hpp @@ -1,8 +1,8 @@ /* SEGMENTATIONTOOL.hpp - Tool for creating a partitioning of the current timeline - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/builder/toolfactory.cpp b/src/proc/mobject/builder/toolfactory.cpp index 456ee568b..8e1b14631 100644 --- a/src/proc/mobject/builder/toolfactory.cpp +++ b/src/proc/mobject/builder/toolfactory.cpp @@ -1,8 +1,8 @@ /* ToolFactory - supply of Tool implementations for the Builder - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/builder/toolfactory.hpp b/src/proc/mobject/builder/toolfactory.hpp index d39b0e7c7..2061b4fd2 100644 --- a/src/proc/mobject/builder/toolfactory.hpp +++ b/src/proc/mobject/builder/toolfactory.hpp @@ -1,8 +1,8 @@ /* TOOLFACTORY.hpp - supply of Tool implementations for the Builder - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/builderfacade.cpp b/src/proc/mobject/builderfacade.cpp index 8ebed9d08..149862f98 100644 --- a/src/proc/mobject/builderfacade.cpp +++ b/src/proc/mobject/builderfacade.cpp @@ -1,8 +1,8 @@ /* BuilderFacade - Facade and service access point for the Builder Subsystem - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/builderfacade.hpp b/src/proc/mobject/builderfacade.hpp index c0b8398e1..59023853c 100644 --- a/src/proc/mobject/builderfacade.hpp +++ b/src/proc/mobject/builderfacade.hpp @@ -1,8 +1,8 @@ /* BUILDERFACADE.hpp - Facade and service access point for the Builder Subsystem - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/controller/pathmanager.cpp b/src/proc/mobject/controller/pathmanager.cpp index b197784a6..bf3c359ab 100644 --- a/src/proc/mobject/controller/pathmanager.cpp +++ b/src/proc/mobject/controller/pathmanager.cpp @@ -1,8 +1,8 @@ /* PathManager - Manager for deciding the actual render strategy - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/controller/pathmanager.hpp b/src/proc/mobject/controller/pathmanager.hpp index fecc36021..a29cd2f94 100644 --- a/src/proc/mobject/controller/pathmanager.hpp +++ b/src/proc/mobject/controller/pathmanager.hpp @@ -1,8 +1,8 @@ /* PATHMANAGER.hpp - Manager for deciding the actual render strategy - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/controller/renderstate.cpp b/src/proc/mobject/controller/renderstate.cpp index f1db1dfbb..98ca2ccd1 100644 --- a/src/proc/mobject/controller/renderstate.cpp +++ b/src/proc/mobject/controller/renderstate.cpp @@ -1,8 +1,8 @@ /* RenderState - renderengine state manager - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/controller/renderstate.hpp b/src/proc/mobject/controller/renderstate.hpp index c73b3c647..c547772ea 100644 --- a/src/proc/mobject/controller/renderstate.hpp +++ b/src/proc/mobject/controller/renderstate.hpp @@ -1,8 +1,8 @@ /* RENDERSTATE.hpp - renderengine state manager - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/explicitplacement.hpp b/src/proc/mobject/explicitplacement.hpp index 5f70047b9..388a0ac82 100644 --- a/src/proc/mobject/explicitplacement.hpp +++ b/src/proc/mobject/explicitplacement.hpp @@ -1,8 +1,8 @@ /* EXPLICITPLACEMENT.hpp - special Placement yielding an absolute location (Time,Track) for a MObject - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/interpolator.cpp b/src/proc/mobject/interpolator.cpp index 3767770ca..8ceb9ad86 100644 --- a/src/proc/mobject/interpolator.cpp +++ b/src/proc/mobject/interpolator.cpp @@ -1,8 +1,8 @@ /* Interpolator - denotes a facility to get (continuously interpolated) parameter values - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/interpolator.hpp b/src/proc/mobject/interpolator.hpp index 7ff3e371a..843cd52bc 100644 --- a/src/proc/mobject/interpolator.hpp +++ b/src/proc/mobject/interpolator.hpp @@ -1,8 +1,8 @@ /* INTERPOLATOR.hpp - denotes a facility to get (continuously interpolated) parameter values - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/mobject.cpp b/src/proc/mobject/mobject.cpp index e8692abf7..cd6c0011b 100644 --- a/src/proc/mobject/mobject.cpp +++ b/src/proc/mobject/mobject.cpp @@ -1,8 +1,8 @@ /* MObject - Key Abstraction: A Media Object in the Session - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/mobject.hpp b/src/proc/mobject/mobject.hpp index 634322470..3d0222a3d 100644 --- a/src/proc/mobject/mobject.hpp +++ b/src/proc/mobject/mobject.hpp @@ -1,8 +1,8 @@ /* MOBJECT.hpp - Key Abstraction: A Media Object in the Session - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -29,7 +29,7 @@ #include #include -#include "cinelerra.h" +#include "lumiera.h" #include "proc/mobject/builder/buildertool.hpp" #include "proc/mobject/placement.hpp" #include "proc/asset.hpp" // TODO finally not needed? @@ -55,13 +55,13 @@ namespace mobject /** * MObject is the interface class for all "Media Objects". * All the contents and elements that can be placed and - * manipulated and finally rendered within Cinelerra's EDL + * manipulated and finally rendered within Lumiera's EDL * are MObjects. */ class MObject : public Buildable { protected: - typedef cinelerra::Time Time; + typedef lumiera::Time Time; // TODO: how to represent time intervals best? Time length; diff --git a/src/proc/mobject/parameter.cpp b/src/proc/mobject/parameter.cpp index b603a2055..280cbc69b 100644 --- a/src/proc/mobject/parameter.cpp +++ b/src/proc/mobject/parameter.cpp @@ -1,8 +1,8 @@ /* Parameter - representation of an automatable effect/plugin parameter - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/parameter.hpp b/src/proc/mobject/parameter.hpp index da75bb48e..00154dff5 100644 --- a/src/proc/mobject/parameter.hpp +++ b/src/proc/mobject/parameter.hpp @@ -1,8 +1,8 @@ /* PARAMETER.hpp - representation of an automatable effect/plugin parameter - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/paramprovider.cpp b/src/proc/mobject/paramprovider.cpp index e9a6b26ce..8b5da785a 100644 --- a/src/proc/mobject/paramprovider.cpp +++ b/src/proc/mobject/paramprovider.cpp @@ -1,8 +1,8 @@ /* ParamProvider - interface denoting a source for actual Parameter values - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/paramprovider.hpp b/src/proc/mobject/paramprovider.hpp index 9057167be..fdcaff2a8 100644 --- a/src/proc/mobject/paramprovider.hpp +++ b/src/proc/mobject/paramprovider.hpp @@ -1,8 +1,8 @@ /* PARAMPROVIDER.hpp - interface denoting a source for actual Parameter values - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/placement.cpp b/src/proc/mobject/placement.cpp index 7929a7a6f..452528627 100644 --- a/src/proc/mobject/placement.cpp +++ b/src/proc/mobject/placement.cpp @@ -1,8 +1,8 @@ /* Placement - Key Abstraction: a way to place and locate a Media Object - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/placement.hpp b/src/proc/mobject/placement.hpp index 7b326f23d..c5d56169d 100644 --- a/src/proc/mobject/placement.hpp +++ b/src/proc/mobject/placement.hpp @@ -1,8 +1,8 @@ /* PLACEMENT.hpp - Key Abstraction: a way to place and locate a Media Object - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -85,7 +85,7 @@ namespace mobject class Placement : protected shared_ptr { protected: - typedef cinelerra::Time Time; + typedef lumiera::Time Time; typedef asset::shared_ptr Pipe; diff --git a/src/proc/mobject/session.hpp b/src/proc/mobject/session.hpp index d8b89d16c..7b9dfd4ef 100644 --- a/src/proc/mobject/session.hpp +++ b/src/proc/mobject/session.hpp @@ -1,8 +1,8 @@ /* SESSION.hpp - holds the complete session to be edited by the user - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -58,7 +58,7 @@ namespace mobject /** * The (current) Session holds all the user * visible content to be edited and manipulated - * within the Cinelerra Application. From a users + * within the Lumiera Application. From a users * perspective, it is a collection of Media Objects * (--> MObject) placed (--> Placement) onto virtual * Tracks. @@ -142,7 +142,7 @@ namespace mobject }; - CINELERRA_ERROR_DECLARE (CREATE_SESSION); ///< unable to create basic session. + LUMIERA_ERROR_DECLARE (CREATE_SESSION); ///< unable to create basic session. } // namespace mobject::session diff --git a/src/proc/mobject/session/abstractmo.cpp b/src/proc/mobject/session/abstractmo.cpp index 8316ae5d9..e484eee6e 100644 --- a/src/proc/mobject/session/abstractmo.cpp +++ b/src/proc/mobject/session/abstractmo.cpp @@ -1,8 +1,8 @@ /* AbstractMO - abstract base class for all Media Objects - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/abstractmo.hpp b/src/proc/mobject/session/abstractmo.hpp index 47aaff34f..45942986d 100644 --- a/src/proc/mobject/session/abstractmo.hpp +++ b/src/proc/mobject/session/abstractmo.hpp @@ -1,8 +1,8 @@ /* ABSTRACTMO.hpp - abstract base class for all Media Objects - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -27,6 +27,7 @@ #include "proc/mobject/mobject.hpp" + namespace mobject { namespace session diff --git a/src/proc/mobject/session/allocation.cpp b/src/proc/mobject/session/allocation.cpp index 0b070a9be..ae23185b8 100644 --- a/src/proc/mobject/session/allocation.cpp +++ b/src/proc/mobject/session/allocation.cpp @@ -1,8 +1,8 @@ /* Allocation - objective to place a MObject in a specific way - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/allocation.hpp b/src/proc/mobject/session/allocation.hpp index 95a5b9a01..e668fb469 100644 --- a/src/proc/mobject/session/allocation.hpp +++ b/src/proc/mobject/session/allocation.hpp @@ -1,8 +1,8 @@ /* ALLOCATION.hpp - objective to place a MObject in a specific way - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/auto.cpp b/src/proc/mobject/session/auto.cpp index 6e046260b..a8ecf4c38 100644 --- a/src/proc/mobject/session/auto.cpp +++ b/src/proc/mobject/session/auto.cpp @@ -1,8 +1,8 @@ /* Auto - Media Object holding automation data - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/auto.hpp b/src/proc/mobject/session/auto.hpp index d0b54cad6..0fcf831aa 100644 --- a/src/proc/mobject/session/auto.hpp +++ b/src/proc/mobject/session/auto.hpp @@ -1,8 +1,8 @@ /* AUTO.hpp - Media Object holding automation data - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/clip.cpp b/src/proc/mobject/session/clip.cpp index 38610e00f..ce0e87a9f 100644 --- a/src/proc/mobject/session/clip.cpp +++ b/src/proc/mobject/session/clip.cpp @@ -1,8 +1,8 @@ /* Clip - a Media Clip - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/clip.hpp b/src/proc/mobject/session/clip.hpp index 2f7eccb06..75cac3ef7 100644 --- a/src/proc/mobject/session/clip.hpp +++ b/src/proc/mobject/session/clip.hpp @@ -1,8 +1,8 @@ /* CLIP.hpp - a Media Clip - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/compoundclip.cpp b/src/proc/mobject/session/compoundclip.cpp index 68694e136..caa8e83bd 100644 --- a/src/proc/mobject/session/compoundclip.cpp +++ b/src/proc/mobject/session/compoundclip.cpp @@ -1,8 +1,8 @@ /* CompoundClip - compound of several clips (multichannel) - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/compoundclip.hpp b/src/proc/mobject/session/compoundclip.hpp index 332396a48..e2dfd9fd9 100644 --- a/src/proc/mobject/session/compoundclip.hpp +++ b/src/proc/mobject/session/compoundclip.hpp @@ -1,8 +1,8 @@ /* COMPOUNDCLIP.hpp - compound of several clips (multichannel) - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/constraint.cpp b/src/proc/mobject/session/constraint.cpp index ecf074ae6..8a767ed45 100644 --- a/src/proc/mobject/session/constraint.cpp +++ b/src/proc/mobject/session/constraint.cpp @@ -1,8 +1,8 @@ /* Constraint - LocatingPin representing an mandatory directive - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/constraint.hpp b/src/proc/mobject/session/constraint.hpp index bfaf45775..191f4b515 100644 --- a/src/proc/mobject/session/constraint.hpp +++ b/src/proc/mobject/session/constraint.hpp @@ -1,8 +1,8 @@ /* CONSTRAINT.hpp - LocatingPin representing an mandatory directive - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/defsmanager.cpp b/src/proc/mobject/session/defsmanager.cpp index 1a0107ff5..9188df748 100644 --- a/src/proc/mobject/session/defsmanager.cpp +++ b/src/proc/mobject/session/defsmanager.cpp @@ -1,8 +1,8 @@ /* DefsManager - access to preconfigured default objects and definitions - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -31,9 +31,9 @@ using boost::format; using asset::Query; -using cinelerra::ConfigRules; -using cinelerra::query::QueryHandler; -using cinelerra::query::CINELERRA_ERROR_CAPABILITY_QUERY; +using lumiera::ConfigRules; +using lumiera::query::QueryHandler; +using lumiera::query::LUMIERA_ERROR_CAPABILITY_QUERY; namespace mobject @@ -109,9 +109,9 @@ namespace mobject res = create (capabilities); // not yet known as default, create new if (!res) - throw cinelerra::error::Config ( str(format("The following Query could not be resolved: %s.") - % capabilities.asKey()) - , CINELERRA_ERROR_CAPABILITY_QUERY ); + throw lumiera::error::Config ( str(format("The following Query could not be resolved: %s.") + % capabilities.asKey()) + , LUMIERA_ERROR_CAPABILITY_QUERY ); else return res; } diff --git a/src/proc/mobject/session/defsmanager.hpp b/src/proc/mobject/session/defsmanager.hpp index 3b01f6e6c..da98fe6c1 100644 --- a/src/proc/mobject/session/defsmanager.hpp +++ b/src/proc/mobject/session/defsmanager.hpp @@ -1,8 +1,8 @@ /* DEFSMANAGER.hpp - access to preconfigured default objects and definitions - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -62,13 +62,13 @@ namespace mobject * is considered \e misconfiguration. */ template - shared_ptr operator() (const cinelerra::Query&); + shared_ptr operator() (const lumiera::Query&); /** search through the registered defaults, never create anything. * @return object fulfilling the query, \c empty ptr if not found. */ template - shared_ptr search (const cinelerra::Query&); + shared_ptr search (const lumiera::Query&); /** retrieve an object fulfilling the query and register it as default. * The resolution is delegated to the ConfigQuery system (which may cause @@ -76,7 +76,7 @@ namespace mobject * @return object fulfilling the query, \c empty ptr if no solution. */ template - shared_ptr create (const cinelerra::Query&); + shared_ptr create (const lumiera::Query&); /** register the given object as default, after ensuring it fulfills the * query. The latter may cause some properties of the object to be set, @@ -85,7 +85,7 @@ namespace mobject * @note only a weak ref to the object is stored */ template - bool define (const shared_ptr&, const cinelerra::Query&); + bool define (const shared_ptr&, 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 @@ -100,7 +100,7 @@ namespace mobject // < class TAR, ///< the target to query for // template class SMP ///< smart pointer class to wrap the result // > -// SMP operator() (const cinelerra::Query&); +// SMP operator() (const lumiera::Query&); }; diff --git a/src/proc/mobject/session/defsregistry.cpp b/src/proc/mobject/session/defsregistry.cpp index c1d370bde..4eea8df6c 100644 --- a/src/proc/mobject/session/defsregistry.cpp +++ b/src/proc/mobject/session/defsregistry.cpp @@ -1,7 +1,7 @@ /* DefsManager - implementation of the default object store - Copyright (C) CinelerraCV + Copyright (C) Lumiera.org 2008, Hermann Vosseler This program is free software; you can redistribute it and/or @@ -36,7 +36,7 @@ namespace mobject { /** @todo */ - DefsRegistry::DefsRegistry () throw() + DefsRegistry::DefsRegistry () { UNIMPLEMENTED ("initialize store for default objects"); } diff --git a/src/proc/mobject/session/defsregistry.hpp b/src/proc/mobject/session/defsregistry.hpp index 33b57b634..e6f102738 100644 --- a/src/proc/mobject/session/defsregistry.hpp +++ b/src/proc/mobject/session/defsregistry.hpp @@ -1,7 +1,7 @@ /* DEFSREGISTRY.hpp - implementation of the default object store - Copyright (C) CinelerraCV + Copyright (C) Lumiera.org 2008, Hermann Vosseler This program is free software; you can redistribute it and/or @@ -53,7 +53,7 @@ namespace mobject protected: DefsRegistry (); - friend class cinelerra::singleton::StaticCreate; + friend class lumiera::singleton::StaticCreate; public: diff --git a/src/proc/mobject/session/edl.cpp b/src/proc/mobject/session/edl.cpp index e95b62424..dd312c479 100644 --- a/src/proc/mobject/session/edl.cpp +++ b/src/proc/mobject/session/edl.cpp @@ -1,8 +1,8 @@ /* EDL - the (high level) Edit Decision List within the current Session - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/edl.hpp b/src/proc/mobject/session/edl.hpp index fc48f0a1a..d2cee9206 100644 --- a/src/proc/mobject/session/edl.hpp +++ b/src/proc/mobject/session/edl.hpp @@ -1,8 +1,8 @@ /* EDL.hpp - the (high level) Edit Decision List within the current Session - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/effect.cpp b/src/proc/mobject/session/effect.cpp index 8a58ec7a6..e83f03119 100644 --- a/src/proc/mobject/session/effect.cpp +++ b/src/proc/mobject/session/effect.cpp @@ -1,8 +1,8 @@ /* Effect - EDL representation of a pluggable and automatable effect. - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/effect.hpp b/src/proc/mobject/session/effect.hpp index 5255e718b..5831098d4 100644 --- a/src/proc/mobject/session/effect.hpp +++ b/src/proc/mobject/session/effect.hpp @@ -1,8 +1,8 @@ /* EFFECT.hpp - EDL representation of a pluggable and automatable effect. - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/fixedlocation.cpp b/src/proc/mobject/session/fixedlocation.cpp index 150702bb0..238b8c011 100644 --- a/src/proc/mobject/session/fixedlocation.cpp +++ b/src/proc/mobject/session/fixedlocation.cpp @@ -1,8 +1,8 @@ /* FixedLocation - directly positioning a MObject to a fixed location - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/fixedlocation.hpp b/src/proc/mobject/session/fixedlocation.hpp index 8d4282443..c3b176d2e 100644 --- a/src/proc/mobject/session/fixedlocation.hpp +++ b/src/proc/mobject/session/fixedlocation.hpp @@ -1,8 +1,8 @@ /* FIXEDLOCATION.hpp - directly positioning a MObject to a fixed location - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/fixture.cpp b/src/proc/mobject/session/fixture.cpp index deb2a6db1..bdad3f807 100644 --- a/src/proc/mobject/session/fixture.cpp +++ b/src/proc/mobject/session/fixture.cpp @@ -1,8 +1,8 @@ /* Fixture - the (low level) representation of the EDL with explicit placement data - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/fixture.hpp b/src/proc/mobject/session/fixture.hpp index f6549c185..ef03c6249 100644 --- a/src/proc/mobject/session/fixture.hpp +++ b/src/proc/mobject/session/fixture.hpp @@ -1,8 +1,8 @@ /* FIXTURE.hpp - the (low level) representation of the EDL with explicit placement data - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/label.cpp b/src/proc/mobject/session/label.cpp index e1f81728a..c5d85907d 100644 --- a/src/proc/mobject/session/label.cpp +++ b/src/proc/mobject/session/label.cpp @@ -1,8 +1,8 @@ /* Label - a user visible Marker or Tag - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/label.hpp b/src/proc/mobject/session/label.hpp index 54080f0f3..b968baa68 100644 --- a/src/proc/mobject/session/label.hpp +++ b/src/proc/mobject/session/label.hpp @@ -1,8 +1,8 @@ /* LABEL.hpp - a user visible Marker or Tag - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/locatingpin.cpp b/src/proc/mobject/session/locatingpin.cpp index 5da70e497..17bb34bbe 100644 --- a/src/proc/mobject/session/locatingpin.cpp +++ b/src/proc/mobject/session/locatingpin.cpp @@ -1,8 +1,8 @@ /* LocatingPin - Chaining and constraining the Placement of a Media Object - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/locatingpin.hpp b/src/proc/mobject/session/locatingpin.hpp index 81b3fa92f..009778eb3 100644 --- a/src/proc/mobject/session/locatingpin.hpp +++ b/src/proc/mobject/session/locatingpin.hpp @@ -1,8 +1,8 @@ /* LOCATINGPIN.hpp - Chaining and constraining the Placement of a Media Object - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -42,7 +42,7 @@ #define MOBJECT_SESSION_LOCATINGPIN_H -#include "cinelerra.h" +#include "lumiera.h" #include #include @@ -81,7 +81,7 @@ namespace mobject class LocatingPin { protected: - typedef cinelerra::Time Time; + typedef lumiera::Time Time; typedef Time* Track; //TODO dummy declaration; we don't use Tracks as first-class entity any longer typedef std::tr1::shared_ptr Pipe; typedef std::pair SolutionData; //TODO (ichthyo consideres better passing of solution by subclass) diff --git a/src/proc/mobject/session/meta.cpp b/src/proc/mobject/session/meta.cpp index 0b6cb3ad8..cb61756d5 100644 --- a/src/proc/mobject/session/meta.cpp +++ b/src/proc/mobject/session/meta.cpp @@ -1,8 +1,8 @@ /* Meta - abstract base class of all MObjects representing meta data or processing instructions - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/meta.hpp b/src/proc/mobject/session/meta.hpp index 6810cce03..b45d30eb5 100644 --- a/src/proc/mobject/session/meta.hpp +++ b/src/proc/mobject/session/meta.hpp @@ -1,8 +1,8 @@ /* META.hpp - abstract base class of all MObjects representing meta data or processing instructions - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/mobjectfactory.cpp b/src/proc/mobject/session/mobjectfactory.cpp index f15d11d71..e6e158731 100644 --- a/src/proc/mobject/session/mobjectfactory.cpp +++ b/src/proc/mobject/session/mobjectfactory.cpp @@ -1,8 +1,8 @@ /* MObjectFactory - creating concrete MObject subclass instances - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/mobjectfactory.hpp b/src/proc/mobject/session/mobjectfactory.hpp index 96ffbed75..02a0f52b3 100644 --- a/src/proc/mobject/session/mobjectfactory.hpp +++ b/src/proc/mobject/session/mobjectfactory.hpp @@ -1,8 +1,8 @@ /* MOBJECTFACTORY.hpp - creating concrete MObject subclass instances - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/plug.cpp b/src/proc/mobject/session/plug.cpp index 09fa2dab8..ccc117510 100644 --- a/src/proc/mobject/session/plug.cpp +++ b/src/proc/mobject/session/plug.cpp @@ -1,8 +1,8 @@ /* Plug - LocatingPin for requesting connection to some Pipe - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/plug.hpp b/src/proc/mobject/session/plug.hpp index 7d45c14ee..333ee3ed8 100644 --- a/src/proc/mobject/session/plug.hpp +++ b/src/proc/mobject/session/plug.hpp @@ -1,8 +1,8 @@ /* PLUG.hpp - LocatingPin for requesting connection to some Pipe - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/relativelocation.cpp b/src/proc/mobject/session/relativelocation.cpp index 6488d4d77..7ae39ff3a 100644 --- a/src/proc/mobject/session/relativelocation.cpp +++ b/src/proc/mobject/session/relativelocation.cpp @@ -1,8 +1,8 @@ /* RelativeLocation - Placement implementation attaching MObjects relative to another one - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/relativelocation.hpp b/src/proc/mobject/session/relativelocation.hpp index 810476c04..33b857053 100644 --- a/src/proc/mobject/session/relativelocation.hpp +++ b/src/proc/mobject/session/relativelocation.hpp @@ -1,8 +1,8 @@ /* RELATIVELOCATION.hpp - Placement implementation attaching MObjects relative to another one - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/segment.cpp b/src/proc/mobject/session/segment.cpp index 7d8f3ca1a..3c34896ab 100644 --- a/src/proc/mobject/session/segment.cpp +++ b/src/proc/mobject/session/segment.cpp @@ -1,8 +1,8 @@ /* Segment - Segment of the Timeline. - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/segment.hpp b/src/proc/mobject/session/segment.hpp index 22305b5e4..0b8a6025b 100644 --- a/src/proc/mobject/session/segment.hpp +++ b/src/proc/mobject/session/segment.hpp @@ -1,8 +1,8 @@ /* SEGMENT.hpp - Segment of the Timeline. - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -26,7 +26,7 @@ #include -#include "cinelerra.h" +#include "lumiera.h" #include "proc/mobject/explicitplacement.hpp" @@ -49,7 +49,7 @@ namespace mobject class Segment { protected: - typedef cinelerra::Time Time; + typedef lumiera::Time Time; /** begin of this timeline segment. */ Time start; diff --git a/src/proc/mobject/session/session.cpp b/src/proc/mobject/session/session.cpp index 619cecf5b..3544ed4a0 100644 --- a/src/proc/mobject/session/session.cpp +++ b/src/proc/mobject/session/session.cpp @@ -1,8 +1,8 @@ /* Session - holds the complete session to be edited by the user - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -38,7 +38,7 @@ #include "common/singleton.hpp" -using cinelerra::Singleton; +using lumiera::Singleton; using mobject::session::SessManager; using mobject::session::SessManagerImpl; diff --git a/src/proc/mobject/session/sessionimpl.cpp b/src/proc/mobject/session/sessionimpl.cpp index f2a0bcfa3..e8f8c1e21 100644 --- a/src/proc/mobject/session/sessionimpl.cpp +++ b/src/proc/mobject/session/sessionimpl.cpp @@ -1,8 +1,8 @@ /* SessionImpl - holds the complete session data to be edited by the user - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -60,7 +60,7 @@ namespace mobject catch (...) { focusEDL_ = 0; - throw cinelerra::error::Fatal ("unexpected exception while clearing EDLs"); + throw lumiera::error::Fatal ("unexpected exception while clearing EDLs"); } } diff --git a/src/proc/mobject/session/sessionimpl.hpp b/src/proc/mobject/session/sessionimpl.hpp index 38448ac41..89e3c020a 100644 --- a/src/proc/mobject/session/sessionimpl.hpp +++ b/src/proc/mobject/session/sessionimpl.hpp @@ -1,8 +1,8 @@ /* SESSIONIMPL.hpp - holds the complete session data to be edited by the user - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -91,7 +91,7 @@ namespace mobject boost::scoped_ptr pImpl_; SessManagerImpl() throw(); - friend class cinelerra::singleton::StaticCreate; + friend class lumiera::singleton::StaticCreate; public: virtual void clear () ; diff --git a/src/proc/mobject/session/sessmanagerimpl.cpp b/src/proc/mobject/session/sessmanagerimpl.cpp index ad94c9949..6b5749463 100644 --- a/src/proc/mobject/session/sessmanagerimpl.cpp +++ b/src/proc/mobject/session/sessmanagerimpl.cpp @@ -1,8 +1,8 @@ /* SessManagerImpl - global session access and lifecycle - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -50,7 +50,7 @@ namespace mobject namespace session { - CINELERRA_ERROR_DEFINE (CREATE_SESSION, "unable to create basic session"); + LUMIERA_ERROR_DEFINE (CREATE_SESSION, "unable to create basic session"); /** Access to the "current session", which actually is * an SessionImpl instance. This session object is created @@ -71,8 +71,8 @@ namespace mobject catch (...) { ERROR (oper, "Unrecoverable Failure while creating the empty default session."); - throw cinelerra::error::Fatal ( "Failure while creating the basic session object. Sysstem halted." - , CINELERRA_ERROR_CREATE_SESSION ); + throw lumiera::error::Fatal ( "Failure while creating the basic session object. Sysstem halted." + , LUMIERA_ERROR_CREATE_SESSION ); } diff --git a/src/proc/mobject/session/simpleclip.cpp b/src/proc/mobject/session/simpleclip.cpp index 053a5f148..97796a00e 100644 --- a/src/proc/mobject/session/simpleclip.cpp +++ b/src/proc/mobject/session/simpleclip.cpp @@ -1,8 +1,8 @@ /* SimpleClip - Elementary clip (single media stream only) - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/simpleclip.hpp b/src/proc/mobject/session/simpleclip.hpp index 446090cc1..f0dc62c02 100644 --- a/src/proc/mobject/session/simpleclip.hpp +++ b/src/proc/mobject/session/simpleclip.hpp @@ -1,8 +1,8 @@ /* SIMPLECLIP.hpp - Elementary clip (single media stream only) - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/track.cpp b/src/proc/mobject/session/track.cpp index 87f6dad2e..eb08a3c1c 100644 --- a/src/proc/mobject/session/track.cpp +++ b/src/proc/mobject/session/track.cpp @@ -1,8 +1,8 @@ /* - Track - descriptor for one track in the Session + Track - A grouping device within the EDL. - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/track.hpp b/src/proc/mobject/session/track.hpp index 4429a9189..3a5517d52 100644 --- a/src/proc/mobject/session/track.hpp +++ b/src/proc/mobject/session/track.hpp @@ -1,8 +1,8 @@ /* TRACK.hpp - A grouping device within the EDL. - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/wish.cpp b/src/proc/mobject/session/wish.cpp index f58e0261a..ddf90d307 100644 --- a/src/proc/mobject/session/wish.cpp +++ b/src/proc/mobject/session/wish.cpp @@ -1,8 +1,8 @@ /* Wish - LocatingPin representing a low-priority directive - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/mobject/session/wish.hpp b/src/proc/mobject/session/wish.hpp index d50e8865f..7fe447e4e 100644 --- a/src/proc/mobject/session/wish.hpp +++ b/src/proc/mobject/session/wish.hpp @@ -1,8 +1,8 @@ /* WISH.hpp - LocatingPin representing a low-priority directive - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/stateproxy.cpp b/src/proc/stateproxy.cpp index 9d4004d0f..f4125a41e 100644 --- a/src/proc/stateproxy.cpp +++ b/src/proc/stateproxy.cpp @@ -1,8 +1,8 @@ /* StateProxy - Key Interface representing a render process and encapsulating state - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/proc/stateproxy.hpp b/src/proc/stateproxy.hpp index c1ce6d52f..7c338bd1d 100644 --- a/src/proc/stateproxy.hpp +++ b/src/proc/stateproxy.hpp @@ -1,8 +1,8 @@ /* STATEPROXY.hpp - Key Interface representing a render process and encapsulating state - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/tool/DIR_INFO b/src/tool/DIR_INFO index 76e84db53..c8933be3e 100644 --- a/src/tool/DIR_INFO +++ b/src/tool/DIR_INFO @@ -1 +1 @@ -source code of supplementary tools to be built alongside with Cinelerra +source code of supplementary tools to be built alongside with Lumiera diff --git a/src/tool/SConscript b/src/tool/SConscript index fe3a35dcc..738483498 100644 --- a/src/tool/SConscript +++ b/src/tool/SConscript @@ -5,10 +5,6 @@ Import('env','artifacts') -# at the moment (8/07), Ichthyo tries to find out how to configure NoBug -# does it help, if we set the NOBUG_LOG to the environment used for building?? -env = env.Clone() -env['ENV']['NOBUG_LOG'] = 'ttt:WARNING' # build the ubiquitous Hello World application (note: C source) artifacts['tools'] = [ env.Program('#$BINDIR/hello-world','hello.c') diff --git a/src/tool/hello.c b/src/tool/hello.c index 62a033f4e..d75f55f94 100644 --- a/src/tool/hello.c +++ b/src/tool/hello.c @@ -1,12 +1,12 @@ /* * hello.c - demonstrates how to build a standalone tool (C source) - * integrated into the SCons based build system of Cinelerra + * integrated into the SCons based build system of Lumiera */ #include int main(int argc, char* argv[]) { - printf("hello cinelerra world"); + printf("hello lumiera world"); return 0; } diff --git a/tests/10errorhandling.tests b/tests/10errorhandling.tests index 2492869c5..f2e4e9dfc 100644 --- a/tests/10errorhandling.tests +++ b/tests/10errorhandling.tests @@ -15,12 +15,12 @@ return: 0 END TEST "query error" get < # Hermann Vosseler # @@ -21,12 +21,12 @@ tests_srcdir = $(top_srcdir)/tests check_PROGRAMS += test-error test_error_SOURCES = $(tests_srcdir)/error/errortest.c test_error_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ -test_error_LDADD = libcin3.a -lnobugmt -lpthread -ldl +test_error_LDADD = liblumi.a -lnobugmt -lpthread -ldl check_PROGRAMS += test-time test_time_SOURCES = $(tests_srcdir)/time/test-time.c test_time_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ -test_time_LDADD = libcin3.a -lnobugmt -lpthread -ldl -lm +test_time_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm check_PROGRAMS += test-locking test_locking_SOURCES = \ @@ -34,21 +34,21 @@ test_locking_SOURCES = \ $(tests_srcdir)/locking/mutex.c \ $(tests_srcdir)/locking/condition.c test_locking_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ -test_locking_LDADD = libcin3.a -lnobugmt -lpthread -ldl -lm +test_locking_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm check_PROGRAMS += test-llist test_llist_SOURCES = $(tests_srcdir)/library/test-llist.c test_llist_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ -test_llist_LDADD = libcin3.a -lnobugmt -lpthread -ldl -lm +test_llist_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm check_PROGRAMS += test-references test_references_SOURCES = $(tests_srcdir)/library/test-references.c test_references_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ -test_references_LDADD = libcin3.a -lnobugmt -lpthread -ldl -lm -lrt +test_references_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm -lrt #check_PROGRAMS += test-filehandles #test_filehandles_SOURCES = $(tests_srcdir)/backend/test-filehandles.c #test_filehandles_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ -#test_filehandles_LDADD = libcin3backend.a libcin3.a -lnobugmt -lpthread -ldl -lm +#test_filehandles_LDADD = liblumibackend.a liblumi.a -lnobugmt -lpthread -ldl -lm TESTS = $(tests_srcdir)/test.sh diff --git a/tests/bugs/bugmain.c b/tests/bugs/bugmain.c index 4331f4516..7823b279e 100644 --- a/tests/bugs/bugmain.c +++ b/tests/bugs/bugmain.c @@ -1,8 +1,8 @@ /* errortest.c - executable for running bug regression tests - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 diff --git a/tests/components/backend/mediaaccessmock.cpp b/tests/components/backend/mediaaccessmock.cpp index d980c83d5..d54a4978d 100644 --- a/tests/components/backend/mediaaccessmock.cpp +++ b/tests/components/backend/mediaaccessmock.cpp @@ -1,8 +1,8 @@ /* MediaAccessMock.hpp - a test (stub) target object for testing the factories - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -41,7 +41,7 @@ #include #include -using cinelerra::error::Invalid; +using lumiera::error::Invalid; using util::for_each; using util::isnil; using std::cout; diff --git a/tests/components/backend/mediaaccessmock.hpp b/tests/components/backend/mediaaccessmock.hpp index 2b70ca3fa..06eedad5c 100644 --- a/tests/components/backend/mediaaccessmock.hpp +++ b/tests/components/backend/mediaaccessmock.hpp @@ -1,8 +1,8 @@ /* MEDIAACCESSMOCK.hpp - a test (stub) target object for testing the factories - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -41,7 +41,7 @@ namespace backend_interface class MediaAccessMock : public MediaAccessFacade { public: - FileHandle queryFile (const char* name) throw(cinelerra::error::Invalid); + FileHandle queryFile (const char* name) throw(lumiera::error::Invalid); ChanDesc queryChannel (FileHandle, uint chanNo) throw(); }; diff --git a/tests/components/backend/mediaaccessmocktest.cpp b/tests/components/backend/mediaaccessmocktest.cpp index 110d2b3cd..327a7bc74 100644 --- a/tests/components/backend/mediaaccessmocktest.cpp +++ b/tests/components/backend/mediaaccessmocktest.cpp @@ -1,8 +1,8 @@ /* MediaAccessMock(Test) - checking our Test Mock replacing the MediaAccessFacade - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/common/appconfigtest.cpp b/tests/components/common/appconfigtest.cpp index 49266c4ae..6cab57de8 100644 --- a/tests/components/common/appconfigtest.cpp +++ b/tests/components/common/appconfigtest.cpp @@ -1,8 +1,8 @@ /* Appconfig(Test) - accessing the allwasy-available Appconfig singleton - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -33,7 +33,7 @@ using std::cout; -namespace cinelerra +namespace lumiera { namespace test { @@ -46,10 +46,10 @@ namespace cinelerra testAccess("version"); } - /** @test accessing a value from cinelerra::Appconfig */ + /** @test accessing a value from lumiera::Appconfig */ void testAccess (const string& key) { - string ver = cinelerra::Appconfig::get(key); + string ver = lumiera::Appconfig::get(key); ASSERT ( !util::isnil(ver)); } }; diff --git a/tests/components/common/exceptionerrortest.cpp b/tests/components/common/exceptionerrortest.cpp index 51e621dbc..75a13d0ee 100644 --- a/tests/components/common/exceptionerrortest.cpp +++ b/tests/components/common/exceptionerrortest.cpp @@ -1,8 +1,8 @@ /* Exceptionhandlin(Test) - throwing and catching our exception type - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -42,7 +42,7 @@ using std::cout; -namespace cinelerra +namespace lumiera { namespace test { @@ -50,11 +50,11 @@ namespace cinelerra /** local specific error-constant for use in the * construcor of the nested SpecificError class. */ - CINELERRA_ERROR_DEFINE(LIFE_AND_UNIVERSE, "and everything?"); - CINELERRA_ERROR_DEFINE(DERIVED, "convoluted exception"); + LUMIERA_ERROR_DEFINE(LIFE_AND_UNIVERSE, "and everything?"); + LUMIERA_ERROR_DEFINE(DERIVED, "convoluted exception"); /** declare a specific Error class with parent class error::external */ - CINELERRA_EXCEPTION_DECLARE (DerivedError, error::External, CINELERRA_ERROR_DERIVED); + LUMIERA_EXCEPTION_DECLARE (DerivedError, error::External, LUMIERA_ERROR_DERIVED); /********************************************************** @@ -134,29 +134,29 @@ namespace cinelerra } - /** @test by constructing an cinelerra::Error object, - * the corresponding cinelerra_error state is set automatically + /** @test by constructing an lumiera::Error object, + * the corresponding lumiera_error state is set automatically */ void checkErrorIntegration() { - cinelerra_error (); - ASSERT (!cinelerra_error ()); + lumiera_error (); + ASSERT (!lumiera_error ()); Error err1; - Error err2("boo",CINELERRA_ERROR_DERIVED); - ASSERT (err1.getID () == cinelerra_error ()); // (we didn't clear the first one!) + Error err2("boo",LUMIERA_ERROR_DERIVED); + ASSERT (err1.getID () == lumiera_error ()); // (we didn't clear the first one!) - Error err3("boooo",CINELERRA_ERROR_DERIVED); - ASSERT (err3.getID () == cinelerra_error ()); + Error err3("boooo",LUMIERA_ERROR_DERIVED); + ASSERT (err3.getID () == lumiera_error ()); SpecificError err4; - ASSERT (err4.getID () == CINELERRA_ERROR_LIFE_AND_UNIVERSE); - ASSERT (err4.getID () == cinelerra_error ()); + ASSERT (err4.getID () == LUMIERA_ERROR_LIFE_AND_UNIVERSE); + ASSERT (err4.getID () == lumiera_error ()); - ASSERT (!cinelerra_error ()); + ASSERT (!lumiera_error ()); } - /** @test the chaining of cinelerra::Exception objects + /** @test the chaining of lumiera::Exception objects * and the retrieval of the original root cause. */ void checkRootCauseChaining() @@ -186,7 +186,7 @@ namespace cinelerra * gets installed and invoked, which gives additional diagnostics.*/ void terminateUnknown () throw() { - cinelerra::Appconfig::instance(); + lumiera::Appconfig::instance(); // will cause initialisation of Appconfig, throw Error("You'll never get me, won't you?"); @@ -201,7 +201,7 @@ namespace cinelerra { int value; public: - SpecificError () : Invalid("don't panic",CINELERRA_ERROR_LIFE_AND_UNIVERSE), value(42) {} + SpecificError () : Invalid("don't panic",LUMIERA_ERROR_LIFE_AND_UNIVERSE), value(42) {} int revealIt () { return value; } }; @@ -220,7 +220,7 @@ namespace cinelerra catch (SpecificError& e) { cout << "caught: " << e.what() << "..the answer is: " << e.revealIt() << "\n"; } catch (error::Logic& e) { cout << "caught error::Logic: " << e.what() << "\n"; } catch (error::Invalid&e) { cout << "caught error::Invalid: " << e.what() << "\n"; } - catch (Error& e) { cout << "caught cinelerra::Error: " << e.what() << "\n"; } + catch (Error& e) { cout << "caught lumiera::Error: " << e.what() << "\n"; } catch (runtime_error& e) { cout << "caught std::runtime_error: " << e.what() << "\n"; } catch (exception& e) { cout << "caught std::exception: " << e.what() << "\n"; } catch (...) { cout << "caught an unknown exception\n"; } diff --git a/tests/components/common/factoryspecialtest.cpp b/tests/components/common/factoryspecialtest.cpp index e9848c599..ecf293cd9 100644 --- a/tests/components/common/factoryspecialtest.cpp +++ b/tests/components/common/factoryspecialtest.cpp @@ -1,8 +1,8 @@ /* Factory-Special(Test) - testing the more advanced features of factory - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -38,7 +38,7 @@ using std::string; using std::cout; -namespace cinelerra +namespace lumiera { namespace test { @@ -323,4 +323,4 @@ namespace cinelerra } // namespace test -} // namespace cinelerra +} // namespace lumiera diff --git a/tests/components/common/factorytest.cpp b/tests/components/common/factorytest.cpp index 4648fe6d8..6c96a337c 100644 --- a/tests/components/common/factorytest.cpp +++ b/tests/components/common/factorytest.cpp @@ -1,8 +1,8 @@ /* Factory(Test) - unittest for the object creating factory - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -36,7 +36,7 @@ using std::string; using std::cout; -namespace cinelerra +namespace lumiera { namespace test { @@ -100,7 +100,7 @@ namespace cinelerra * further shared-ptrs, invoke a member function and * finally, when leaving the scope, our TargetObj * will be destroyed automatically. - * @see cinelerra::Factory + * @see lumiera::Factory */ class Factory_test : public Test { @@ -125,4 +125,4 @@ namespace cinelerra } // namespace test -} // namespace cinelerra +} // namespace lumiera diff --git a/tests/components/common/sanitizedidentifiertest.cpp b/tests/components/common/sanitizedidentifiertest.cpp index a6dba2c79..416d81c58 100644 --- a/tests/components/common/sanitizedidentifiertest.cpp +++ b/tests/components/common/sanitizedidentifiertest.cpp @@ -1,8 +1,8 @@ /* SanitizedIdentifier(Test) - remove non-standard-chars and punctuation - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/common/singletonsubclasstest.cpp b/tests/components/common/singletonsubclasstest.cpp index 17322831d..aad667b9f 100644 --- a/tests/components/common/singletonsubclasstest.cpp +++ b/tests/components/common/singletonsubclasstest.cpp @@ -1,8 +1,8 @@ /* SingletonSubclass(Test) - actually creating a subclass of the Singleton Type - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -38,7 +38,7 @@ using std::string; using std::cout; -namespace cinelerra +namespace lumiera { namespace test { @@ -87,9 +87,9 @@ namespace cinelerra * subclasses (implementation classes) without coupling the * caller to the concrete class type. * Expected results: an instance of the subclass is created. - * @see cinelerra::Singleton - * @see cinelerra::SingletonSubclassFactory - * @see cinelerra::singleton::Adapter + * @see lumiera::Singleton + * @see lumiera::SingletonSubclassFactory + * @see lumiera::singleton::Adapter */ class SingletonSubclass_test : public Test { @@ -140,7 +140,7 @@ namespace cinelerra } catch (...) { - ASSERT (cinelerra_error () == error::CINELERRA_ERROR_ASSERTION); + ASSERT (lumiera_error () == error::LUMIERA_ERROR_ASSERTION); } @@ -160,4 +160,4 @@ namespace cinelerra } // namespace test -} // namespace cinelerra +} // namespace lumiera diff --git a/tests/components/common/singletontest.cpp b/tests/components/common/singletontest.cpp index ce88d5245..b531d7e9c 100644 --- a/tests/components/common/singletontest.cpp +++ b/tests/components/common/singletontest.cpp @@ -1,8 +1,8 @@ /* Singleton(Test) - unittest for our Singleton template - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -38,7 +38,7 @@ using std::string; using std::cout; -namespace cinelerra +namespace lumiera { namespace test { @@ -72,9 +72,9 @@ namespace cinelerra /******************************************************************* * @test implement a Singleton class using our Singleton Template. * Expected results: no memory leaks. - * @see cinelerra::Singleton - * @see cinelerra::singleton::StaticCreate - * @see cinelerra::singleton::HeapCreate + * @see lumiera::Singleton + * @see lumiera::singleton::StaticCreate + * @see lumiera::singleton::HeapCreate */ class Singleton_test : public Test { @@ -136,4 +136,4 @@ namespace cinelerra } // namespace test -} // namespace cinelerra +} // namespace lumiera diff --git a/tests/components/common/singletontestmocktest.cpp b/tests/components/common/singletontestmocktest.cpp index b33dda5d2..ea5e1d70e 100644 --- a/tests/components/common/singletontestmocktest.cpp +++ b/tests/components/common/singletontestmocktest.cpp @@ -1,8 +1,8 @@ /* SingletonTestMock(Test) - using Singleton for injecting Test-Mocks - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -37,7 +37,7 @@ using std::string; using std::cout; -namespace cinelerra +namespace lumiera { namespace test { @@ -108,8 +108,8 @@ namespace cinelerra * @test inject a Mock object into the Singleton Factory, * to be returned and used in place of the original object. * Expected results: Mock(s) called, no memory leaks. - * @see cinelerra::Singleton - * @see cinelerra::singleton::Static + * @see lumiera::Singleton + * @see lumiera::singleton::Static */ class SingletonTestMock_test : public Test { @@ -214,4 +214,4 @@ namespace cinelerra } // namespace test -} // namespace cinelerra +} // namespace lumiera diff --git a/tests/components/common/test/cmdlinewrappertest.cpp b/tests/components/common/test/cmdlinewrappertest.cpp index 84b0780c1..668ce8121 100644 --- a/tests/components/common/test/cmdlinewrappertest.cpp +++ b/tests/components/common/test/cmdlinewrappertest.cpp @@ -1,8 +1,8 @@ /* Cmdlinewrapper(Test) - build vector of tokens from cmdline, various conversions - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/common/test/testoptiontest.cpp b/tests/components/common/test/testoptiontest.cpp index aac3269f0..7f3da81c6 100644 --- a/tests/components/common/test/testoptiontest.cpp +++ b/tests/components/common/test/testoptiontest.cpp @@ -1,8 +1,8 @@ /* TestOption(Test) - parsing of cmd line options for running Testcases - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/common/testtargetobj.hpp b/tests/components/common/testtargetobj.hpp index d367f4cd6..28ac5890d 100644 --- a/tests/components/common/testtargetobj.hpp +++ b/tests/components/common/testtargetobj.hpp @@ -1,8 +1,8 @@ /* TESTTARGETOBJ.hpp - a test (stub) target object for testing the factories - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,8 +21,8 @@ */ -#ifndef CINELERRA_TEST_TESTTARGETOBJ_H -#define CINELERRA_TEST_TESTTARGETOBJ_H +#ifndef LUMIERA_TEST_TESTTARGETOBJ_H +#define LUMIERA_TEST_TESTTARGETOBJ_H #include "common/test/run.hpp" @@ -41,7 +41,7 @@ using std::string; using std::cout; -namespace cinelerra +namespace lumiera { namespace test { @@ -107,5 +107,5 @@ namespace cinelerra } // namespace test -} // namespace cinelerra +} // namespace lumiera #endif diff --git a/tests/components/common/typelisttest.cpp b/tests/components/common/typelisttest.cpp index ddd13c776..42159d96c 100644 --- a/tests/components/common/typelisttest.cpp +++ b/tests/components/common/typelisttest.cpp @@ -1,8 +1,8 @@ /* TypeList(Test) - check the typelist metaprogramming facility - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -30,7 +30,7 @@ using std::string; using std::cout; -namespace cinelerra +namespace lumiera { namespace typelist { @@ -97,4 +97,4 @@ namespace cinelerra } // namespace typelist -} // namespace cinelerra +} // namespace lumiera diff --git a/tests/components/common/typelistutiltest.cpp b/tests/components/common/typelistutiltest.cpp index 327242e8e..d0e2f683f 100644 --- a/tests/components/common/typelistutiltest.cpp +++ b/tests/components/common/typelistutiltest.cpp @@ -1,8 +1,8 @@ /* TypeListUtil(Test) - check the typelist helpers - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -32,7 +32,7 @@ ** ** @see typelisttest.cpp ** @see typelistutil.hpp - ** @see cinelerra::query::ConfigRules a real world usage example + ** @see lumiera::query::ConfigRules a real world usage example ** */ @@ -47,7 +47,7 @@ using std::string; using std::cout; -namespace cinelerra +namespace lumiera { namespace typelist { @@ -152,4 +152,4 @@ namespace cinelerra } // namespace typelist -} // namespace cinelerra +} // namespace lumiera diff --git a/tests/components/common/visitingtoolconcept.cpp b/tests/components/common/visitingtoolconcept.cpp index dbccfe0b3..f2189ed09 100644 --- a/tests/components/common/visitingtoolconcept.cpp +++ b/tests/components/common/visitingtoolconcept.cpp @@ -1,8 +1,8 @@ /* VisitingTool(Concept) - working out our own Visitor library implementation - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -24,7 +24,7 @@ /** @file visitingtoolconept.cpp ** While laying the foundations for EDL and Builder, Ichthyo came accross ** the necessity to create a custom implementation of the Visitor Pattern - ** optimally suited for Cinelerra's needs. This implementation file was + ** optimally suited for Lumiera's needs. This implementation file was ** used for the draft and is self-contained. The final solution was then ** extracted as library implementation to visitor.hpp ** @@ -60,13 +60,13 @@ #include #include -using cinelerra::Singleton; +using lumiera::Singleton; using boost::format; using std::string; using std::cout; -namespace cinelerra +namespace lumiera { namespace visitor_concept_draft { @@ -459,4 +459,4 @@ namespace cinelerra } // namespace visitor_concept_draft -} // namespace cinelerra +} // namespace lumiera diff --git a/tests/components/common/visitingtoolextendedtest.cpp b/tests/components/common/visitingtoolextendedtest.cpp index 076a3d48e..d29c60b26 100644 --- a/tests/components/common/visitingtoolextendedtest.cpp +++ b/tests/components/common/visitingtoolextendedtest.cpp @@ -1,8 +1,8 @@ /* VisitingToolExtended(Test) - check obscure corner cases of visitor lib implementation - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -32,7 +32,7 @@ using std::string; using std::cout; -namespace cinelerra +namespace lumiera { namespace visitor { @@ -226,4 +226,4 @@ namespace cinelerra } // namespace visitor -} // namespace cinelerra +} // namespace lumiera diff --git a/tests/components/common/visitingtooltest.cpp b/tests/components/common/visitingtooltest.cpp index 983a9ab0b..0263d9c88 100644 --- a/tests/components/common/visitingtooltest.cpp +++ b/tests/components/common/visitingtooltest.cpp @@ -1,8 +1,8 @@ /* VisitingTool(Test) - check the standard visitor use case - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -32,7 +32,7 @@ using std::string; using std::cout; -namespace cinelerra +namespace lumiera { namespace visitor { @@ -159,4 +159,4 @@ namespace cinelerra } // namespace visitor -} // namespace cinelerra +} // namespace lumiera diff --git a/tests/components/helloworldtest.cpp b/tests/components/helloworldtest.cpp index 3aa516ca3..d0c289986 100644 --- a/tests/components/helloworldtest.cpp +++ b/tests/components/helloworldtest.cpp @@ -1,8 +1,8 @@ /* HelloWorld(Test) - how to use this test framework... - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -31,7 +31,7 @@ using util::isnil; using boost::lexical_cast; -namespace cinelerra +namespace lumiera { namespace test { @@ -65,4 +65,4 @@ namespace cinelerra } // namespace test -} // namespace cinelerra +} // namespace lumiera diff --git a/tests/components/mainsuite.cpp b/tests/components/mainsuite.cpp index dac63ba7c..aa500cdbe 100644 --- a/tests/components/mainsuite.cpp +++ b/tests/components/mainsuite.cpp @@ -1,8 +1,8 @@ /* - mainsuite.cpp - "the" cinelerra3 self test suite + mainsuite.cpp - "the" Lumiera self test suite - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, Christian Thaeter Hermann Vosseler This program is free software; you can redistribute it and/or diff --git a/tests/components/proc/asset/assetcategorytest.cpp b/tests/components/proc/asset/assetcategorytest.cpp index af671d91f..ef02aaafe 100644 --- a/tests/components/proc/asset/assetcategorytest.cpp +++ b/tests/components/proc/asset/assetcategorytest.cpp @@ -1,8 +1,8 @@ /* AssetCategory(Test) - verifying Asset category tuple functions - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/asset/assetdiagnostics.hpp b/tests/components/proc/asset/assetdiagnostics.hpp index 4788b687f..199338599 100644 --- a/tests/components/proc/asset/assetdiagnostics.hpp +++ b/tests/components/proc/asset/assetdiagnostics.hpp @@ -1,8 +1,8 @@ /* ASSETDIAGNOSTICS.hpp - collection of test and debug helpers - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/asset/basicpipetest.cpp b/tests/components/proc/asset/basicpipetest.cpp index 62644b95a..fb2541f20 100644 --- a/tests/components/proc/asset/basicpipetest.cpp +++ b/tests/components/proc/asset/basicpipetest.cpp @@ -1,8 +1,8 @@ /* BasicPipe(Test) - checking the basic properties of Pipe Assets - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -47,8 +47,8 @@ namespace asset namespace test { using mobject::Session; - using cinelerra::Query; - using cinelerra::query::normalizeID; + using lumiera::Query; + using lumiera::query::normalizeID; @@ -92,7 +92,7 @@ namespace asset ASSERT (thePipe->shortDesc == wstring (pID_sane.begin(), pID_sane.end())); Asset::Ident idi = thePipe->ident; - ASSERT (idi.org == "cin3"); + ASSERT (idi.org == "lumi"); ASSERT (contains (idi.name, thePipe->getPipeID())); ASSERT (contains (idi.name, thePipe->getProcPatt()->queryStreamID())); diff --git a/tests/components/proc/asset/compoundmediatest.cpp b/tests/components/proc/asset/compoundmediatest.cpp index ba11c1bef..73e4056bc 100644 --- a/tests/components/proc/asset/compoundmediatest.cpp +++ b/tests/components/proc/asset/compoundmediatest.cpp @@ -1,8 +1,8 @@ /* CompoundMedia(Test) - handling multichannel Media Assets - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/asset/createassettest.cpp b/tests/components/proc/asset/createassettest.cpp index 01ae76efe..d9302fc7c 100644 --- a/tests/components/proc/asset/createassettest.cpp +++ b/tests/components/proc/asset/createassettest.cpp @@ -1,8 +1,8 @@ /* CreateAsset(Test) - constructing and registering Assets - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -100,14 +100,14 @@ namespace asset aMang.getAsset (ID(mm1->getID())); NOTREACHED; } - catch (cinelerra::error::Invalid& xxx) {ASSERT (xxx.getID()==CINELERRA_ERROR_WRONG_ASSET_KIND);} + catch (lumiera::error::Invalid& xxx) {ASSERT (xxx.getID()==LUMIERA_ERROR_WRONG_ASSET_KIND);} try { // try accessing nonexistant ID aMang.getAsset (ID (1234567890)); NOTREACHED; } - catch (cinelerra::error::Invalid& xxx) {ASSERT (xxx.getID()==CINELERRA_ERROR_UNKNOWN_ASSET_ID);} - cinelerra_error (); // reset errorflag + catch (lumiera::error::Invalid& xxx) {ASSERT (xxx.getID()==LUMIERA_ERROR_UNKNOWN_ASSET_ID);} + lumiera_error (); // reset errorflag // checking the Ident-Fields @@ -121,8 +121,8 @@ namespace asset ASSERT (mm3->ident.category == Category (VIDEO )); ASSERT (mm1->ident.org == "ichthyo"); - ASSERT (mm2->ident.org == "cin3"); - ASSERT (mm3->ident.org == "cin3"); + ASSERT (mm2->ident.org == "lumi"); + ASSERT (mm3->ident.org == "lumi"); ASSERT (mm1->ident.version == 5); ASSERT (mm2->ident.version == 1); @@ -159,19 +159,19 @@ namespace asset ASSERT (key2.name == "testfile2"); // name filled in automatically candi = asset::Media::create(string("testfile3.wav"), Category(AUDIO)); - ASSERT ( checkProperties (candi, Asset::Ident("testfile3", Category(AUDIO), "cin3", 1) + ASSERT ( 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), "cin3", 1) + ASSERT ( 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"), "cin3", 1) + ASSERT ( checkProperties (candi, Asset::Ident("nil", Category(AUDIO,"sub/bin"), "lumi", 1) , "")); candi = asset::Media::create("", AUDIO); - ASSERT ( checkProperties (candi, Asset::Ident("nil", Category(AUDIO), "cin3", 1) + ASSERT ( checkProperties (candi, Asset::Ident("nil", Category(AUDIO), "lumi", 1) , "")); } diff --git a/tests/components/proc/asset/deleteassettest.cpp b/tests/components/proc/asset/deleteassettest.cpp index 15430ce95..5a0ef2ba4 100644 --- a/tests/components/proc/asset/deleteassettest.cpp +++ b/tests/components/proc/asset/deleteassettest.cpp @@ -1,8 +1,8 @@ /* DeleteAsset(Test) - deleting and Asset with all dependencies - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/asset/dependantassetstest.cpp b/tests/components/proc/asset/dependantassetstest.cpp index f9cc1d412..c9125b5d3 100644 --- a/tests/components/proc/asset/dependantassetstest.cpp +++ b/tests/components/proc/asset/dependantassetstest.cpp @@ -1,8 +1,8 @@ /* DependantAssets(Test) - check the asset dependency handling - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/asset/identityofassetstest.cpp b/tests/components/proc/asset/identityofassetstest.cpp index adf7d35ea..655c4fb40 100644 --- a/tests/components/proc/asset/identityofassetstest.cpp +++ b/tests/components/proc/asset/identityofassetstest.cpp @@ -1,8 +1,8 @@ /* IdentityOfAssets(Test) - Asset object identity and versioning - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/asset/makecliptest.cpp b/tests/components/proc/asset/makecliptest.cpp index cb8999c55..83702d7c5 100644 --- a/tests/components/proc/asset/makecliptest.cpp +++ b/tests/components/proc/asset/makecliptest.cpp @@ -1,8 +1,8 @@ /* MakeClip(Test) - create a Clip from a Media Asset - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/asset/mediastructurequerytest.cpp b/tests/components/proc/asset/mediastructurequerytest.cpp index 11d758b63..7cbfcd847 100644 --- a/tests/components/proc/asset/mediastructurequerytest.cpp +++ b/tests/components/proc/asset/mediastructurequerytest.cpp @@ -1,8 +1,8 @@ /* MediaStructureQuery(Test) - check functionallity used for creating media assets - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -44,7 +44,7 @@ namespace asset /*********************************************************************** * This test documents the Interface used by MediaFactory when loading - * media files for querying cinelerra's backend layer for information + * media files for querying Lumiera's backend layer for information * on how the media file is structured. */ class MediaStructureQuery_test : public Test diff --git a/tests/components/proc/asset/orderingofassetstest.cpp b/tests/components/proc/asset/orderingofassetstest.cpp index dba64433d..26d6aa50a 100644 --- a/tests/components/proc/asset/orderingofassetstest.cpp +++ b/tests/components/proc/asset/orderingofassetstest.cpp @@ -1,8 +1,8 @@ /* OrderingOfAssets(Test) - equality and comparisons - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/asset/testasset.cpp b/tests/components/proc/asset/testasset.cpp index ffc035722..b48b64da1 100644 --- a/tests/components/proc/asset/testasset.cpp +++ b/tests/components/proc/asset/testasset.cpp @@ -1,8 +1,8 @@ /* TestClip - test clip (stub) for checking EDL/Session functionality - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/asset/testasset.hpp b/tests/components/proc/asset/testasset.hpp index 9e7e66da9..05f82c79e 100644 --- a/tests/components/proc/asset/testasset.hpp +++ b/tests/components/proc/asset/testasset.hpp @@ -1,8 +1,8 @@ /* TESTASSET.hpp - test asset (stub) for checking internal asset functionality - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/asset/testclipasset.hpp b/tests/components/proc/asset/testclipasset.hpp index 35e56525d..8bb0fa1ad 100644 --- a/tests/components/proc/asset/testclipasset.hpp +++ b/tests/components/proc/asset/testclipasset.hpp @@ -1,8 +1,8 @@ /* TESTCLIPASSET.hpp - test Media-Asset (clip) for checking Assets and MObjects - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/engine/sourcenodetest.cpp b/tests/components/proc/engine/sourcenodetest.cpp index 6177475b0..35127ab4a 100644 --- a/tests/components/proc/engine/sourcenodetest.cpp +++ b/tests/components/proc/engine/sourcenodetest.cpp @@ -1,8 +1,8 @@ /* SourceNode(Test) - unit test of the source readering render node - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/mobject/builder/buildertooltest.cpp b/tests/components/proc/mobject/builder/buildertooltest.cpp index c48b05627..8a445ef18 100644 --- a/tests/components/proc/mobject/builder/buildertooltest.cpp +++ b/tests/components/proc/mobject/builder/buildertooltest.cpp @@ -1,8 +1,8 @@ /* BuilderTool(Test) - specialized form of the acyclic visitor - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/mobject/builder/buildsegmenttest.cpp b/tests/components/proc/mobject/builder/buildsegmenttest.cpp index 2e6a8fb9b..82de68330 100644 --- a/tests/components/proc/mobject/builder/buildsegmenttest.cpp +++ b/tests/components/proc/mobject/builder/buildsegmenttest.cpp @@ -1,8 +1,8 @@ /* BuildSegment(Test) - building the render-tree for a segment of the EDL - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/mobject/controller/rendersegmenttest.cpp b/tests/components/proc/mobject/controller/rendersegmenttest.cpp index b99965946..a56c76480 100644 --- a/tests/components/proc/mobject/controller/rendersegmenttest.cpp +++ b/tests/components/proc/mobject/controller/rendersegmenttest.cpp @@ -1,8 +1,8 @@ /* RenderSegment(Test) - Proc-Layer Integrationtest - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -46,7 +46,7 @@ namespace mobject /******************************************************************* * @test create a render process from a given segment of the EDL. * Basically this includes cooperation of all parts of the - * Cinelerra Proc Layer. For a prepared test-EDL we invoke the + * Lumiera Proc Layer. For a prepared test-EDL we invoke the * controller to create a render process. This includes building * the render pipeline. Finally, we analyze all the created * Structures. diff --git a/tests/components/proc/mobject/placementbasictest.cpp b/tests/components/proc/mobject/placementbasictest.cpp index f26b0ab47..e3e237252 100644 --- a/tests/components/proc/mobject/placementbasictest.cpp +++ b/tests/components/proc/mobject/placementbasictest.cpp @@ -1,8 +1,8 @@ /* PlacementBasic(Test) - basic Placement and MObject handling - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -35,7 +35,7 @@ #include //using boost::format; -using cinelerra::Time; +using lumiera::Time; using util::contains; using std::string; using std::cout; diff --git a/tests/components/proc/mobject/session/addcliptest.cpp b/tests/components/proc/mobject/session/addcliptest.cpp index cf5a11d77..3cb981270 100644 --- a/tests/components/proc/mobject/session/addcliptest.cpp +++ b/tests/components/proc/mobject/session/addcliptest.cpp @@ -1,8 +1,8 @@ /* AddClip(Test) - adding an Clip-MObject to the EDL/Session - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -32,7 +32,7 @@ #include //using boost::format; -using cinelerra::Time; +using lumiera::Time; using util::contains; using std::string; using std::cout; diff --git a/tests/components/proc/mobject/session/defsmanagerimpltest.cpp b/tests/components/proc/mobject/session/defsmanagerimpltest.cpp index dc0cc22a4..a4c18f2d9 100644 --- a/tests/components/proc/mobject/session/defsmanagerimpltest.cpp +++ b/tests/components/proc/mobject/session/defsmanagerimpltest.cpp @@ -1,8 +1,8 @@ /* DefsManagerImpl(Test) - checking implementation details of the defaults manager - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -43,12 +43,12 @@ namespace asset namespace test { using mobject::Session; - using cinelerra::Symbol; - using cinelerra::Query; - using cinelerra::query::normalizeID; + using lumiera::Symbol; + using lumiera::Query; + using lumiera::query::normalizeID; - using cinelerra::ConfigRules; - using cinelerra::query::QueryHandler; + using lumiera::ConfigRules; + using lumiera::query::QueryHandler; diff --git a/tests/components/proc/mobject/session/defsmanagertest.cpp b/tests/components/proc/mobject/session/defsmanagertest.cpp index 16c09336a..b1c768836 100644 --- a/tests/components/proc/mobject/session/defsmanagertest.cpp +++ b/tests/components/proc/mobject/session/defsmanagertest.cpp @@ -1,8 +1,8 @@ /* DefsManager(Test) - checking basic behaviour of the defaults manager - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -43,8 +43,8 @@ namespace asset namespace test { using mobject::Session; - using cinelerra::Query; - using cinelerra::query::normalizeID; + using lumiera::Query; + using lumiera::query::normalizeID; /** shortcut: run just a query diff --git a/tests/components/proc/mobject/session/deletecliptest.cpp b/tests/components/proc/mobject/session/deletecliptest.cpp index bc7dc2229..6f1e387e5 100644 --- a/tests/components/proc/mobject/session/deletecliptest.cpp +++ b/tests/components/proc/mobject/session/deletecliptest.cpp @@ -1,8 +1,8 @@ /* DeleteClip(Test) - removing an Clip-MObject from the Session - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/mobject/session/rebuildfixturetest.cpp b/tests/components/proc/mobject/session/rebuildfixturetest.cpp index 48d2726ac..ffb43a32b 100644 --- a/tests/components/proc/mobject/session/rebuildfixturetest.cpp +++ b/tests/components/proc/mobject/session/rebuildfixturetest.cpp @@ -1,8 +1,8 @@ /* RebuildFixture(Test) - (re)building the explicit placements - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/mobject/session/sessionmanagertest.cpp b/tests/components/proc/mobject/session/sessionmanagertest.cpp index 409e53b46..3dcf1716d 100644 --- a/tests/components/proc/mobject/session/sessionmanagertest.cpp +++ b/tests/components/proc/mobject/session/sessionmanagertest.cpp @@ -1,8 +1,8 @@ /* SessionManager(Test) - accessing, loading and saving the Session/EDL - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/mobject/session/sessionstructuretest.cpp b/tests/components/proc/mobject/session/sessionstructuretest.cpp index fc91d886b..5d3eaded3 100644 --- a/tests/components/proc/mobject/session/sessionstructuretest.cpp +++ b/tests/components/proc/mobject/session/sessionstructuretest.cpp @@ -1,8 +1,8 @@ /* SessionStructure(Test) - verifying basic Session/EDL structure - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/mobject/session/testclip.cpp b/tests/components/proc/mobject/session/testclip.cpp index d79124020..ea17dd19d 100644 --- a/tests/components/proc/mobject/session/testclip.cpp +++ b/tests/components/proc/mobject/session/testclip.cpp @@ -1,8 +1,8 @@ /* TestClip - test clip (stub) for checking EDL/Session functionality - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -44,7 +44,7 @@ namespace mobject asset::Media & createTestMedia () { - // install Mock-Interface to cinelerra backend + // install Mock-Interface to Lumiera backend MAF::instance.injectSubclass (new MediaAccessMock); PM media = asset::Media::create("test-2", VIDEO); // query magic filename MAF::instance.injectSubclass (0); // remove Mock-Interface @@ -70,7 +70,7 @@ namespace mobject { } }; - cinelerra::Singleton testbed_1; // invoke ctor when creating first TestClip... + lumiera::Singleton testbed_1; // invoke ctor when creating first TestClip... diff --git a/tests/components/proc/mobject/session/testclip.hpp b/tests/components/proc/mobject/session/testclip.hpp index 77209e84d..63ac8475a 100644 --- a/tests/components/proc/mobject/session/testclip.hpp +++ b/tests/components/proc/mobject/session/testclip.hpp @@ -1,8 +1,8 @@ /* TESTCLIP.hpp - test clip (stub) for checking EDL/Session functionality - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/components/proc/mobject/session/testsession1.hpp b/tests/components/proc/mobject/session/testsession1.hpp index b749d084d..d9c422f2f 100644 --- a/tests/components/proc/mobject/session/testsession1.hpp +++ b/tests/components/proc/mobject/session/testsession1.hpp @@ -1,8 +1,8 @@ /* TESTSESSION1.hpp - complete session configuration used for various tests - Copyright (C) CinelerraCV - 2007, Hermann Vosseler + Copyright (C) Lumiera.org + 2008, Hermann Vosseler This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/tests/error/errortest.c b/tests/error/errortest.c index 96d49b851..d367c0742 100644 --- a/tests/error/errortest.c +++ b/tests/error/errortest.c @@ -1,8 +1,8 @@ /* errortest.c - test error handling - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -25,7 +25,7 @@ #include "lib/error.h" -CINELERRA_ERROR_DEFINE(TEST, "test error"); +LUMIERA_ERROR_DEFINE(TEST, "test error"); int main (int argc, char** argv) @@ -35,31 +35,31 @@ main (int argc, char** argv) if (!strcmp(argv[1], "set")) { - cinelerra_error_set (CINELERRA_ERROR_TEST); + lumiera_error_set (LUMIERA_ERROR_TEST); } if (!strcmp(argv[1], "get_no")) { const char* err; - err = cinelerra_error (); + err = lumiera_error (); printf ("%p\n", err); } if (!strcmp(argv[1], "get")) { - cinelerra_error_set (CINELERRA_ERROR_TEST); + lumiera_error_set (LUMIERA_ERROR_TEST); const char* err; - err = cinelerra_error (); + err = lumiera_error (); printf ("%s\n", err); } if (!strcmp(argv[1], "get2")) { - cinelerra_error_set (CINELERRA_ERROR_TEST); + lumiera_error_set (LUMIERA_ERROR_TEST); const char* err; - err = cinelerra_error (); + err = lumiera_error (); printf ("%s\n", err); - err = cinelerra_error (); + err = lumiera_error (); printf ("%p\n", err); } diff --git a/tests/library/test-llist.c b/tests/library/test-llist.c index 66cc50ade..bfaf99c65 100644 --- a/tests/library/test-llist.c +++ b/tests/library/test-llist.c @@ -1,8 +1,8 @@ /* test-llist.c - test the linked lis lib - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -26,7 +26,7 @@ #include "lib/framerate.h" -CINELERRA_ERROR_DEFINE(TEST, "test error"); +LUMIERA_ERROR_DEFINE(TEST, "test error"); int main (int argc, char** argv) diff --git a/tests/library/test-references.c b/tests/library/test-references.c index f00de97b2..c1509c341 100644 --- a/tests/library/test-references.c +++ b/tests/library/test-references.c @@ -1,8 +1,8 @@ /* test-references.c - test strong and weak references - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -25,7 +25,7 @@ #include "lib/references.h" -CINELERRA_ERROR_DEFINE(TEST, "test error"); +LUMIERA_ERROR_DEFINE(TEST, "test error"); struct example @@ -55,16 +55,16 @@ main (int argc, char** argv) struct example test; test.foo = 123; - cinelerra_reference hold; + lumiera_reference hold; - cinelerra_reference_strong_init_once (&hold, &test, example_dtor); + lumiera_reference_strong_init_once (&hold, &test, example_dtor); - struct example* r = cinelerra_reference_get (&hold); + struct example* r = lumiera_reference_get (&hold); printf ("got: %d\n", r->foo); - cinelerra_reference_destroy (&hold); + lumiera_reference_destroy (&hold); } else if (!strcmp(argv[1], "nodeinsert")) { diff --git a/tests/locking/condition.c b/tests/locking/condition.c index 72b56285c..7d79e9a7e 100644 --- a/tests/locking/condition.c +++ b/tests/locking/condition.c @@ -1,8 +1,8 @@ /* test condition functions - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -40,10 +40,10 @@ signaling_thread() int conditionforgotunlock () { - cinelerra_condition c; - cinelerra_condition_init (&c); + lumiera_condition c; + lumiera_condition_init (&c); - cinelerra_conditionacquirer l; - cinelerra_conditionacquirer_init (&l, &c, CINELERRA_LOCKED); + lumiera_conditionacquirer l; + lumiera_conditionacquirer_init (&l, &c, LUMIERA_LOCKED); return 0; } diff --git a/tests/locking/mutex.c b/tests/locking/mutex.c index 3e9b58d8e..f4f8c18f6 100644 --- a/tests/locking/mutex.c +++ b/tests/locking/mutex.c @@ -1,8 +1,8 @@ /* test mutex functions - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -23,10 +23,10 @@ int mutexforgotunlock() { - cinelerra_mutex m; - cinelerra_mutex_init (&m); + lumiera_mutex m; + lumiera_mutex_init (&m); - cinelerra_mutexacquirer l; - cinelerra_mutexacquirer_init_mutex (&l, &m, CINELERRA_LOCKED); + lumiera_mutexacquirer l; + lumiera_mutexacquirer_init_mutex (&l, &m, LUMIERA_LOCKED); return 0; } diff --git a/tests/locking/test-condition.c b/tests/locking/test-condition.c index 6f0f32365..1e3ca1bf7 100644 --- a/tests/locking/test-condition.c +++ b/tests/locking/test-condition.c @@ -1,8 +1,8 @@ /* test-locking.c - test locking functions - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -24,7 +24,7 @@ #include "lib/condition.h" -CINELERRA_ERROR_DEFINE(TEST, "test error"); +LUMIERA_ERROR_DEFINE(TEST, "test error"); #if 0 waiting_thread() @@ -52,11 +52,11 @@ main (int argc, char** argv) if (!strcmp(argv[1], "conditionforgotunlock")) { - cinelerra_condition c; - cinelerra_condition_init (&c); + lumiera_condition c; + lumiera_condition_init (&c); - cinelerra_conditionlock NOBUG_CLEANUP(cinelerra_conditionlock_ensureunlocked) l; - cinelerra_conditionlock_init (&l, &c, CINELERRA_LOCKED); + lumiera_conditionlock NOBUG_CLEANUP(lumiera_conditionlock_ensureunlocked) l; + lumiera_conditionlock_init (&l, &c, LUMIERA_LOCKED); } else return 1; diff --git a/tests/locking/test-locking.c b/tests/locking/test-locking.c index 78bc99779..1b54d152e 100644 --- a/tests/locking/test-locking.c +++ b/tests/locking/test-locking.c @@ -1,8 +1,8 @@ /* test-locking.c - test locking functions - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -24,7 +24,7 @@ #include "lib/error.h" -CINELERRA_ERROR_DEFINE(TEST, "test error"); +LUMIERA_ERROR_DEFINE(TEST, "test error"); int conditionforgotunlock (); int mutexforgotunlock (); diff --git a/tests/plugin/DIR_INFO b/tests/plugin/DIR_INFO index 19ed2b9e2..c051168cc 100644 --- a/tests/plugin/DIR_INFO +++ b/tests/plugin/DIR_INFO @@ -1,3 +1,3 @@ -working example code for cinelerra's plugin system +working example code for Lumiera's plugin system This directory contains example code which shows how to use specific features. All examples will be build and run as part of the testsuite diff --git a/tests/plugin/Makefile.am b/tests/plugin/Makefile.am index fa5d52962..c6afc8e36 100644 --- a/tests/plugin/Makefile.am +++ b/tests/plugin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) CinelerraCV +# Copyright (C) Lumiera.org # 2007, Christian Thaeter # # This program is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ noinst_PROGRAMS += test-plugin test_plugin_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Werror test_plugin_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src -test_plugin_LDADD = libcin3.a -lnobugmt -lpthread -ldl +test_plugin_LDADD = liblumi.a -lnobugmt -lpthread -ldl test_plugin_SOURCES = $(examples_srcdir)/plugin_main.c noinst_HEADERS += $(examples_srcdir)/hello_interface.h diff --git a/tests/plugin/example_plugin.c b/tests/plugin/example_plugin.c index ebb71ae8a..7540aa35d 100644 --- a/tests/plugin/example_plugin.c +++ b/tests/plugin/example_plugin.c @@ -34,12 +34,12 @@ void bye(const char* m) printf("Bye %s\n", m); } -CINELERRA_INTERFACE_IMPLEMENT(hello, 1, german, myopen, myclose, - hallo, - tschuess - ); +LUMIERA_INTERFACE_IMPLEMENT(hello, 1, german, myopen, myclose, + hallo, + tschuess + ); -CINELERRA_INTERFACE_IMPLEMENT(hello, 1, english, myopen, myclose, - hello, - bye - ); +LUMIERA_INTERFACE_IMPLEMENT(hello, 1, english, myopen, myclose, + hello, + bye + ); diff --git a/tests/plugin/example_plugin.cpp b/tests/plugin/example_plugin.cpp index b608887d8..aba34b44a 100644 --- a/tests/plugin/example_plugin.cpp +++ b/tests/plugin/example_plugin.cpp @@ -50,12 +50,12 @@ public: }; -CINELERRA_INTERFACE_IMPLEMENT(hello, 1, german, example_plugin_de::myopen, example_plugin_de::myclose, - example_plugin_de::hello, - example_plugin_de::bye - ); +LUMIERA_INTERFACE_IMPLEMENT(hello, 1, german, example_plugin_de::myopen, example_plugin_de::myclose, + example_plugin_de::hello, + example_plugin_de::bye + ); -CINELERRA_INTERFACE_IMPLEMENT(hello, 1, english, example_plugin_en::myopen, example_plugin_en::myclose, - example_plugin_en::hello, - example_plugin_en::bye - ); +LUMIERA_INTERFACE_IMPLEMENT(hello, 1, english, example_plugin_en::myopen, example_plugin_en::myclose, + example_plugin_en::hello, + example_plugin_en::bye + ); diff --git a/tests/plugin/hello_interface.h b/tests/plugin/hello_interface.h index ccec270ed..d5cf99ea5 100644 --- a/tests/plugin/hello_interface.h +++ b/tests/plugin/hello_interface.h @@ -1,6 +1,6 @@ #include "lib/plugin.h" -CINELERRA_INTERFACE(hello, 1, - CINELERRA_INTERFACE_PROTO(void, hello, (void)) - CINELERRA_INTERFACE_PROTO(void, goodbye, (const char*)) - ); +LUMIERA_INTERFACE(hello, 1, + LUMIERA_INTERFACE_PROTO(void, hello, (void)) + LUMIERA_INTERFACE_PROTO(void, goodbye, (const char*)) + ); diff --git a/tests/plugin/plugin_main.c b/tests/plugin/plugin_main.c index e691438b3..2efe32471 100644 --- a/tests/plugin/plugin_main.c +++ b/tests/plugin/plugin_main.c @@ -12,7 +12,7 @@ main(int argc, char** argv) if (argc < 2) return -1; - cinelerra_init_plugin (); + lumiera_init_plugin (); /* we have a plugin 'hello_1' which provides us 2 hello interfaces, one for english and one for german output, open both try them, close them. @@ -22,47 +22,47 @@ main(int argc, char** argv) if( !strcmp(argv[1],"C")) { - CINELERRA_INTERFACE_TYPE(hello, 1)* hello_de = - (CINELERRA_INTERFACE_TYPE(hello, 1)*) cinelerra_interface_open ("example_plugin", "german_1", sizeof(CINELERRA_INTERFACE_TYPE(hello, 1))); + LUMIERA_INTERFACE_TYPE(hello, 1)* hello_de = + (LUMIERA_INTERFACE_TYPE(hello, 1)*) lumiera_interface_open ("example_plugin", "german_1", sizeof(LUMIERA_INTERFACE_TYPE(hello, 1))); - if (!hello_de) CINELERRA_DIE; + if (!hello_de) LUMIERA_DIE; hello_de->hello(); hello_de->goodbye(argv[1]); - CINELERRA_INTERFACE_TYPE(hello, 1)* hello_en = - (CINELERRA_INTERFACE_TYPE(hello, 1)*) cinelerra_interface_open ("example_plugin", "english_1", sizeof(CINELERRA_INTERFACE_TYPE(hello, 1))); + LUMIERA_INTERFACE_TYPE(hello, 1)* hello_en = + (LUMIERA_INTERFACE_TYPE(hello, 1)*) lumiera_interface_open ("example_plugin", "english_1", sizeof(LUMIERA_INTERFACE_TYPE(hello, 1))); - if (!hello_en) CINELERRA_DIE; + if (!hello_en) LUMIERA_DIE; hello_en->hello(); hello_en->goodbye(argv[1]); - cinelerra_interface_close (hello_en); - cinelerra_interface_close (hello_de); + lumiera_interface_close (hello_en); + lumiera_interface_close (hello_de); } if( !strcmp(argv[1],"C++")) { /* same again for a plugin written in C++ */ - CINELERRA_INTERFACE_TYPE(hello, 1)* hello_de = - (CINELERRA_INTERFACE_TYPE(hello, 1)*) cinelerra_interface_open ("example_plugin_cpp", "german_1", sizeof(CINELERRA_INTERFACE_TYPE(hello, 1))); + LUMIERA_INTERFACE_TYPE(hello, 1)* hello_de = + (LUMIERA_INTERFACE_TYPE(hello, 1)*) lumiera_interface_open ("example_plugin_cpp", "german_1", sizeof(LUMIERA_INTERFACE_TYPE(hello, 1))); - if (!hello_de) CINELERRA_DIE; + if (!hello_de) LUMIERA_DIE; hello_de->hello(); hello_de->goodbye(argv[1]); - CINELERRA_INTERFACE_TYPE(hello, 1)* hello_en = - (CINELERRA_INTERFACE_TYPE(hello, 1)*) cinelerra_interface_open ("example_plugin_cpp", "english_1", sizeof(CINELERRA_INTERFACE_TYPE(hello, 1))); + LUMIERA_INTERFACE_TYPE(hello, 1)* hello_en = + (LUMIERA_INTERFACE_TYPE(hello, 1)*) lumiera_interface_open ("example_plugin_cpp", "english_1", sizeof(LUMIERA_INTERFACE_TYPE(hello, 1))); - if (!hello_en) CINELERRA_DIE; + if (!hello_en) LUMIERA_DIE; hello_en->hello(); hello_en->goodbye(argv[1]); - cinelerra_interface_close (hello_en); - cinelerra_interface_close (hello_de); + lumiera_interface_close (hello_en); + lumiera_interface_close (hello_de); } return 0; diff --git a/tests/test.sh b/tests/test.sh index 1e4256eb2..b692b3959 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) CinelerraCV +# Copyright (C) Lumiera.org # 2007, Christian Thaeter # Hermann Vosseler # diff --git a/tests/time/test-time.c b/tests/time/test-time.c index 519a65781..e9d8d0550 100644 --- a/tests/time/test-time.c +++ b/tests/time/test-time.c @@ -1,8 +1,8 @@ /* test-time.c - test time and framerate functions - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, 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 @@ -26,7 +26,7 @@ #include "lib/framerate.h" -CINELERRA_ERROR_DEFINE(TEST, "test error"); +LUMIERA_ERROR_DEFINE(TEST, "test error"); int main (int argc, char** argv) @@ -38,106 +38,106 @@ main (int argc, char** argv) if (!strcmp(argv[1], "init")) { - cinelerra_time time; + lumiera_time time; - cinelerra_time_init (&time, atol (argv[2]), atol(argv[3])); + lumiera_time_init (&time, atol (argv[2]), atol(argv[3])); - printf ("%lu %lu\n", (long)cinelerra_time_sec (&time), (long)cinelerra_time_usec (&time)); + printf ("%lu %lu\n", (long)lumiera_time_sec (&time), (long)lumiera_time_usec (&time)); } if (!strcmp(argv[1], "todouble")) { - cinelerra_time time; + lumiera_time time; - cinelerra_time_init (&time, atol (argv[2]), atol(argv[3])); + lumiera_time_init (&time, atol (argv[2]), atol(argv[3])); - printf ("%g\n", cinelerra_time_double_get (&time)); + printf ("%g\n", lumiera_time_double_get (&time)); } if (!strcmp(argv[1], "todoublenull")) { - printf ("%g\n", cinelerra_time_double_get (NULL)); + printf ("%g\n", lumiera_time_double_get (NULL)); } if (!strcmp(argv[1], "fromdouble")) { - cinelerra_time time; + lumiera_time time; - cinelerra_time_set_double (&time, atof (argv[2])); + lumiera_time_set_double (&time, atof (argv[2])); - printf ("%lu %lu\n", (long)cinelerra_time_sec (&time), (long)cinelerra_time_usec (&time)); + printf ("%lu %lu\n", (long)lumiera_time_sec (&time), (long)lumiera_time_usec (&time)); } if (!strcmp(argv[1], "currenttime")) { - cinelerra_time time; + lumiera_time time; - cinelerra_time_current (&time); + lumiera_time_current (&time); - printf ("%lu %lu\n", (long)cinelerra_time_sec (&time), (long)cinelerra_time_usec (&time)); + printf ("%lu %lu\n", (long)lumiera_time_sec (&time), (long)lumiera_time_usec (&time)); } if (!strcmp(argv[1], "add")) { - cinelerra_time time1, time2; + lumiera_time time1, time2; - cinelerra_time_init (&time1, 0, atol (argv[2])); - cinelerra_time_init (&time2, 0, atol (argv[3])); - cinelerra_time_add (&time1, &time2); + lumiera_time_init (&time1, 0, atol (argv[2])); + lumiera_time_init (&time2, 0, atol (argv[3])); + lumiera_time_add (&time1, &time2); - printf ("%lu %lu\n", (long)cinelerra_time_sec (&time1), (long)cinelerra_time_usec (&time1)); + printf ("%lu %lu\n", (long)lumiera_time_sec (&time1), (long)lumiera_time_usec (&time1)); } if (!strcmp(argv[1], "sub")) { - cinelerra_time time1, time2; + lumiera_time time1, time2; - cinelerra_time_init (&time1, 0, atol (argv[2])); - cinelerra_time_init (&time2, 0, atol (argv[3])); - cinelerra_time_sub (&time1, &time2); + lumiera_time_init (&time1, 0, atol (argv[2])); + lumiera_time_init (&time2, 0, atol (argv[3])); + lumiera_time_sub (&time1, &time2); - printf ("%lu %lu\n", (long)cinelerra_time_sec (&time1), (long)cinelerra_time_usec (&time1)); + printf ("%lu %lu\n", (long)lumiera_time_sec (&time1), (long)lumiera_time_usec (&time1)); } if (!strcmp(argv[1], "ntscframefromtime")) { - cinelerra_framerate ntsc = {30000, 1001}; - cinelerra_time time; + lumiera_framerate ntsc = {30000, 1001}; + lumiera_time time; - cinelerra_time_init (&time, atol (argv[2]), atol (argv[3])); + lumiera_time_init (&time, atol (argv[2]), atol (argv[3])); - printf ("%lu\n", (long)cinelerra_framerate_frame_get_time (&ntsc, &time)); + printf ("%lu\n", (long)lumiera_framerate_frame_get_time (&ntsc, &time)); } if (!strcmp(argv[1], "ntscframestart")) { - cinelerra_framerate ntsc = {30000, 1001}; - cinelerra_time time; + lumiera_framerate ntsc = {30000, 1001}; + lumiera_time time; - if(cinelerra_framerate_time_get_time_frame (&ntsc, &time, atol (argv[2]))) - printf ("%lu %lu\n", (long)cinelerra_time_sec(&time), (long)cinelerra_time_usec(&time)); + if(lumiera_framerate_time_get_time_frame (&ntsc, &time, atol (argv[2]))) + printf ("%lu %lu\n", (long)lumiera_time_sec(&time), (long)lumiera_time_usec(&time)); } if (!strcmp(argv[1], "ntscframecheck")) { - cinelerra_framerate ntsc = {30000, 1001}; - cinelerra_time time1; - cinelerra_time time2; - cinelerra_framepos frame; + lumiera_framerate ntsc = {30000, 1001}; + lumiera_time time1; + lumiera_time time2; + lumiera_framepos frame; - cinelerra_framepos frame1; - cinelerra_framepos frame2; + lumiera_framepos frame1; + lumiera_framepos frame2; frame = atol (argv[2]); - if (cinelerra_framerate_time_get_time_frame (&ntsc, &time1, frame)) + if (lumiera_framerate_time_get_time_frame (&ntsc, &time1, frame)) { - printf("frame %lu ", frame1 = cinelerra_framerate_frame_get_time (&ntsc, &time1)); + printf("frame %lu ", frame1 = lumiera_framerate_frame_get_time (&ntsc, &time1)); - cinelerra_time_init (&time2, 0, 1); - cinelerra_time_sub (&time1, &time2); - printf("%lu\n", frame2 = cinelerra_framerate_frame_get_time (&ntsc, &time1)); + lumiera_time_init (&time2, 0, 1); + lumiera_time_sub (&time1, &time2); + printf("%lu\n", frame2 = lumiera_framerate_frame_get_time (&ntsc, &time1)); ENSURE (frame1 == frame2+1); } diff --git a/uml/cinelerra3/DIR_INFO b/uml/cinelerra3/DIR_INFO deleted file mode 100644 index c9bfb0e73..000000000 --- a/uml/cinelerra3/DIR_INFO +++ /dev/null @@ -1 +0,0 @@ -cinelerra3 UML model diff --git a/uml/cinelerra3/128005 b/uml/lumiera/128005 similarity index 98% rename from uml/cinelerra3/128005 rename to uml/lumiera/128005 index e16107985..b6932706b 100644 --- a/uml/cinelerra3/128005 +++ b/uml/lumiera/128005 @@ -32,7 +32,7 @@ Not a real code package, rather a container for design drafts, specifications, d //component diagram settings package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default draw_component_as_icon default show_component_req_prov default show_component_rea default - comment "The various Components comprising the Cinelerra3 Video editing Application" + comment "The various Components comprising the Lumiera Video editing Application" componentdiagram 128005 "Overview" package_name_in_tab default show_context default auto_label_position default draw_all_relations no shadow default draw_component_as_icon default show_component_req_prov default show_component_rea default diff --git a/uml/cinelerra3/128005.diagram b/uml/lumiera/128005.diagram similarity index 100% rename from uml/cinelerra3/128005.diagram rename to uml/lumiera/128005.diagram diff --git a/uml/cinelerra3/128133 b/uml/lumiera/128133 similarity index 99% rename from uml/cinelerra3/128133 rename to uml/lumiera/128133 index fe9ce6164..badc25cfd 100644 --- a/uml/cinelerra3/128133 +++ b/uml/lumiera/128133 @@ -116,7 +116,7 @@ ${members}}; " java_decl "" idl_decl "" - comment "origin or authorship id. Can be a project abbreviation, a package id or just the authors nickname or UID. This allows for the compnent name to be more generic (e.g. \"blur\"). Default for all assets provided by the core cinelerra-3 codebase is \"cin3\"." + comment "origin or authorship id. Can be a project abbreviation, a package id or just the authors nickname or UID. This allows for the compnent name to be more generic (e.g. \"blur\"). Default for all assets provided by the core Lumiera codebase is \"lumi\"." end attribute 130949 "version" diff --git a/uml/cinelerra3/128133.diagram b/uml/lumiera/128133.diagram similarity index 100% rename from uml/cinelerra3/128133.diagram rename to uml/lumiera/128133.diagram diff --git a/uml/cinelerra3/128138 b/uml/lumiera/128138 similarity index 100% rename from uml/cinelerra3/128138 rename to uml/lumiera/128138 diff --git a/uml/cinelerra3/128181.diagram b/uml/lumiera/128181.diagram similarity index 100% rename from uml/cinelerra3/128181.diagram rename to uml/lumiera/128181.diagram diff --git a/uml/cinelerra3/128261 b/uml/lumiera/128261 similarity index 100% rename from uml/cinelerra3/128261 rename to uml/lumiera/128261 diff --git a/uml/cinelerra3/128261.diagram b/uml/lumiera/128261.diagram similarity index 100% rename from uml/cinelerra3/128261.diagram rename to uml/lumiera/128261.diagram diff --git a/uml/cinelerra3/128389 b/uml/lumiera/128389 similarity index 100% rename from uml/cinelerra3/128389 rename to uml/lumiera/128389 diff --git a/uml/cinelerra3/128389.diagram b/uml/lumiera/128389.diagram similarity index 100% rename from uml/cinelerra3/128389.diagram rename to uml/lumiera/128389.diagram diff --git a/uml/cinelerra3/128517 b/uml/lumiera/128517 similarity index 98% rename from uml/cinelerra3/128517 rename to uml/lumiera/128517 index 6a6b8ee00..14fa5def7 100644 --- a/uml/cinelerra3/128517 +++ b/uml/lumiera/128517 @@ -45,7 +45,7 @@ format 40 classdiagram 130181 "Hierarchy" draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default - comment "Cinelerra Exception hierarchy" + comment "Lumiera Exception hierarchy" size A4 end @@ -406,7 +406,7 @@ ${class}::${name} ${(}${)}${volatile} ${throw} comment "perform initialization on first access. A call is placed in static initialization code -included in cinelerra.h; thus it will happen +included in lumiera.h; thus it will happen ubiquitous very early." end @@ -466,7 +466,7 @@ ${inlines} idl_decl "" explicit_switch_type "" - comment "We can basically reuse the Thread class design from cinelerra2, Thread becomes a baseclass for all Threads " + comment "We can basically reuse the Thread class design from Cinelerra2, Thread becomes a baseclass for all Threads " end class 128266 "Condition" @@ -479,7 +479,7 @@ ${inlines} idl_decl "" explicit_switch_type "" - comment "I provided a reworked Condition class in my cinelerra2 repository" + comment "I provided a reworked Condition class in my Cinelerra2 repository" class 128522 "Lock" visibility package cpp_decl "${comment}${template}class ${name}${inherit} { @@ -503,7 +503,7 @@ ${inlines} idl_decl "" explicit_switch_type "" - comment "I provided a reworked Mutex class in my cinelerra2 repository" + comment "I provided a reworked Mutex class in my Cinelerra2 repository" class 128650 "Lock" visibility package cpp_decl "${comment}${template}class ${name}${inherit} { diff --git a/uml/cinelerra3/128517.diagram b/uml/lumiera/128517.diagram similarity index 100% rename from uml/cinelerra3/128517.diagram rename to uml/lumiera/128517.diagram diff --git a/uml/cinelerra3/128645 b/uml/lumiera/128645 similarity index 98% rename from uml/cinelerra3/128645 rename to uml/lumiera/128645 index 523b89109..e1de4d311 100644 --- a/uml/cinelerra3/128645 +++ b/uml/lumiera/128645 @@ -32,14 +32,14 @@ format 40 package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default draw_component_as_icon default show_component_req_prov default show_component_rea default component_color lightred - comment "defines and lists how the Cinelerra executable has to be created" + comment "defines and lists how the Lumiera executable has to be created" deploymentdiagram 129797 "Source Overview" package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default draw_component_as_icon default show_component_req_prov default show_component_rea default size A4 end - artifact 128005 "Cinelerra3" + artifact 128005 "Lumiera" stereotype "executable" associated_artifacts artifact_ref 133509 // vrender diff --git a/uml/cinelerra3/128645.diagram b/uml/lumiera/128645.diagram similarity index 100% rename from uml/cinelerra3/128645.diagram rename to uml/lumiera/128645.diagram diff --git a/uml/cinelerra3/128773 b/uml/lumiera/128773 similarity index 100% rename from uml/cinelerra3/128773 rename to uml/lumiera/128773 diff --git a/uml/cinelerra3/128773.diagram b/uml/lumiera/128773.diagram similarity index 100% rename from uml/cinelerra3/128773.diagram rename to uml/lumiera/128773.diagram diff --git a/uml/cinelerra3/128901 b/uml/lumiera/128901 similarity index 100% rename from uml/cinelerra3/128901 rename to uml/lumiera/128901 diff --git a/uml/cinelerra3/128901.diagram b/uml/lumiera/128901.diagram similarity index 100% rename from uml/cinelerra3/128901.diagram rename to uml/lumiera/128901.diagram diff --git a/uml/cinelerra3/129029 b/uml/lumiera/129029 similarity index 100% rename from uml/cinelerra3/129029 rename to uml/lumiera/129029 diff --git a/uml/cinelerra3/129029.diagram b/uml/lumiera/129029.diagram similarity index 100% rename from uml/cinelerra3/129029.diagram rename to uml/lumiera/129029.diagram diff --git a/uml/cinelerra3/129157 b/uml/lumiera/129157 similarity index 100% rename from uml/cinelerra3/129157 rename to uml/lumiera/129157 diff --git a/uml/cinelerra3/129157.diagram b/uml/lumiera/129157.diagram similarity index 100% rename from uml/cinelerra3/129157.diagram rename to uml/lumiera/129157.diagram diff --git a/uml/cinelerra3/129285 b/uml/lumiera/129285 similarity index 100% rename from uml/cinelerra3/129285 rename to uml/lumiera/129285 diff --git a/uml/cinelerra3/129285.diagram b/uml/lumiera/129285.diagram similarity index 100% rename from uml/cinelerra3/129285.diagram rename to uml/lumiera/129285.diagram diff --git a/uml/cinelerra3/129413 b/uml/lumiera/129413 similarity index 98% rename from uml/cinelerra3/129413 rename to uml/lumiera/129413 index efe41073b..a4a3e7283 100644 --- a/uml/cinelerra3/129413 +++ b/uml/lumiera/129413 @@ -29,7 +29,7 @@ format 40 stereotype "src" cpp_h_dir "common" cpp_src_dir "common" - cpp_namespace "cinelerra" + cpp_namespace "lumiera" associated_diagram deploymentdiagram_ref 129797 // Source Overview comment "sourcecode package @@ -121,7 +121,7 @@ ${namespace_end}" class_ref 136069 // Invalid class_ref 136197 // External end - comment "Cinelerra Exception Interface" + comment "Lumiera Exception Interface" end artifact 135173 "appconfig" diff --git a/uml/cinelerra3/129413.diagram b/uml/lumiera/129413.diagram similarity index 100% rename from uml/cinelerra3/129413.diagram rename to uml/lumiera/129413.diagram diff --git a/uml/cinelerra3/129541 b/uml/lumiera/129541 similarity index 100% rename from uml/cinelerra3/129541 rename to uml/lumiera/129541 diff --git a/uml/cinelerra3/129541.diagram b/uml/lumiera/129541.diagram similarity index 100% rename from uml/cinelerra3/129541.diagram rename to uml/lumiera/129541.diagram diff --git a/uml/cinelerra3/129669 b/uml/lumiera/129669 similarity index 100% rename from uml/cinelerra3/129669 rename to uml/lumiera/129669 diff --git a/uml/cinelerra3/129669.diagram b/uml/lumiera/129669.diagram similarity index 100% rename from uml/cinelerra3/129669.diagram rename to uml/lumiera/129669.diagram diff --git a/uml/cinelerra3/129797 b/uml/lumiera/129797 similarity index 100% rename from uml/cinelerra3/129797 rename to uml/lumiera/129797 diff --git a/uml/cinelerra3/129797.diagram b/uml/lumiera/129797.diagram similarity index 96% rename from uml/cinelerra3/129797.diagram rename to uml/lumiera/129797.diagram index 7c7216678..75bed9aaf 100644 --- a/uml/cinelerra3/129797.diagram +++ b/uml/lumiera/129797.diagram @@ -1,6 +1,6 @@ format 40 -artifactcanvas 128005 artifact_ref 128005 // Cinelerra3 +artifactcanvas 128005 artifact_ref 128005 // Lumiera color midred xyz 47 45 2000 packagecanvas 128133 diff --git a/uml/cinelerra3/129925 b/uml/lumiera/129925 similarity index 100% rename from uml/cinelerra3/129925 rename to uml/lumiera/129925 diff --git a/uml/cinelerra3/129925.diagram b/uml/lumiera/129925.diagram similarity index 100% rename from uml/cinelerra3/129925.diagram rename to uml/lumiera/129925.diagram diff --git a/uml/cinelerra3/130053 b/uml/lumiera/130053 similarity index 100% rename from uml/cinelerra3/130053 rename to uml/lumiera/130053 diff --git a/uml/cinelerra3/130053.diagram b/uml/lumiera/130053.diagram similarity index 100% rename from uml/cinelerra3/130053.diagram rename to uml/lumiera/130053.diagram diff --git a/uml/cinelerra3/130181 b/uml/lumiera/130181 similarity index 100% rename from uml/cinelerra3/130181 rename to uml/lumiera/130181 diff --git a/uml/cinelerra3/130181.diagram b/uml/lumiera/130181.diagram similarity index 100% rename from uml/cinelerra3/130181.diagram rename to uml/lumiera/130181.diagram diff --git a/uml/cinelerra3/130309 b/uml/lumiera/130309 similarity index 100% rename from uml/cinelerra3/130309 rename to uml/lumiera/130309 diff --git a/uml/cinelerra3/130309.diagram b/uml/lumiera/130309.diagram similarity index 100% rename from uml/cinelerra3/130309.diagram rename to uml/lumiera/130309.diagram diff --git a/uml/cinelerra3/130437 b/uml/lumiera/130437 similarity index 100% rename from uml/cinelerra3/130437 rename to uml/lumiera/130437 diff --git a/uml/cinelerra3/130437.diagram b/uml/lumiera/130437.diagram similarity index 100% rename from uml/cinelerra3/130437.diagram rename to uml/lumiera/130437.diagram diff --git a/uml/cinelerra3/130565 b/uml/lumiera/130565 similarity index 100% rename from uml/cinelerra3/130565 rename to uml/lumiera/130565 diff --git a/uml/cinelerra3/130693 b/uml/lumiera/130693 similarity index 100% rename from uml/cinelerra3/130693 rename to uml/lumiera/130693 diff --git a/uml/cinelerra3/130693.diagram b/uml/lumiera/130693.diagram similarity index 100% rename from uml/cinelerra3/130693.diagram rename to uml/lumiera/130693.diagram diff --git a/uml/cinelerra3/130821 b/uml/lumiera/130821 similarity index 98% rename from uml/cinelerra3/130821 rename to uml/lumiera/130821 index 2823b3193..f7ca78b69 100644 --- a/uml/cinelerra3/130821 +++ b/uml/lumiera/130821 @@ -28,6 +28,6 @@ format 40 cpp_h_dir "common" cpp_src_dir "common" - cpp_namespace "cinelerra::error" + cpp_namespace "lumiera::error" comment "Namespace for Exception Kinds" end diff --git a/uml/cinelerra3/130821.diagram b/uml/lumiera/130821.diagram similarity index 100% rename from uml/cinelerra3/130821.diagram rename to uml/lumiera/130821.diagram diff --git a/uml/cinelerra3/130949 b/uml/lumiera/130949 similarity index 98% rename from uml/cinelerra3/130949 rename to uml/lumiera/130949 index 16a88747b..cd38b33c7 100644 --- a/uml/cinelerra3/130949 +++ b/uml/lumiera/130949 @@ -28,6 +28,6 @@ format 40 cpp_h_dir "common" cpp_src_dir "common" - cpp_namespace "cinelerra::visitor" + cpp_namespace "lumiera::visitor" comment "sub-namespace for visitor library implementation" end diff --git a/uml/cinelerra3/130949.diagram b/uml/lumiera/130949.diagram similarity index 100% rename from uml/cinelerra3/130949.diagram rename to uml/lumiera/130949.diagram diff --git a/uml/cinelerra3/131077.diagram b/uml/lumiera/131077.diagram similarity index 100% rename from uml/cinelerra3/131077.diagram rename to uml/lumiera/131077.diagram diff --git a/uml/cinelerra3/131205.diagram b/uml/lumiera/131205.diagram similarity index 100% rename from uml/cinelerra3/131205.diagram rename to uml/lumiera/131205.diagram diff --git a/uml/cinelerra3/131333.diagram b/uml/lumiera/131333.diagram similarity index 100% rename from uml/cinelerra3/131333.diagram rename to uml/lumiera/131333.diagram diff --git a/uml/cinelerra3/134021.bodies b/uml/lumiera/134021.bodies similarity index 100% rename from uml/cinelerra3/134021.bodies rename to uml/lumiera/134021.bodies diff --git a/uml/cinelerra3/5.session b/uml/lumiera/5.session similarity index 89% rename from uml/cinelerra3/5.session rename to uml/lumiera/5.session index af98eb2ed..2d78dfa96 100644 --- a/uml/cinelerra3/5.session +++ b/uml/lumiera/5.session @@ -11,8 +11,10 @@ diagrams end show_stereotypes selected - package_ref 129 // cinelerra3 +package_ref 129 // lumiera open + componentview_ref 128133 // interfaces + deploymentview_ref 128133 // EXE Deployment deploymentview_ref 128645 // gen class_ref 137477 // Unknown class_ref 137605 // Preview diff --git a/uml/lumiera/DIR_INFO b/uml/lumiera/DIR_INFO new file mode 100644 index 000000000..090f405b4 --- /dev/null +++ b/uml/lumiera/DIR_INFO @@ -0,0 +1 @@ +Lumiera UML model diff --git a/uml/cinelerra3/cpp_includes b/uml/lumiera/cpp_includes similarity index 100% rename from uml/cinelerra3/cpp_includes rename to uml/lumiera/cpp_includes diff --git a/uml/cinelerra3/generation_settings b/uml/lumiera/generation_settings similarity index 100% rename from uml/cinelerra3/generation_settings rename to uml/lumiera/generation_settings diff --git a/uml/cinelerra3/idl_includes b/uml/lumiera/idl_includes similarity index 100% rename from uml/cinelerra3/idl_includes rename to uml/lumiera/idl_includes diff --git a/uml/cinelerra3/java_imports b/uml/lumiera/java_imports similarity index 100% rename from uml/cinelerra3/java_imports rename to uml/lumiera/java_imports diff --git a/uml/cinelerra3/cinelerra3.prj b/uml/lumiera/lumiera.prj similarity index 97% rename from uml/cinelerra3/cinelerra3.prj rename to uml/lumiera/lumiera.prj index 9873f26df..555a8d3ba 100644 --- a/uml/cinelerra3/cinelerra3.prj +++ b/uml/lumiera/lumiera.prj @@ -1,5 +1,5 @@ format 40 -"cinelerra3" +"lumiera" revision 42 modified_by 5 "hiv" cpp_root_dir "../../src/" @@ -53,8 +53,8 @@ format 40 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. " key "CopyrightClaim" value " - Copyright (C) CinelerraCV - 2007, Christian Thaeter + Copyright (C) Lumiera.org + 2008, Christian Thaeter " key "html dir" value "/mnt/Lager/heim/devel/cin3/doc/devel/uml/" diff --git a/uml/cinelerra3/stereotypes b/uml/lumiera/stereotypes similarity index 100% rename from uml/cinelerra3/stereotypes rename to uml/lumiera/stereotypes diff --git a/uml/cinelerra3/tools b/uml/lumiera/tools similarity index 100% rename from uml/cinelerra3/tools rename to uml/lumiera/tools diff --git a/wiki/backend.html b/wiki/backend.html index 6477e47ba..3cdee6a96 100644 --- a/wiki/backend.html +++ b/wiki/backend.html @@ -766,15 +766,15 @@ Error: #f88 
    This just starts as braindump, I will refine it soon:
-* handle all files cinelerra uses at runtime (media, edl, temp data)
-* manage filehandles, cinelerra might use more more files than available filehandles
+* handle all files Lumiera uses at runtime (media, edl, temp data)
+* manage filehandles, Lumiera might use more more files than available filehandles
 * manage temporary data
 * do caching
 * io will be blocked where the backend tells the core where it can expect the data (not read()/write() like)
 * kind-of garbage collector
 * do prefetching
 * no/low latency for the core the prefetcher and other things ensure that data is available in time
-* translate any input into a format which the cinelerra core understands (demux, decode)
+* translate any input into a format which the Lumiera core understands (demux, decode)
 * same for encoding to output formats
 * offer a plugin API for encoders/decoders
 * maybe network backend for serving data to distributed render nodes
@@ -1217,7 +1217,7 @@ config.formatters.push( {
 //}}}
    -
    ''[[Cinelerra3|index.html]]''
+
    ''[[Lumiera|index.html]]''
 DataBackend
 [[Overview]]
 <<fullscreen>>
@@ -1255,7 +1255,7 @@ When to Cache and when not to cache, aka instant [[Frame]] reuse
    -
    Whenever cinelerra needs to access data this is done through the DataBackend described here. 
+
    Whenever Lumiera needs to access data this is done through the DataBackend described here. 
 
 There are two main kinds how data is handled:
 * Project Description and EDL's are handled in a InMemoryDatabase which uses a [[Serializer]] for storing and logging modifications.
diff --git a/wiki/index.html b/wiki/index.html
index 34493fc01..f2f7f8139 100755
--- a/wiki/index.html
+++ b/wiki/index.html
@@ -42,9 +42,9 @@ DAMAGE.
 
 
 
-
    Cinelerra TiddlyWiki is loading ...

    Requires Javascript.
    
+
    Lumiera TiddlyWiki is loading ...

    Requires Javascript.
    
 
- Cinelerra3 - Distributed Developer Wiki 
+ Lumiera - Distributed Developer Wiki