diff --git a/doc/devel/uml/class128005.html b/doc/devel/uml/class128005.html index a1c4c2ebc..9ee1b55a0 100644 --- a/doc/devel/uml/class128005.html +++ b/doc/devel/uml/class128005.html @@ -16,7 +16,7 @@ -

Declaration :

Artifact : session

+

Declaration :

Artifact : session, Component(s) : Session

Relation edls (<directional aggregation>)

Declaration :

Relation fixture (<unidirectional association>)

Declaration :

diff --git a/doc/devel/uml/class128133.html b/doc/devel/uml/class128133.html index 788456ce7..cbf83e3ea 100644 --- a/doc/devel/uml/class128133.html +++ b/doc/devel/uml/class128133.html @@ -17,7 +17,7 @@

Declaration :

Directly inherited by : Fixture

-

Artifact : edl

+

Artifact : edl, Component(s) : Session

Relation tracks (<directional aggregation by value>)

Declaration :

  • Uml : # tracks : Track, multiplicity : *
  • C++ : protected: list<Track> tracks
Relation clips (<directional aggregation>)

Declaration :

  • Uml : # clips : MObject, multiplicity : *
  • C++ : protected: list<MObject *> clips
diff --git a/doc/devel/uml/class128261.html b/doc/devel/uml/class128261.html index c5dbd585f..9cb960678 100644 --- a/doc/devel/uml/class128261.html +++ b/doc/devel/uml/class128261.html @@ -16,7 +16,7 @@ -

Declaration :

Artifact : fixture

+

Declaration :

  • C++ : class Fixture : public EDL

Artifact : fixture, Component(s) : Session

Relation tracks (<directional aggregation by value>)

Declaration :

  • Uml : # tracks : Track, multiplicity : 1..*
  • C++ : protected: Track tracks
Relation timeline (<directional aggregation by value>)

Declaration :

diff --git a/doc/devel/uml/class128517.html b/doc/devel/uml/class128517.html index 723bd59f6..31e491fce 100644 --- a/doc/devel/uml/class128517.html +++ b/doc/devel/uml/class128517.html @@ -17,10 +17,10 @@

Declaration :

  • C++ : class MObject : public Buildable
  • Java : public interface MObject

Directly inherited by : AbstractMO

-

Artifact : mobject

+

Artifact : mobject, Component(s) : Session

Attribut length
-

Declaration :

  • Uml : # length : long
  • C++ : protected: long length

TODO: how to represent?

+

Declaration :

  • Uml : # length : Time
  • C++ : protected: Time length

TODO: how to represent time intervals?

Relation placement (<association>)

Declaration :

  • Uml : # placement : Placement, multiplicity : 1..*
  • C++ : protected: list<Placement *> placement

All public operations : apply

diff --git a/doc/devel/uml/class130309.html b/doc/devel/uml/class130309.html index 9ae730182..5c515d659 100644 --- a/doc/devel/uml/class130309.html +++ b/doc/devel/uml/class130309.html @@ -16,5 +16,5 @@ -

Declaration :

  • C++ : class ControllerFacade

Provides unified access to the Proc-Subsystem Controller. Especially, this Facade class provides the functions to get a render engine to carry out actual renderings.

Artifact : controllerfacade

+

Declaration :

  • C++ : class ControllerFacade

Provides unified access to the Proc-Subsystem Controller. Especially, this Facade class provides the functions to get a render engine to carry out actual renderings.

Artifact : controllerfacade, Component(s) : ControllerFacade

diff --git a/doc/devel/uml/class130437.html b/doc/devel/uml/class130437.html index bce32e299..f70da5140 100644 --- a/doc/devel/uml/class130437.html +++ b/doc/devel/uml/class130437.html @@ -16,7 +16,7 @@ -

Declaration :

  • C++ : class PathManager

While building a render engine, this Strategy class decides on the actual render strategy in accordance to the current controller settings (system state)

Artifact : pathmanager

+

Declaration :

  • C++ : class PathManager

While building a render engine, this Strategy class decides on the actual render strategy in accordance to the current controller settings (system state)

Artifact : pathmanager, Component(s) : RenderPathManager

Operation buildProcessor

Declaration :

All public operations : buildProcessor

diff --git a/doc/devel/uml/class130565.html b/doc/devel/uml/class130565.html index ae8a0ded5..9e783f8e1 100644 --- a/doc/devel/uml/class130565.html +++ b/doc/devel/uml/class130565.html @@ -16,7 +16,7 @@ -

Declaration :

  • C++ : class BuilderFacade

Provides 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

Artifact : builderfacade

+

Declaration :

  • C++ : class BuilderFacade

Provides 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

Artifact : builderfacade, Component(s) : Controller

Operation buildEngine

Declaration :

Main Operation of the Builder: create a render engine for a given part of the timeline

All public operations : buildEngine

diff --git a/doc/devel/uml/class131973.html b/doc/devel/uml/class131973.html index 39cb21caa..68e7e24de 100644 --- a/doc/devel/uml/class131973.html +++ b/doc/devel/uml/class131973.html @@ -17,7 +17,7 @@

Declaration :

Directly inherited by : GLPipe

-

Artifact : pipe

+

Artifact : link

diff --git a/doc/devel/uml/class132613.html b/doc/devel/uml/class132613.html index 33576f2eb..0134205d1 100644 --- a/doc/devel/uml/class132613.html +++ b/doc/devel/uml/class132613.html @@ -16,7 +16,7 @@ -

Declaration :

  • C++ : class GLPipe : public Link

specialized connection node used to handle the transfer of OpenGL data from a image bitmap into texture form

Artifact : openglpipe

+

Declaration :

  • C++ : class GLPipe : public Link

specialized connection node used to handle the transfer of OpenGL data from a image bitmap into texture form

Artifact : glpipe

diff --git a/doc/devel/uml/class132741.html b/doc/devel/uml/class132741.html index a7f5baf22..f0a749926 100644 --- a/doc/devel/uml/class132741.html +++ b/doc/devel/uml/class132741.html @@ -17,7 +17,7 @@

Declaration :

  • C++ : class StateProxy
  • Java : public interface StateProxy

Directly inherited by : ARender GLRender VRender

-

Artifact : stateproxy

+

Artifact : stateproxy, Component(s) : Builder

Relation currFrame (<unidirectional association>)

Declaration :

  • Uml : # currFrame : Frame
  • C++ : protected: Frame * currFrame
diff --git a/doc/devel/uml/class134533.html b/doc/devel/uml/class134533.html index 0a5e1a658..cc2ba0f55 100644 --- a/doc/devel/uml/class134533.html +++ b/doc/devel/uml/class134533.html @@ -16,7 +16,7 @@ -

Declaration :

  • C++ : template<class VAL> class Parameter

Descriptor and access object for a plugin parameter. Parameters may be provided with values from the session, and this values may be automated.

Artifact : parameter

+

Declaration :

  • C++ : template<class VAL> class Parameter

Descriptor and access object for a plugin parameter. Parameters may be provided with values from the session, and this values may be automated.

Artifact : parameter, Component(s) : ProcNode

Operation getValue

Declaration :

  • Uml : + getValue() : VAL
  • C++ : public: VAL getValue () const
Relation <association>

Declaration :

diff --git a/doc/devel/uml/class134661.html b/doc/devel/uml/class134661.html index 811531c79..1933e5d2e 100644 --- a/doc/devel/uml/class134661.html +++ b/doc/devel/uml/class134661.html @@ -17,7 +17,7 @@

Declaration :

  • C++ : template<class VAL> class ParamProvider
  • Java : public interface ParamProvider<VAL>

Directly inherited by : Auto

-

A facility to get the actual value of a plugin/effect parameter

Artifact : paramprovider

+

A facility to get the actual value of a plugin/effect parameter

Artifact : paramprovider, Component(s) : Session

Relation param (<association>)

Declaration :

Relation ipo (<unidirectional association>)

Declaration :

diff --git a/doc/devel/uml/class134917.html b/doc/devel/uml/class134917.html index 00fdfb1e2..c2d5f5781 100644 --- a/doc/devel/uml/class134917.html +++ b/doc/devel/uml/class134917.html @@ -16,5 +16,5 @@ -

Declaration :

  • C++ : class Time

denotes a temporal position (time point), based on timeline start.

investigate posix.4 realtime timers, wrap these here

Artifact : time

+

Declaration :

  • C++ : class Time

denotes a temporal position (time point), based on timeline start.

investigate posix.4 realtime timers, wrap these here

Artifact : time, Component(s) : CommonLib

diff --git a/doc/devel/uml/class135173.html b/doc/devel/uml/class135173.html index 7acd8333f..d4c848734 100644 --- a/doc/devel/uml/class135173.html +++ b/doc/devel/uml/class135173.html @@ -16,7 +16,7 @@ -

Declaration :

  • C++ : class Segment
+

Declaration :

  • C++ : class Segment

Artifact : segment

Attribut start

Declaration :

  • Uml : # start : Time
  • C++ : protected: Time start
diff --git a/doc/devel/uml/componentdiagrams.html b/doc/devel/uml/componentdiagrams.html index 49939b439..15a1086a2 100644 --- a/doc/devel/uml/componentdiagrams.html +++ b/doc/devel/uml/componentdiagrams.html @@ -17,6 +17,7 @@ +
OverviewThis drawing shows the top level compoents and relations
proc-components
diff --git a/doc/devel/uml/fig129669.png b/doc/devel/uml/fig129669.png index d3bef463a..36073fe33 100644 Binary files a/doc/devel/uml/fig129669.png and b/doc/devel/uml/fig129669.png differ diff --git a/doc/devel/uml/fig130053.png b/doc/devel/uml/fig130053.png new file mode 100644 index 000000000..9e6810f94 Binary files /dev/null and b/doc/devel/uml/fig130053.png differ diff --git a/doc/devel/uml/index.html b/doc/devel/uml/index.html index da7ba2469..2450fdd12 100644 --- a/doc/devel/uml/index.html +++ b/doc/devel/uml/index.html @@ -27,10 +27,16 @@ Documentation

Overview



-

This drawing shows the top level compoents and relations

+

This drawing shows the top level compoents and relations

+
Component CommonLib
+

provided classes : Time

+
Component Builder
+

provided classes : StateProxy

+

required classes : Fixture, Session

Component Session
+

provided classes : EDL, Fixture, MObject, ParamProvider, Session

Component EDL
@@ -41,7 +47,8 @@ Documentation
Component Controller
-

Depends on Builder

+

Depends on Builder

provided classes : BuilderFacade

+
Component AssetManagement
@@ -49,7 +56,13 @@ Documentation
Component Dispatcher
Component Engine
-

Depends on Frame (Stream) Provider

+

Depends on Frame (Stream) Provider

required classes : StateProxy

+
+ +
Component ProcNode
+

nested in Engine

+

provided classes : Parameter

+

required classes : ParamProvider

Component Frame (Stream) Provider
@@ -59,15 +72,27 @@ Documentation
Component Cache
Component RenderPathManager
+

provided classes : PathManager

+
+ +

1.2 Component View interfaces

+
+ +

+

proc-components



+ +
Component ControllerFacade
+

provided classes : ControllerFacade

+

required classes : BuilderFacade, PathManager

+ +
Component ConManager
+

required classes : ParamProvider

-

1.2 Package codegen

-

    -
  • C++ namespace : cinelerra
    • -
+

1.3 Package codegen

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

-

1.2.1 Deployment View EXE Deployment

+

1.3.1 Deployment View EXE Deployment

defines and lists how the Cinelerra executable has to be created

@@ -76,20 +101,20 @@ Documentation
Artifact Cinelerra3

Depends on common

Depends on gui

Depends on proc

Depends on backend

the main executable to be built

-

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

+

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

Artifact main

Artifact source

-

1.2.2 Package common

+

1.3.2 Package common

    -
  • C++ namespace : lib
    • +
  • C++ namespace : cinelerra

sourcecode package

Common library and helper classes

Diagram : Source Overview

-

1.2.2.1 Deployment View gen

+

1.3.2.1 Deployment View gen

defines source files to be generated by BOUML

@@ -99,22 +124,22 @@ Documentation
-

1.2.3 Package backend

+

1.3.3 Package backend

  • C++ namespace : data

sourcecode package

Data backend classes here...

-

1.2.3.1 Deployment View gen

+

1.3.3.1 Deployment View gen

-

1.2.4 Package proc

+

1.3.4 Package proc

    -
  • C++ namespace : proc
    • +
  • C++ namespace : proc_interface

sourcecode package

All classes belonging to the (middle) processing layer

-

1.2.4.1 Deployment View gen

+

1.3.4.1 Deployment View gen

defines source files to be generated by BOUML

@@ -131,23 +156,23 @@ Documentation

Artifact source associated with : Frame

-

1.2.4.2 Package asset

+

1.3.4.2 Package asset

  • C++ namespace : asset

sourcecode package

Asset Management

-

1.2.4.2.1 Deployment View gen

+

1.3.4.2.1 Deployment View gen

defines source files to be generated by BOUML

-

1.2.4.3 Package mobject

+

1.3.4.3 Package mobject

  • C++ namespace : mobject

sourcecode package

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

-

1.2.4.3.1 Deployment View gen

+

1.3.4.3.1 Deployment View gen

defines source files to be generated by BOUML

@@ -184,13 +209,13 @@ Documentation

Artifact source associated with : Interpolator

-

1.2.4.3.2 Package session

+

1.3.4.3.2 Package session

    -
  • C++ namespace : session
    • +
  • C++ namespace : mobject::session

sourcecode package

Everything concerning the EDL and Session, within the MObject Subsystem

-

1.2.4.3.2.1 Deployment View gen

+

1.3.4.3.2.1 Deployment View gen

defines source files to be generated by BOUML

@@ -205,6 +230,10 @@ Documentation
Artifact fixture

the (low level) representation of the EDL with concrete placement data

Artifact source associated with : Fixture

+ +
Artifact segment
+

Segment of the Timeline.
Used at the moment (7/07) for partitioning the timeline/fixture into segments
to be rendered by a specialized render node network for each, without the need
to change any connections within a given segment.
Note this concept may be superfluos alltogether; is a draft and the real
use still needs to be worked out...

+

Artifact source associated with : Segment

Artifact track

descriptor for one track in the Session

@@ -245,13 +274,13 @@ Documentation
-

1.2.4.3.3 Package builder

+

1.3.4.3.3 Package builder

    -
  • C++ namespace : proc
    • +
  • C++ namespace : mobject::builder

sourcecode package

The Builder creating the Render Engine,
located within the MObject Subsystem

-

1.2.4.3.3.1 Deployment View gen

+

1.3.4.3.3.1 Deployment View gen

defines source files to be generated by BOUML

@@ -281,13 +310,13 @@ Documentation
-

1.2.4.3.4 Package controller

+

1.3.4.3.4 Package controller

    -
  • C++ namespace : proc
    • +
  • C++ namespace : mobject::controller

sourcecode package

The Processing and Render Controller,
located within the MObject Subsystem

-

1.2.4.3.4.1 Deployment View gen

+

1.3.4.3.4.1 Deployment View gen

defines source files to be generated by BOUML

@@ -302,13 +331,13 @@ Documentation
-

1.2.4.4 Package engine

+

1.3.4.4 Package engine

  • C++ namespace : engine

sourcecode package

The Core Render Engine

-

1.2.4.4.1 Deployment View gen

+

1.3.4.4.1 Deployment View gen

defines source files to be generated by BOUML

@@ -332,7 +361,7 @@ Documentation

transforming processing Node

Artifact source associated with : Trafo

-
Artifact pipe
+
Artifact link

forwarding, adapting or connecting ProcNode

Artifact source associated with : Link

@@ -356,7 +385,7 @@ Documentation

Processing Node for (de)coding media data

Artifact source associated with : CodecAdapter

-
Artifact openglpipe
+
Artifact glpipe

specialized connection element for handling OpenGL implementation details

Artifact source associated with : GLPipe

@@ -391,20 +420,20 @@ Documentation
-

1.2.5 Package gui

+

1.3.5 Package gui

  • C++ namespace : gui

sourcecode package

User Interface classes go here

-

1.2.5.1 Deployment View gen

+

1.3.5.1 Deployment View gen

defines source files to be generated by BOUML

-

1.2.6 Package tool

+

1.3.6 Package tool

sourcecode package

Tools and Utilities
(separate from the main cinelrra binary)

-

1.2.6.1 Deployment View gen

+

1.3.6.1 Deployment View gen

defines source files to be generated by BOUML

@@ -426,11 +455,11 @@ Documentation
Class Session
Class EDL
Class Fixture
+
Class Segment
Class Track
Class MObject
Class Placement
Class ExplicitPlacement
-
Class Segment
Class AbstractMO
Class Clip
Class Effect
diff --git a/doc/devel/uml/index_60.html b/doc/devel/uml/index_60.html index fd4e47cd3..0a78be5d0 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 e15fdd2ae..fb3771d6c 100644 --- a/doc/devel/uml/index_65.html +++ b/doc/devel/uml/index_65.html @@ -37,8 +37,8 @@ - + diff --git a/doc/devel/uml/index_67.html b/doc/devel/uml/index_67.html index 26195a57f..d3fce2569 100644 --- a/doc/devel/uml/index_67.html +++ b/doc/devel/uml/index_67.html @@ -26,7 +26,6 @@ - @@ -34,13 +33,14 @@ - - - - + + + + + @@ -48,6 +48,7 @@ + @@ -56,15 +57,17 @@ + - + +
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
AssetManagerpackage
ATTACHattributeattach subject to anchor (e.g. an effect to a clip)
au1class instance
aud_aclass instance
aud_Aclass instance
aud_aclass instance
audioclass instance
audio1class instance
audio1class 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
clipartifacta Media Clip
Clipclass
clipsrelation
codecadapterartifactProcessing Node for (de)coding media data
codegenpackageThis package is used to organize code generation by BOUML. It is considered useless after having generated the initial code skeleton.
commonpackagesourcecode package

Common library and helper classes
CommonLibcomponent
CommonLibpackage
complete Render Engineactivity object
ConditionclassI provided a reworked Condition class in my cinelerra2 repository
configure Toolsopaque activity action
ConManagerclassConnection 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
conmanagerartifactmanages the creation of additional ProcNode connections for the Renderengine
ConManagercomponent
connectopaque activity action
Constraintclass
Controllercomponent
controllerpackagesourcecode package

The Processing and Render Controller,
located within the MObject Subsystem
Controllerpackage
controllerpackagesourcecode package

The Processing and Render Controller,
located within the MObject Subsystem
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.
controllerfacadeartifactFacade and service access point for the Proc Layer Controller
ControllerFacadecomponent
create ProcNodeopaque activity action
currFramerelation
diff --git a/doc/devel/uml/index_69.html b/doc/devel/uml/index_69.html index bbabc7c4b..9d52d03bb 100644 --- a/doc/devel/uml/index_69.html +++ b/doc/devel/uml/index_69.html @@ -18,8 +18,8 @@ - + diff --git a/doc/devel/uml/index_71.html b/doc/devel/uml/index_71.html index 4df086527..62a9306fc 100644 --- a/doc/devel/uml/index_71.html +++ b/doc/devel/uml/index_71.html @@ -41,6 +41,7 @@ + diff --git a/doc/devel/uml/index_72.html b/doc/devel/uml/index_72.html index 6f91bc17d..3b76fe797 100644 --- a/doc/devel/uml/index_72.html +++ b/doc/devel/uml/index_72.html @@ -22,8 +22,8 @@ - +
NameKindDescription
edlartifactthe (high level) Edit Decision List within the current Session
EDLcomponent
EDLclass
EDLcomponent
EDL Example1object diagramA simple example showing how the actual objects are placed in the Fixture (=definitive playlist). It shows a Video and Audio clip placed on two tracks
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
GLBufclass
glbufartifacta buffer and render process holding a Video frame for OpenGL rendering
GLPipeclassspecialized connection node used to handle the transfer of OpenGL data from a image bitmap into texture form
glpipeartifactspecialized connection element for handling OpenGL implementation details
GLRenderclassRepresentation of a OpenGL accelerated Video render process
glrenderartifactRepresentation of a OpenGL accellerated Video render process
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
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.
Hubclass
hubartifactspecial ProcNode used to build data distributing connections
HUEclass instance
HUEclass instance
HUEclass instance
diff --git a/doc/devel/uml/index_73.html b/doc/devel/uml/index_73.html index 26d333336..a97f05ce5 100644 --- a/doc/devel/uml/index_73.html +++ b/doc/devel/uml/index_73.html @@ -19,9 +19,10 @@ NameKindDescription In Memory Databaseclass diagram inFixtureactivity action pin -inputclass instance -inputclass instance inputclass instance +inputclass instance +inputclass instance +interfacescomponent view interpolatorartifactdenotes a facility to get (continuously interpolated) parameter values InterpolatorclassProvides the implementation for getting the acutal value of a time varying or automated effect/plugin parameter iporelation diff --git a/doc/devel/uml/index_76.html b/doc/devel/uml/index_76.html index 101b4133d..680ae56c6 100644 --- a/doc/devel/uml/index_76.html +++ b/doc/devel/uml/index_76.html @@ -19,9 +19,10 @@ NameKindDescription labelartifact Labelclass -lengthattributeTODO: how to represent? +lengthattributeTODO: how to represent time intervals? lengthattributeduration (span) of this timeline segment. Linkclass +linkartifactforwarding, adapting or connecting ProcNode Lockclass Lockclass diff --git a/doc/devel/uml/index_79.html b/doc/devel/uml/index_79.html index 198ef8b94..edbb2994f 100644 --- a/doc/devel/uml/index_79.html +++ b/doc/devel/uml/index_79.html @@ -18,10 +18,9 @@ - + - diff --git a/doc/devel/uml/index_80.html b/doc/devel/uml/index_80.html index dfef6cced..639db95d5 100644 --- a/doc/devel/uml/index_80.html +++ b/doc/devel/uml/index_80.html @@ -25,7 +25,6 @@ - @@ -40,9 +39,11 @@ + + diff --git a/doc/devel/uml/index_83.html b/doc/devel/uml/index_83.html index 4bd694b57..b930aa453 100644 --- a/doc/devel/uml/index_83.html +++ b/doc/devel/uml/index_83.html @@ -19,6 +19,7 @@ + @@ -29,8 +30,8 @@ - + diff --git a/doc/devel/uml/index_84.html b/doc/devel/uml/index_84.html index 923ddb56b..26fad698a 100644 --- a/doc/devel/uml/index_84.html +++ b/doc/devel/uml/index_84.html @@ -38,10 +38,10 @@ - - + +
NameKindDescription
offsetattributeOffset the actual position by this (time) value relative to the anchor point. TODO: Representation?
openglpipeartifactspecialized connection element for handling OpenGL implementation details
ouputclass instance
ouputclass instance
ouputclass instance
ouputclass instance
outputrelation
Overviewcomponent diagramThis drawing shows the top level compoents and relations
Overview Render Enginedeployment diagram
paramsrelation
PathManagerclassWhile building a render engine, this Strategy class decides on the actual render strategy in accordance to the current controller settings (system state)
pathmanagerartifactManager for deciding the actual render strategy
pipeartifactforwarding, adapting or connecting ProcNode
placementartifactKey Abstraction: a way to place and locate a Media Object
placementrelation
Placementclass
procpackagesourcecode package

All classes belonging to the (middle) processing layer
procnode
procattributeholds the Processor (Render Engine Element) to be built by the current build step
proc-componentscomponent diagram
ProcessingLayerpackage
Processorclass
processorartifacta single render pipeline for one segment of the timeline
ProcNodecomponent
ProcNodeclassKey abstraction of the Render Engine: A Data processing Node
procnodeartifactKey abstraction of the Render Engine: a Processing Node
ProjectorclassSpecial video processing node used to scale and translate image data.
NameKindDescription
SAMETIMEattributeplace subject at the sime time as the anchor
Schedulerclass
segmentartifactSegment of the Timeline.
Used at the moment (7/07) for partitioning the timeline/fixture into segments
to be rendered by a specialized render node network for each, without the need
to change any connections within a given segment.
Note this concept may be superfluos alltogether; is a draft and the real
use still needs to be worked out...
Segmentclass
segment Toolactivity object
SegmentationToolclassTool implementation for deriving a partitioning of the current timeline such, that each segement has a constant configuration. "Constant" means here, that any remaining changes over time can be represented by automation solely, without the need to change the node connections.
Service Componentsclass view
Sessioncomponent
sessionartifactholds the complete session to be edited by the user
Sessionclass view
sessionpackagesourcecode package

Everything concerning the EDL and Session, within the MObject Subsystem
Sessionclass view
Sessionclass
Session structureclass diagram
setup Build Paramsopaque activity action
trafoartifacttransforming processing Node
treatoperation
treatoperation
treatoperation
treatoperation
treatoperation
treatoperation
treatoperation
treatoperation
treatoperation
treatoperationThis operation is to be overloaded for the specific MObject subclasses to be treated.
diff --git a/doc/devel/uml/index_86.html b/doc/devel/uml/index_86.html index 3fa17f5a7..092c278b0 100644 --- a/doc/devel/uml/index_86.html +++ b/doc/devel/uml/index_86.html @@ -19,23 +19,23 @@ NameKindDescription VFrameclass vframeartifacta buffer and render process holding a Video frame -vid1class instance vid1class instance -vid_Aclass instance -vid_Aclass instance -vid_aclass instance -vid_Aclass instance +vid1class instance vid_aclass instance -videoclass instance -videoclass instance +vid_Aclass instance +vid_Aclass instance +vid_Aclass instance +vid_aclass instance videoclass instance +videoclass instance videoclass instance -video1class instance -video1class instance +videoclass instance +video1class instance video1class instance +video1class instance +video1class instance video1class instance video1class instance -video1class instance VRenderclassRepresentation of a Video render process. (Encapsulates the video buffers for the actual calculations) vrenderartifactRepresentation of a Video render process diff --git a/src/cinelerra.h b/src/cinelerra.h new file mode 100644 index 000000000..d9a813952 --- /dev/null +++ b/src/cinelerra.h @@ -0,0 +1,61 @@ +/* + CINELERRA.h - global definitions and common types + + + Copyright (C) CinelerraCV + 2007, Christian Thaeter + Hermann Vosseler + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#ifndef CINELERRA_H +#define CINELERRA_H + + + +#ifdef __cplusplus +extern "C" { +#endif /* ========================== common C Part ============ */ + + +#ifdef __cplusplus +} +#endif /* ==================== (End) common C Part ============ */ + + + + + + +#ifdef __cplusplus /* ============== C++-Part ================= */ + + + /* common types frequently used... */ + +#include "common/time.hpp" + + +namespace cinelerra + { + /* additional global configuration goes here... */ + + +} // namespace cinelerra + +#endif /* ===================== (End) C++-Part ================= */ + +#endif /*CINELERRA_H*/ diff --git a/src/main.cpp b/src/main.cpp index 459ead88a..3d4c1ef20 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -23,6 +23,8 @@ #include +#include "cinelerra.h" + using std::cout; int main (int argc, char* argv[]) diff --git a/src/proc/controllerfacade.cpp b/src/proc/controllerfacade.cpp index 17cfab707..92dca2864 100644 --- a/src/proc/controllerfacade.cpp +++ b/src/proc/controllerfacade.cpp @@ -23,11 +23,11 @@ #include "proc/controllerfacade.hpp" -namespace proc +namespace proc_interface { - + /** */ - - - -} // namespace proc + + + +} // namespace proc_interface diff --git a/src/proc/controllerfacade.hpp b/src/proc/controllerfacade.hpp index 3170f1a04..1d32d9488 100644 --- a/src/proc/controllerfacade.hpp +++ b/src/proc/controllerfacade.hpp @@ -21,12 +21,12 @@ */ -#ifndef PROC_CONTROLLERFACADE_H -#define PROC_CONTROLLERFACADE_H +#ifndef PROC_INTERFACE_CONTROLLERFACADE_H +#define PROC_INTERFACE_CONTROLLERFACADE_H -namespace proc +namespace proc_interface { @@ -42,5 +42,5 @@ namespace proc -} // namespace proc +} // namespace proc_interface #endif diff --git a/src/proc/engine/aframe.cpp b/src/proc/engine/aframe.cpp index 3993e9f8e..53109fffd 100644 --- a/src/proc/engine/aframe.cpp +++ b/src/proc/engine/aframe.cpp @@ -23,16 +23,12 @@ #include "proc/engine/aframe.hpp" -namespace proc +namespace engine { - namespace engine - { - - /** */ - - - - - } // namespace proc::engine -} // namespace proc + /** */ + + + + +} // namespace engine diff --git a/src/proc/engine/aframe.hpp b/src/proc/engine/aframe.hpp index 366c6d2ea..37e920e6f 100644 --- a/src/proc/engine/aframe.hpp +++ b/src/proc/engine/aframe.hpp @@ -21,25 +21,21 @@ */ -#ifndef PROC_ENGINE_AFRAME_H -#define PROC_ENGINE_AFRAME_H +#ifndef ENGINE_AFRAME_H +#define ENGINE_AFRAME_H #include "proc/frame.hpp" -namespace proc +namespace engine { - namespace engine - { - - - class AFrame : public proc::Frame - {}; - - - - } // namespace proc::engine -} // namespace proc + + class AFrame : public proc_interface::Frame + {}; + + + +} // namespace engine #endif diff --git a/src/proc/engine/arender.cpp b/src/proc/engine/arender.cpp index e03a6cbff..95db74706 100644 --- a/src/proc/engine/arender.cpp +++ b/src/proc/engine/arender.cpp @@ -23,16 +23,12 @@ #include "proc/engine/arender.hpp" -namespace proc +namespace engine { - namespace engine - { - - /** */ - - - - - } // namespace proc::engine -} // namespace proc + /** */ + + + + +} // namespace engine diff --git a/src/proc/engine/arender.hpp b/src/proc/engine/arender.hpp index 0ab47506b..0ac62282e 100644 --- a/src/proc/engine/arender.hpp +++ b/src/proc/engine/arender.hpp @@ -21,29 +21,24 @@ */ -#ifndef PROC_ENGINE_ARENDER_H -#define PROC_ENGINE_ARENDER_H +#ifndef ENGINE_ARENDER_H +#define ENGINE_ARENDER_H #include "proc/stateproxy.hpp" -namespace proc +namespace engine { - namespace engine - { + + + /** + * Representation of a Audio render process + */ + class ARender : public proc_interface::StateProxy + {}; - /** - * Representation of a Audio render process - */ - class ARender : public proc::StateProxy - {}; - - - - - } // namespace proc::engine - -} // namespace proc + +} // namespace engine #endif diff --git a/src/proc/engine/codecadapter.cpp b/src/proc/engine/codecadapter.cpp index be88d0ff6..104008d2a 100644 --- a/src/proc/engine/codecadapter.cpp +++ b/src/proc/engine/codecadapter.cpp @@ -23,14 +23,8 @@ #include "proc/engine/codecadapter.hpp" -namespace proc +namespace engine { - namespace engine - { - - - } // namespace proc::engine - -} // namespace proc +} // namespace engine diff --git a/src/proc/engine/codecadapter.hpp b/src/proc/engine/codecadapter.hpp index 0618b4432..a82692697 100644 --- a/src/proc/engine/codecadapter.hpp +++ b/src/proc/engine/codecadapter.hpp @@ -21,33 +21,29 @@ */ -#ifndef PROC_ENGINE_CODECADAPTER_H -#define PROC_ENGINE_CODECADAPTER_H +#ifndef ENGINE_CODECADAPTER_H +#define ENGINE_CODECADAPTER_H #include "proc/engine/trafo.hpp" -namespace proc +namespace engine { - namespace engine - { - - - /** - * Adapter for wiring an externally loaded - * codec into the render pipeline. The decoding - * 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. - */ - class CodecAdapter : public Trafo - {}; - - - - } // namespace proc::engine -} // namespace proc + + /** + * Adapter for wiring an externally loaded + * codec into the render pipeline. The decoding + * 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. + */ + class CodecAdapter : public Trafo + {}; + + + +} // namespace engine #endif diff --git a/src/proc/engine/exitnode.cpp b/src/proc/engine/exitnode.cpp index a7b996b9d..f0ecaae36 100644 --- a/src/proc/engine/exitnode.cpp +++ b/src/proc/engine/exitnode.cpp @@ -23,15 +23,11 @@ #include "proc/engine/exitnode.hpp" -namespace proc +namespace engine { - namespace engine - { - - /** */ - - - - } // namespace proc::engine -} // namespace proc + /** */ + + + +} // namespace engine diff --git a/src/proc/engine/exitnode.hpp b/src/proc/engine/exitnode.hpp index b3b93b056..43d26756b 100644 --- a/src/proc/engine/exitnode.hpp +++ b/src/proc/engine/exitnode.hpp @@ -21,29 +21,25 @@ */ -#ifndef PROC_ENGINE_EXITNODE_H -#define PROC_ENGINE_EXITNODE_H +#ifndef ENGINE_EXITNODE_H +#define ENGINE_EXITNODE_H #include "proc/engine/procnode.hpp" -namespace proc +namespace engine { - namespace engine - { - - - /** - * The output end of each render pipeline. - * Pulling from such exit nodes actually ivokes the render process - */ - class ExitNode : public ProcNode - {}; - - - - } // namespace proc::engine -} // namespace proc + + /** + * The output end of each render pipeline. + * Pulling from such exit nodes actually ivokes the render process + */ + class ExitNode : public ProcNode + {}; + + + +} // namespace engine #endif diff --git a/src/proc/engine/glbuf.cpp b/src/proc/engine/glbuf.cpp index c6a7b2cd3..856fea223 100644 --- a/src/proc/engine/glbuf.cpp +++ b/src/proc/engine/glbuf.cpp @@ -23,16 +23,12 @@ #include "proc/engine/glbuf.hpp" -namespace proc +namespace engine { - namespace engine - { - - /** */ - - - - - } // namespace proc::engine -} // namespace proc + /** */ + + + + +} // namespace engine diff --git a/src/proc/engine/glbuf.hpp b/src/proc/engine/glbuf.hpp index 6acba91c2..d48da3985 100644 --- a/src/proc/engine/glbuf.hpp +++ b/src/proc/engine/glbuf.hpp @@ -21,25 +21,19 @@ */ -#ifndef PROC_ENGINE_GLBUF_H -#define PROC_ENGINE_GLBUF_H +#ifndef ENGINE_GLBUF_H +#define ENGINE_GLBUF_H #include "proc/frame.hpp" -namespace proc +namespace engine { - namespace engine - { - - - class GLBuf : public proc::Frame - {}; - - - - } // namespace proc::engine -} // namespace proc + + class GLBuf : public proc_interface::Frame + {}; + +} // namespace engine #endif diff --git a/src/proc/engine/glpipe.cpp b/src/proc/engine/glpipe.cpp index cd165d7bf..8abd008a9 100644 --- a/src/proc/engine/glpipe.cpp +++ b/src/proc/engine/glpipe.cpp @@ -23,16 +23,12 @@ #include "proc/engine/glpipe.hpp" -namespace proc +namespace engine { - namespace engine - { - - /** */ - - - - - } // namespace proc::engine -} // namespace proc + /** */ + + + + +} // namespace engine diff --git a/src/proc/engine/glpipe.hpp b/src/proc/engine/glpipe.hpp index 5708b785c..06f21474f 100644 --- a/src/proc/engine/glpipe.hpp +++ b/src/proc/engine/glpipe.hpp @@ -1,5 +1,5 @@ /* - OPENGLPIPE.hpp - specialized connection element for handling OpenGL implementation details + GLPIPE.hpp - specialized connection element for handling OpenGL implementation details Copyright (C) CinelerraCV 2007, Christian Thaeter @@ -21,30 +21,26 @@ */ -#ifndef PROC_ENGINE_OPENGLPIPE_H -#define PROC_ENGINE_OPENGLPIPE_H +#ifndef ENGINE_GLPIPE_H +#define ENGINE_GLPIPE_H #include "proc/engine/link.hpp" -namespace proc +namespace engine { - namespace engine - { - - - /** - * specialized connection node used to handle the transfer of OpenGL data - * from a image bitmap into texture form. - */ - class GLPipe : public Link - {}; - - - - - } // namespace proc::engine -} // namespace proc + + /** + * specialized connection node used to handle the transfer of OpenGL data + * from a image bitmap into texture form. + */ + class GLPipe : public Link + {}; + + + + +} // namespace engine #endif diff --git a/src/proc/engine/glrender.cpp b/src/proc/engine/glrender.cpp index 310a3a329..e27899935 100644 --- a/src/proc/engine/glrender.cpp +++ b/src/proc/engine/glrender.cpp @@ -23,15 +23,11 @@ #include "proc/engine/glrender.hpp" -namespace proc +namespace engine { - namespace engine - { - - /** */ - - - - } // namespace proc::engine -} // namespace proc + /** */ + + + +} // namespace engine diff --git a/src/proc/engine/glrender.hpp b/src/proc/engine/glrender.hpp index 43957e8b6..a0eb79c4e 100644 --- a/src/proc/engine/glrender.hpp +++ b/src/proc/engine/glrender.hpp @@ -21,28 +21,22 @@ */ -#ifndef PROC_ENGINE_GLRENDER_H -#define PROC_ENGINE_GLRENDER_H +#ifndef ENGINE_GLRENDER_H +#define ENGINE_GLRENDER_H #include "proc/stateproxy.hpp" -namespace proc +namespace engine { - namespace engine - { - - - /** - * Representation of a OpenGL accelerated Video render process - */ - class GLRender : public StateProxy - {}; - - - - } // namespace proc::engine -} // namespace proc + + /** + * Representation of a OpenGL accelerated Video render process + */ + class GLRender : public proc_interface::StateProxy + {}; + +} // namespace engine #endif diff --git a/src/proc/engine/hub.cpp b/src/proc/engine/hub.cpp index c6333f35c..14c847aed 100644 --- a/src/proc/engine/hub.cpp +++ b/src/proc/engine/hub.cpp @@ -23,16 +23,12 @@ #include "proc/engine/hub.hpp" -namespace proc +namespace engine { - namespace engine - { - - /** */ - - - - - } // namespace proc::engine -} // namespace proc + /** */ + + + + +} // namespace engine diff --git a/src/proc/engine/hub.hpp b/src/proc/engine/hub.hpp index 528702996..d7961db36 100644 --- a/src/proc/engine/hub.hpp +++ b/src/proc/engine/hub.hpp @@ -21,28 +21,24 @@ */ -#ifndef PROC_ENGINE_HUB_H -#define PROC_ENGINE_HUB_H +#ifndef ENGINE_HUB_H +#define ENGINE_HUB_H #include "proc/engine/procnode.hpp" -namespace proc +namespace engine { - namespace engine - { - class Hub : public ProcNode - {}; - ///TODO: seems rather we don't need this one anymore?? - //////// to be decided after the implementing the basic render engine.... - - - - - } // namespace proc::engine + class Hub : public ProcNode + {}; + ///TODO: seems rather we don't need this one anymore?? + //////// to be decided after the implementing the basic render engine.... -} // namespace proc + + + +} // namespace engine #endif diff --git a/src/proc/engine/link.cpp b/src/proc/engine/link.cpp index 6bbfe65bf..b447accbd 100644 --- a/src/proc/engine/link.cpp +++ b/src/proc/engine/link.cpp @@ -23,16 +23,12 @@ #include "proc/engine/link.hpp" -namespace proc +namespace engine { - namespace engine - { - - /** */ - - - - - } // namespace proc::engine -} // namespace proc + /** */ + + + + +} // namespace engine diff --git a/src/proc/engine/link.hpp b/src/proc/engine/link.hpp index 0fd62cc6d..42127f86c 100644 --- a/src/proc/engine/link.hpp +++ b/src/proc/engine/link.hpp @@ -1,5 +1,5 @@ /* - PIPE.hpp - forwarding, adapting or connecting ProcNode + LINK.hpp - forwarding, adapting or connecting ProcNode Copyright (C) CinelerraCV 2007, Christian Thaeter @@ -21,34 +21,30 @@ */ -#ifndef PROC_ENGINE_PIPE_H -#define PROC_ENGINE_PIPE_H +#ifndef ENGINE_LINK_H +#define ENGINE_LINK_H #include "proc/engine/procnode.hpp" -namespace proc +namespace engine { - namespace engine - { - - - /** - * Abstraction of all sorts of connecting Elements with - * special functionality. For example the coneections enabling - * to mix OpenGL implemented Effects/Previews with normal CPU based - * processing in one render pipeline. - */ - class Link : public ProcNode - { - ///////TODO: flatten hierarchy if we don't have common functionallity for all Link-Subclasses - ///////TODO: can be decdiede when we know more how to handle OpenGL rendering - }; - - - - } // namespace proc::engine -} // namespace proc + + /** + * Abstraction of all sorts of connecting Elements with + * special functionality. For example the coneections enabling + * to mix OpenGL implemented Effects/Previews with normal CPU based + * processing in one render pipeline. + */ + class Link : public ProcNode + { + ///////TODO: flatten hierarchy if we don't have common functionallity for all Link-Subclasses + ///////TODO: can be decdiede when we know more how to handle OpenGL rendering + }; + + + +} // namespace engine #endif diff --git a/src/proc/engine/mask.cpp b/src/proc/engine/mask.cpp index 70292802c..b1b292557 100644 --- a/src/proc/engine/mask.cpp +++ b/src/proc/engine/mask.cpp @@ -23,16 +23,12 @@ #include "proc/engine/mask.hpp" -namespace proc +namespace engine { - namespace engine - { - - /** */ - - - - - } // namespace proc::engine -} // namespace proc + /** */ + + + + +} // namespace engine diff --git a/src/proc/engine/mask.hpp b/src/proc/engine/mask.hpp index c4ff32ff4..89fc22af0 100644 --- a/src/proc/engine/mask.hpp +++ b/src/proc/engine/mask.hpp @@ -21,26 +21,22 @@ */ -#ifndef PROC_ENGINE_MASK_H -#define PROC_ENGINE_MASK_H +#ifndef ENGINE_MASK_H +#define ENGINE_MASK_H #include "proc/engine/trafo.hpp" -namespace proc +namespace engine { - namespace engine - { - class Mask : public Trafo - {}; - - - - - } // namespace proc::engine + class Mask : public Trafo + {}; -} // namespace proc + + + +} // namespace engine #endif diff --git a/src/proc/engine/pluginadapter.cpp b/src/proc/engine/pluginadapter.cpp index a46657fc6..909271133 100644 --- a/src/proc/engine/pluginadapter.cpp +++ b/src/proc/engine/pluginadapter.cpp @@ -23,16 +23,12 @@ #include "proc/engine/pluginadapter.hpp" -namespace proc +namespace engine { - namespace engine - { - - /** */ - - - - - } // namespace proc::engine -} // namespace proc + /** */ + + + + +} // namespace engine diff --git a/src/proc/engine/pluginadapter.hpp b/src/proc/engine/pluginadapter.hpp index 91ade35df..8c0a850a7 100644 --- a/src/proc/engine/pluginadapter.hpp +++ b/src/proc/engine/pluginadapter.hpp @@ -21,32 +21,28 @@ */ -#ifndef PROC_ENGINE_PLUGINADAPTER_H -#define PROC_ENGINE_PLUGINADAPTER_H +#ifndef ENGINE_PLUGINADAPTER_H +#define ENGINE_PLUGINADAPTER_H #include "proc/engine/trafo.hpp" -namespace proc +namespace engine { - 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. - */ - class PluginAdapter : public Trafo - { - ///////////// - }; - - - - } // namespace proc::engine -} // namespace proc + + /** + * 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. + */ + class PluginAdapter : public Trafo + { + ///////////// + }; + + + +} // namespace engine #endif diff --git a/src/proc/engine/processor.cpp b/src/proc/engine/processor.cpp index b001afa48..a81589342 100644 --- a/src/proc/engine/processor.cpp +++ b/src/proc/engine/processor.cpp @@ -25,16 +25,12 @@ #include "proc/engine/exitnode.hpp" #include "proc/stateproxy.hpp" -namespace proc +namespace engine { - namespace engine - { - - /** */ - - - - - } // namespace proc::engine -} // namespace proc + /** */ + + + + +} // namespace engine diff --git a/src/proc/engine/processor.hpp b/src/proc/engine/processor.hpp index 408538020..0794d7285 100644 --- a/src/proc/engine/processor.hpp +++ b/src/proc/engine/processor.hpp @@ -21,38 +21,33 @@ */ -#ifndef PROC_ENGINE_PROCESSOR_H -#define PROC_ENGINE_PROCESSOR_H +#ifndef ENGINE_PROCESSOR_H +#define ENGINE_PROCESSOR_H -#include "common/time.hpp" +#include "cinelerra.h" #include "proc/stateproxy.hpp" - -namespace proc +namespace engine { - namespace engine + + class ExitNode; + + class Processor { + protected: + ExitNode * output; - class ExitNode; + /** begin of the timerange covered by this processor */ + cinelerra::Time start; - class Processor - { - protected: - ExitNode * output; + /**end (exclusive) of the timerange */ + cinelerra::Time end; - /** begin of the timerange covered by this processor */ - cinelerra::Time start; + }; - /**end (exclusive) of the timerange */ - cinelerra::Time end; - }; - - - - } // namespace proc::engine -} // namespace proc +} // namespace engine #endif diff --git a/src/proc/engine/procnode.cpp b/src/proc/engine/procnode.cpp index 74457f3be..81a1dd22d 100644 --- a/src/proc/engine/procnode.cpp +++ b/src/proc/engine/procnode.cpp @@ -23,15 +23,11 @@ #include "proc/engine/procnode.hpp" -namespace proc +namespace engine { - namespace engine - { - /** */ - + /** */ - } // namespace proc::engine -} // namespace proc +} // namespace engine diff --git a/src/proc/engine/procnode.hpp b/src/proc/engine/procnode.hpp index d3bc83acd..dbf983f3c 100644 --- a/src/proc/engine/procnode.hpp +++ b/src/proc/engine/procnode.hpp @@ -21,8 +21,8 @@ */ -#ifndef PROC_ENGINE_PROCNODE_H -#define PROC_ENGINE_PROCNODE_H +#ifndef ENGINE_PROCNODE_H +#define ENGINE_PROCNODE_H #include @@ -33,31 +33,26 @@ using std::vector; -namespace proc +namespace engine { - namespace engine + + + /** + * Key abstraction of the Render Engine: A Data processing Node + */ + class ProcNode { + protected: + typedef mobject::Parameter Param; + /** The predecessor in a processing pipeline. + * I.e. a source to get data to be processed + */ + ProcNode * datasrc; - /** - * Key abstraction of the Render Engine: A Data processing Node - */ - class ProcNode - { - protected: - typedef proc::mobject::Parameter Param; - - /** The predecessor in a processing pipeline. - * I.e. a source to get data to be processed - */ - ProcNode * datasrc; + vector params; - vector params; + }; - }; - - - } // namespace proc::engine - -} // namespace proc +} // namespace engine #endif diff --git a/src/proc/engine/projector.cpp b/src/proc/engine/projector.cpp index 92ddee6a8..15eef8c8a 100644 --- a/src/proc/engine/projector.cpp +++ b/src/proc/engine/projector.cpp @@ -23,16 +23,12 @@ #include "proc/engine/projector.hpp" -namespace proc +namespace engine { - namespace engine - { - - /** */ - - - - - } // namespace proc::engine -} // namespace proc + /** */ + + + + +} // namespace engine diff --git a/src/proc/engine/projector.hpp b/src/proc/engine/projector.hpp index bb6b0539c..881a988b1 100644 --- a/src/proc/engine/projector.hpp +++ b/src/proc/engine/projector.hpp @@ -21,30 +21,26 @@ */ -#ifndef PROC_ENGINE_PROJECTOR_H -#define PROC_ENGINE_PROJECTOR_H +#ifndef ENGINE_PROJECTOR_H +#define ENGINE_PROJECTOR_H #include "proc/engine/trafo.hpp" -namespace proc +namespace engine { - namespace engine - { - - - /** - * Special video processing node used to scale and translate image data. - */ - class Projector : public Trafo - { - //////////// - }; - - - - } // namespace proc::engine -} // namespace proc + + /** + * Special video processing node used to scale and translate image data. + */ + class Projector : public Trafo + { + //////////// + }; + + + +} // namespace engine #endif diff --git a/src/proc/engine/renderengine.cpp b/src/proc/engine/renderengine.cpp index f0809aebb..50ba3b68b 100644 --- a/src/proc/engine/renderengine.cpp +++ b/src/proc/engine/renderengine.cpp @@ -23,23 +23,18 @@ #include "proc/engine/renderengine.hpp" -namespace proc +namespace engine { - namespace engine - { - /** - * TODO: will probably be handled differently (see Cehteh) - */ - void - RenderEngine::play () - { - } + /** + * TODO: will probably be handled differently (see Cehteh) + */ + void + RenderEngine::play () + {} - } // namespace proc::engine - -} // namespace proc +} // namespace engine diff --git a/src/proc/engine/renderengine.hpp b/src/proc/engine/renderengine.hpp index 0184af4f9..a05a1f596 100644 --- a/src/proc/engine/renderengine.hpp +++ b/src/proc/engine/renderengine.hpp @@ -21,8 +21,8 @@ */ -#ifndef PROC_ENGINE_RENDERENGINE_H -#define PROC_ENGINE_RENDERENGINE_H +#ifndef ENGINE_RENDERENGINE_H +#define ENGINE_RENDERENGINE_H #include @@ -32,27 +32,22 @@ using std::list; -namespace proc +namespace engine { - namespace engine + + + class RenderEngine : public Processor { + public: + /** + * TODO: will probably be handled differently (see Cehteh) + */ + void play () ; + private: + list renderSegments; - class RenderEngine : public Processor - { - public: - /** - * TODO: will probably be handled differently (see Cehteh) - */ - void play () ; + }; - private: - list renderSegments; - - }; - - - } // namespace proc::engine - -} // namespace proc +} // namespace engine #endif diff --git a/src/proc/engine/source.cpp b/src/proc/engine/source.cpp index cebe3e7a5..801da289e 100644 --- a/src/proc/engine/source.cpp +++ b/src/proc/engine/source.cpp @@ -23,16 +23,12 @@ #include "proc/engine/source.hpp" -namespace proc +namespace engine { - namespace engine - { - - /** */ - - - - - } // namespace proc::engine -} // namespace proc + /** */ + + + + +} // namespace engine diff --git a/src/proc/engine/source.hpp b/src/proc/engine/source.hpp index ed659ae09..9241b7998 100644 --- a/src/proc/engine/source.hpp +++ b/src/proc/engine/source.hpp @@ -21,33 +21,29 @@ */ -#ifndef PROC_ENGINE_SOURCE_H -#define PROC_ENGINE_SOURCE_H +#ifndef ENGINE_SOURCE_H +#define ENGINE_SOURCE_H #include "proc/engine/procnode.hpp" -namespace proc +namespace engine { - namespace engine + + + /** + * Source Node: represents a media source to pull data from. + * Source is special, because it has no predecessor nodes, + * but rather makes calls down to the data backend internally + * to get at the raw data. + */ + class Source : public ProcNode { + /////////////////TODO + }; - /** - * Source Node: represents a media source to pull data from. - * Source is special, because it has no predecessor nodes, - * but rather makes calls down to the data backend internally - * to get at the raw data. - */ - class Source : public ProcNode - { - /////////////////TODO - }; - - - - } // namespace proc::engine -} // namespace proc +} // namespace engine #endif diff --git a/src/proc/engine/trafo.cpp b/src/proc/engine/trafo.cpp index 934583974..c570e999e 100644 --- a/src/proc/engine/trafo.cpp +++ b/src/proc/engine/trafo.cpp @@ -23,15 +23,11 @@ #include "proc/engine/trafo.hpp" -namespace proc +namespace engine { - namespace engine - { - - /** */ - - - - } // namespace proc::engine -} // namespace proc + /** */ + + + +} // namespace engine diff --git a/src/proc/engine/trafo.hpp b/src/proc/engine/trafo.hpp index 8befa1b1c..6aa327beb 100644 --- a/src/proc/engine/trafo.hpp +++ b/src/proc/engine/trafo.hpp @@ -21,35 +21,31 @@ */ -#ifndef PROC_ENGINE_TRAFO_H -#define PROC_ENGINE_TRAFO_H +#ifndef ENGINE_TRAFO_H +#define ENGINE_TRAFO_H #include "proc/engine/procnode.hpp" -namespace proc +namespace engine { - namespace engine - { - - - /** - * abstraction of the most important kind of Processing node, - * which really works on the media data and transforms input - * into ouput. Subclasses include the (Video) Projector - * for scaling/translating, all sorts of effects (Plugins), - * as well as the low level codecs used to decode the raw - * media at the source end of the render pipeline(s) - */ - class Trafo : public ProcNode - { - /////////// - }; - - - - } // namespace proc::engine -} // namespace proc + + /** + * abstraction of the most important kind of Processing node, + * which really works on the media data and transforms input + * into ouput. Subclasses include the (Video) Projector + * for scaling/translating, all sorts of effects (Plugins), + * as well as the low level codecs used to decode the raw + * media at the source end of the render pipeline(s) + */ + class Trafo : public ProcNode + { + /////////// + }; + + + +} // namespace engine #endif diff --git a/src/proc/engine/vframe.cpp b/src/proc/engine/vframe.cpp index 1e9d22139..9fe88d7a1 100644 --- a/src/proc/engine/vframe.cpp +++ b/src/proc/engine/vframe.cpp @@ -23,16 +23,11 @@ #include "proc/engine/vframe.hpp" -namespace proc +namespace engine { - namespace engine - { - - /** */ - - - - } // namespace proc::engine + /** */ -} // namespace proc + + +} // namespace engine diff --git a/src/proc/engine/vframe.hpp b/src/proc/engine/vframe.hpp index 2496397bd..350b7d26a 100644 --- a/src/proc/engine/vframe.hpp +++ b/src/proc/engine/vframe.hpp @@ -21,27 +21,21 @@ */ -#ifndef PROC_ENGINE_VFRAME_H -#define PROC_ENGINE_VFRAME_H +#ifndef ENGINE_VFRAME_H +#define ENGINE_VFRAME_H #include "proc/frame.hpp" -namespace proc +namespace engine { - namespace engine - { - - - class VFrame : public proc::Frame - { - /////////////////////// - }; - - - - } // namespace proc::engine -} // namespace proc + + class VFrame : public proc_interface::Frame + { + /////////////////////// + }; + +} // namespace engine #endif diff --git a/src/proc/engine/vrender.cpp b/src/proc/engine/vrender.cpp index bd29cd1cc..1fbd6b6b3 100644 --- a/src/proc/engine/vrender.cpp +++ b/src/proc/engine/vrender.cpp @@ -23,15 +23,11 @@ #include "proc/engine/vrender.hpp" -namespace proc +namespace engine { - namespace engine - { - - /** */ - - - - } // namespace proc::engine -} // namespace proc + /** */ + + + + } // namespace engine diff --git a/src/proc/engine/vrender.hpp b/src/proc/engine/vrender.hpp index 19037ed79..5a9f16179 100644 --- a/src/proc/engine/vrender.hpp +++ b/src/proc/engine/vrender.hpp @@ -21,31 +21,27 @@ */ -#ifndef PROC_ENGINE_VRENDER_H -#define PROC_ENGINE_VRENDER_H +#ifndef ENGINE_VRENDER_H +#define ENGINE_VRENDER_H #include "proc/stateproxy.hpp" -namespace proc +namespace engine { - namespace engine - { - - - /** - * Representation of a Video render process. - * (Encapsulates the video buffers for the actual calculations) - */ - class VRender : public proc::StateProxy - { - ///////////// - }; - - - - } // namespace proc::engine -} // namespace proc + + /** + * Representation of a Video render process. + * (Encapsulates the video buffers for the actual calculations) + */ + class VRender : public proc_interface::StateProxy + { + ///////////// + }; + + + +} // namespace engine #endif diff --git a/src/proc/frame.cpp b/src/proc/frame.cpp index 9df36467b..9443b46e7 100644 --- a/src/proc/frame.cpp +++ b/src/proc/frame.cpp @@ -23,11 +23,11 @@ #include "proc/frame.hpp" -namespace proc +namespace proc_interface { /** */ -} // namespace proc +} // namespace proc_interface diff --git a/src/proc/frame.hpp b/src/proc/frame.hpp index ad453eba0..072f57a2d 100644 --- a/src/proc/frame.hpp +++ b/src/proc/frame.hpp @@ -21,12 +21,12 @@ */ -#ifndef PROC_FRAME_H -#define PROC_FRAME_H +#ifndef PROC_INTERFACE_FRAME_H +#define PROC_INTERFACE_FRAME_H -namespace proc +namespace proc_interface { @@ -42,5 +42,5 @@ namespace proc -} // namespace proc +} // namespace proc_interface #endif diff --git a/src/proc/mobject/buildable.cpp b/src/proc/mobject/buildable.cpp index 9379d1799..1b9d335de 100644 --- a/src/proc/mobject/buildable.cpp +++ b/src/proc/mobject/buildable.cpp @@ -24,24 +24,20 @@ #include "proc/mobject/buildable.hpp" #include "proc/mobject/builder/tool.hpp" -namespace proc +namespace mobject { - namespace mobject - { - /** typically the provided actual Tool class will - * contain overloaded fuctions for treating - * different Buildable subclasses specifically - */ - void - Buildable::apply (builder::Tool& provided_tool) - { - provided_tool.treat( *this); //// TODO: how to call??? (ref or pointer??) - } + /** typically the provided actual Tool class will + * contain overloaded fuctions for treating + * different Buildable subclasses specifically + */ + void + Buildable::apply (builder::Tool& provided_tool) + { + provided_tool.treat( *this); //// TODO: how to call??? (ref or pointer??) + } - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject diff --git a/src/proc/mobject/buildable.hpp b/src/proc/mobject/buildable.hpp index c0f16ef15..145c3496b 100644 --- a/src/proc/mobject/buildable.hpp +++ b/src/proc/mobject/buildable.hpp @@ -21,35 +21,31 @@ */ -#ifndef PROC_MOBJECT_BUILDABLE_H -#define PROC_MOBJECT_BUILDABLE_H +#ifndef MOBJECT_BUILDABLE_H +#define MOBJECT_BUILDABLE_H -namespace proc +namespace mobject { - namespace mobject - { - - - namespace builder{ class Tool; } - - - /** - * All Buidables support double-dispatch of given Tool operations. - * The actual operation is thus selected at runtime based both on the - * actual type of the Tool class /and/ the actual type of the Buildabele. - */ - class Buildable - { - public: - void apply (builder::Tool& provided_tool) ; - }; - - - - } // namespace proc::mobject -} // namespace proc + + namespace builder{ class Tool; } + + + /** + * All Buidables support double-dispatch of given Tool operations. + * The actual operation is thus selected at runtime based both on the + * actual type of the Tool class /and/ the actual type of the Buildabele. + */ + class Buildable + { + public: + void apply (builder::Tool& provided_tool) ; + }; + + + +} // namespace mobject #endif diff --git a/src/proc/mobject/builder/assembler.cpp b/src/proc/mobject/builder/assembler.cpp index 04df4ce83..1be4f8957 100644 --- a/src/proc/mobject/builder/assembler.cpp +++ b/src/proc/mobject/builder/assembler.cpp @@ -23,25 +23,20 @@ #include "proc/mobject/builder/assembler.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace builder { - namespace builder - { - - - - proc::engine::RenderEngine & - Assembler::build () - { - } - - - - - } // namespace proc::mobject::builder - } // namespace proc::mobject -} // namespace proc + + engine::RenderEngine & + Assembler::build () + { + } + + + + } // namespace mobject::builder + +} // namespace mobject diff --git a/src/proc/mobject/builder/assembler.hpp b/src/proc/mobject/builder/assembler.hpp index df2028439..238071f79 100644 --- a/src/proc/mobject/builder/assembler.hpp +++ b/src/proc/mobject/builder/assembler.hpp @@ -21,38 +21,34 @@ */ -#ifndef PROC_MOBJECT_BUILDER_ASSEMBLER_H -#define PROC_MOBJECT_BUILDER_ASSEMBLER_H +#ifndef MOBJECT_BUILDER_ASSEMBLER_H +#define MOBJECT_BUILDER_ASSEMBLER_H #include "proc/engine/renderengine.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace builder { - namespace builder + + + /** + * This is the actual building facility: + * provided the correct tools and associations, + * it serves to build and connect the individual ProcNode objects + */ + class Assembler { + public: + engine::RenderEngine & build () ; + // TODO: allocation, GC??? + }; - /** - * This is the actual building facility: - * provided the correct tools and associations, - * it serves to build and connect the individual ProcNode objects - */ - class Assembler - { - public: - proc::engine::RenderEngine & build () ; - // TODO: allocation, GC??? - }; - - - - } // namespace proc::mobject::builder - } // namespace proc::mobject + } // namespace mobject::builder -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/mobject/builder/conmanager.cpp b/src/proc/mobject/builder/conmanager.cpp index 8232affff..c159c24e8 100644 --- a/src/proc/mobject/builder/conmanager.cpp +++ b/src/proc/mobject/builder/conmanager.cpp @@ -23,27 +23,24 @@ #include "proc/mobject/builder/conmanager.hpp" -namespace proc +namespace mobject { - namespace mobject + + namespace builder { - namespace builder - { - /** - * TODO !!!!!!!!!!!!!!!!!! - */ - int - ConManager::getConnection () - { - } + /** + * TODO !!!!!!!!!!!!!!!!!! + */ + int + ConManager::getConnection () + { + } - } // namespace proc::mobject::builder + } // namespace mobject::builder - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject diff --git a/src/proc/mobject/builder/conmanager.hpp b/src/proc/mobject/builder/conmanager.hpp index 0e9a3fc72..bd390e96b 100644 --- a/src/proc/mobject/builder/conmanager.hpp +++ b/src/proc/mobject/builder/conmanager.hpp @@ -21,39 +21,35 @@ */ -#ifndef PROC_MOBJECT_BUILDER_CONMANAGER_H -#define PROC_MOBJECT_BUILDER_CONMANAGER_H +#ifndef MOBJECT_BUILDER_CONMANAGER_H +#define MOBJECT_BUILDER_CONMANAGER_H -namespace proc +namespace mobject { - namespace mobject + namespace builder { - namespace builder + + + /** + * Connection 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. + */ + class ConManager { + public: + /** + * TODO just a design sketch, work out signatures etc... + */ + int getConnection () ; + }; - /** - * Connection 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. - */ - class ConManager - { - public: - /** - * TODO just a design sketch, work out signatures etc... - */ - int getConnection () ; - }; - - - - } // namespace proc::mobject::builder - } // namespace proc::mobject + } // namespace mobject::builder -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/mobject/builder/nodecreatertool.cpp b/src/proc/mobject/builder/nodecreatertool.cpp index 62f3681b2..81f0281b5 100644 --- a/src/proc/mobject/builder/nodecreatertool.cpp +++ b/src/proc/mobject/builder/nodecreatertool.cpp @@ -27,48 +27,44 @@ #include "proc/mobject/session/effect.hpp" #include "proc/mobject/session/auto.hpp" +using mobject::Buildable; +using mobject::session::Clip; +using mobject::session::Effect; +using mobject::session::Auto; -using proc::mobject::Buildable; -using proc::mobject::session::Clip; -using proc::mobject::session::Effect; -using proc::mobject::session::Auto; - -namespace proc +namespace mobject { - namespace mobject + + namespace builder { - namespace builder - { - void - NodeCreatorTool::treat (Buildable& something) - { - } + void + NodeCreatorTool::treat (Buildable& something) + { + } - void - NodeCreatorTool::treat (Clip& clip) - { - } + void + NodeCreatorTool::treat (Clip& clip) + { + } - void - NodeCreatorTool::treat (Effect& effect) - { - } + void + NodeCreatorTool::treat (Effect& effect) + { + } - void - NodeCreatorTool::treat (Auto& automation) - { - } + void + NodeCreatorTool::treat (Auto& automation) + { + } - } // namespace proc::mobject::builder + } // namespace mobject::builder - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject diff --git a/src/proc/mobject/builder/nodecreatertool.hpp b/src/proc/mobject/builder/nodecreatertool.hpp index 2ae3eec70..ea1c5f26d 100644 --- a/src/proc/mobject/builder/nodecreatertool.hpp +++ b/src/proc/mobject/builder/nodecreatertool.hpp @@ -21,8 +21,8 @@ */ -#ifndef PROC_MOBJECT_BUILDER_NODECREATERTOOL_H -#define PROC_MOBJECT_BUILDER_NODECREATERTOOL_H +#ifndef MOBJECT_BUILDER_NODECREATERTOOL_H +#define MOBJECT_BUILDER_NODECREATERTOOL_H #include "proc/mobject/builder/tool.hpp" #include "proc/mobject/buildable.hpp" @@ -30,53 +30,47 @@ -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session - { - // Forward declarations - class Effect; - class Clip; - template class Auto; - } - - namespace builder + // Forward declarations + class Effect; + class Clip; + template class Auto; + } + + namespace builder + { + + + + // TODO: define Lifecycle... + + /** + * This 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. + */ + class NodeCreatorTool : public Tool { + public: + virtual void treat (mobject::session::Clip& clip) ; + virtual void treat (mobject::session::Effect& effect) ; + virtual void treat (mobject::session::Auto& automation) ; //TODO: the automation-type-problem + virtual void treat (mobject::Buildable& something) ; - - - // TODO: define Lifecycle... - /** - * This 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. - */ - class NodeCreatorTool : public Tool - { - public: - virtual void treat (proc::mobject::session::Clip& clip) ; - virtual void treat (proc::mobject::session::Effect& effect) ; - virtual void treat (proc::mobject::session::Auto& automation) ; //TODO: the automation-type-problem - virtual void treat (proc::mobject::Buildable& something) ; + protected: + /** holds the Processor (Render Engine Element) + * to be built by the current build step + */ + engine::Processor* proc; - - protected: - /** holds the Processor (Render Engine Element) - * to be built by the current build step - */ - proc::engine::Processor* proc; + }; - }; + } // namespace mobject::builder - - - } // namespace proc::mobject::builder - - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/mobject/builder/segmentationtool.cpp b/src/proc/mobject/builder/segmentationtool.cpp index 4a7b25951..65965fec4 100644 --- a/src/proc/mobject/builder/segmentationtool.cpp +++ b/src/proc/mobject/builder/segmentationtool.cpp @@ -27,41 +27,37 @@ #include "proc/mobject/session/effect.hpp" #include "proc/mobject/session/segment.hpp" -using proc::mobject::Buildable; -using proc::mobject::session::Clip; -using proc::mobject::session::Effect; +using mobject::Buildable; +using mobject::session::Clip; +using mobject::session::Effect; -namespace proc +namespace mobject { - namespace mobject + namespace builder { - namespace builder - { - void - SegmentationTool::treat (Buildable& something) - { - } + void + SegmentationTool::treat (Buildable& something) + { + } - void - SegmentationTool::treat (Clip& clip) - { - } + void + SegmentationTool::treat (Clip& clip) + { + } - void - SegmentationTool::treat (Effect& effect) - { - } + void + SegmentationTool::treat (Effect& effect) + { + } - } // namespace proc::mobject::builder + } // namespace mobject::builder - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject diff --git a/src/proc/mobject/builder/segmentationtool.hpp b/src/proc/mobject/builder/segmentationtool.hpp index 7e222c24a..5f666ea78 100644 --- a/src/proc/mobject/builder/segmentationtool.hpp +++ b/src/proc/mobject/builder/segmentationtool.hpp @@ -21,8 +21,8 @@ */ -#ifndef PROC_MOBJECT_BUILDER_SEGMENTATIONTOOL_H -#define PROC_MOBJECT_BUILDER_SEGMENTATIONTOOL_H +#ifndef MOBJECT_BUILDER_SEGMENTATIONTOOL_H +#define MOBJECT_BUILDER_SEGMENTATIONTOOL_H #include @@ -34,50 +34,46 @@ using std::list; -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session - { - // Forward declarations - class Clip; - class Effect; - } - - namespace builder + // Forward declarations + class Clip; + class Effect; + } + + namespace builder + { + + + /** + * Tool implementation for deriving a partitioning of the current + * timeline, such that each segement has a constant configuration. + * "Constant" means here, that any remaining changes over time + * can be represented by automation solely, without the need + * to change the node connections. + */ + class SegmentationTool : public Tool { + public: + void treat (mobject::session::Clip& clip) ; + void treat (mobject::session::Effect& effect) ; + + void treat (mobject::Buildable& something) ; + + protected: + typedef mobject::session::Segment Segment; + + /** Partitioning of the Timeline to be created by this tool. */ + list segments; + // TODO handle alloc!!!! + + }; - /** - * Tool implementation for deriving a partitioning of the current - * timeline, such that each segement has a constant configuration. - * "Constant" means here, that any remaining changes over time - * can be represented by automation solely, without the need - * to change the node connections. - */ - class SegmentationTool : public Tool - { - public: - void treat (proc::mobject::session::Clip& clip) ; - void treat (proc::mobject::session::Effect& effect) ; - void treat (proc::mobject::Buildable& something) ; + } // namespace mobject::builder - protected: - typedef proc::mobject::session::Segment Segment; - - /** Partitioning of the Timeline to be created by this tool. */ - list segments; - // TODO handle alloc!!!! - - }; - - - - } // namespace proc::mobject::builder - - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/mobject/builder/tool.cpp b/src/proc/mobject/builder/tool.cpp index 5861e8814..784692485 100644 --- a/src/proc/mobject/builder/tool.cpp +++ b/src/proc/mobject/builder/tool.cpp @@ -24,21 +24,17 @@ #include "proc/mobject/builder/tool.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace builder { - namespace builder - { - /** */ + /** */ - } // namespace proc::mobject::builder + } // namespace mobject::builder - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject diff --git a/src/proc/mobject/builder/tool.hpp b/src/proc/mobject/builder/tool.hpp index f8ec88452..e6ca43f07 100644 --- a/src/proc/mobject/builder/tool.hpp +++ b/src/proc/mobject/builder/tool.hpp @@ -21,41 +21,35 @@ */ -#ifndef PROC_MOBJECT_BUILDER_TOOL_H -#define PROC_MOBJECT_BUILDER_TOOL_H +#ifndef MOBJECT_BUILDER_TOOL_H +#define MOBJECT_BUILDER_TOOL_H -#include "proc/mobject/buildable.hpp" +#include "proc/mobject/buildable.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace builder { - namespace builder + + + /** + * Used according to the visitor pattern: each Tool contains + * the concrete implementation for one task to be done to the various MObject classes + */ + class Tool { + protected: + typedef mobject::Buildable Buildable; + public: + /** This operation is to be overloaded for specific MObject subclasses to be treated. + */ + virtual void treat (Buildable& mElement) = 0; + }; - /** - * Used according to the visitor pattern: each Tool contains - * the concrete implementation for one task to be done to the various MObject classes - */ - class Tool - { - protected: - typedef proc::mobject::Buildable Buildable; - - public: - /** This operation is to be overloaded for specific MObject subclasses to be treated. - */ - virtual void treat (Buildable& mElement) = 0; - }; + } // namespace mobject::builder - - - } // namespace proc::mobject::builder - - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/mobject/builder/toolfactory.cpp b/src/proc/mobject/builder/toolfactory.cpp index 3e28f372a..1297d15b4 100644 --- a/src/proc/mobject/builder/toolfactory.cpp +++ b/src/proc/mobject/builder/toolfactory.cpp @@ -23,24 +23,20 @@ #include "proc/mobject/builder/toolfactory.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace builder { - namespace builder - { - - - - Tool& - ToolFactory::configure () - { - } - - - - } // namespace proc::mobject::builder - } // namespace proc::mobject -} // namespace proc + + Tool & + ToolFactory::configure () + { + } + + + + } // namespace mobject::builder + +} // namespace mobject diff --git a/src/proc/mobject/builder/toolfactory.hpp b/src/proc/mobject/builder/toolfactory.hpp index 5b357341c..65c74913e 100644 --- a/src/proc/mobject/builder/toolfactory.hpp +++ b/src/proc/mobject/builder/toolfactory.hpp @@ -21,32 +21,28 @@ */ -#ifndef PROC_MOBJECT_BUILDER_TOOLFACTORY_H -#define PROC_MOBJECT_BUILDER_TOOLFACTORY_H +#ifndef MOBJECT_BUILDER_TOOLFACTORY_H +#define MOBJECT_BUILDER_TOOLFACTORY_H #include "proc/mobject/builder/tool.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace builder { - namespace builder + + + class ToolFactory { + public: + Tool & configure () ; + }; - class ToolFactory - { - public: - Tool & configure () ; - }; - - - - } // namespace proc::mobject::builder - } // namespace proc::mobject + } // namespace mobject::builder -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/mobject/builderfacade.cpp b/src/proc/mobject/builderfacade.cpp index 473ae2301..6113ad857 100644 --- a/src/proc/mobject/builderfacade.cpp +++ b/src/proc/mobject/builderfacade.cpp @@ -23,24 +23,20 @@ #include "proc/mobject/builderfacade.hpp" -namespace proc +namespace mobject { - namespace mobject - { - - - /** - * Main Operation of the Builder: - * create a render engine for a given part of the timeline - */ - proc::engine::RenderEngine & - BuilderFacade::buildEngine () - { - //////////////////////TODO - } - - - - } // namespace proc::mobject -} // namespace proc + + /** + * Main Operation of the Builder: + * create a render engine for a given part of the timeline + */ + engine::RenderEngine & + BuilderFacade::buildEngine () + { + //////////////////////TODO + } + + + +} // namespace mobject diff --git a/src/proc/mobject/builderfacade.hpp b/src/proc/mobject/builderfacade.hpp index e1e04d82e..72c884e20 100644 --- a/src/proc/mobject/builderfacade.hpp +++ b/src/proc/mobject/builderfacade.hpp @@ -21,39 +21,35 @@ */ -#ifndef PROC_MOBJECT_BUILDERFACADE_H -#define PROC_MOBJECT_BUILDERFACADE_H +#ifndef MOBJECT_BUILDERFACADE_H +#define MOBJECT_BUILDERFACADE_H #include "proc/engine/renderengine.hpp" -namespace proc +namespace mobject { - namespace mobject - { - - - /** - * Provides 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. - */ - class BuilderFacade - { - public: - /** - * Main Operation of the Builder: - * create a render engine for a given part of the timeline - */ - proc::engine::RenderEngine & buildEngine () ; - // TODO: allocation, GC?????? - }; - - - - } // namespace proc::mobject -} // namespace proc + + /** + * Provides 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. + */ + class BuilderFacade + { + public: + /** + * Main Operation of the Builder: + * create a render engine for a given part of the timeline + */ + engine::RenderEngine & buildEngine () ; + // TODO: allocation, GC?????? + }; + + + +} // namespace mobject #endif diff --git a/src/proc/mobject/controller/pathmanager.cpp b/src/proc/mobject/controller/pathmanager.cpp index f7cb5841b..674fb6847 100644 --- a/src/proc/mobject/controller/pathmanager.cpp +++ b/src/proc/mobject/controller/pathmanager.cpp @@ -23,25 +23,21 @@ #include "proc/mobject/controller/pathmanager.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace controller { - namespace controller - { - - - - proc::engine::Processor * - PathManager::buildProcessor () - { - return 0;//////////////////TODO - } - - - - } // namespace proc::mobject::controller - } // namespace proc::mobject -} // namespace proc + + engine::Processor * + PathManager::buildProcessor () + { + return 0;//////////////////TODO + } + + + + } // namespace mobject::controller + +} // namespace mobject diff --git a/src/proc/mobject/controller/pathmanager.hpp b/src/proc/mobject/controller/pathmanager.hpp index 8005c9d14..786297360 100644 --- a/src/proc/mobject/controller/pathmanager.hpp +++ b/src/proc/mobject/controller/pathmanager.hpp @@ -21,38 +21,34 @@ */ -#ifndef PROC_MOBJECT_CONTROLLER_PATHMANAGER_H -#define PROC_MOBJECT_CONTROLLER_PATHMANAGER_H +#ifndef MOBJECT_CONTROLLER_PATHMANAGER_H +#define MOBJECT_CONTROLLER_PATHMANAGER_H #include "proc/engine/processor.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace controller { - namespace controller + + + /** + * While building a render engine, this Strategy class + * decides on the actual render strategy in accordance + * to the current controller settings (system state) + */ + class PathManager { - - - /** - * While building a render engine, this Strategy class - * decides on the actual render strategy in accordance - * to the current controller settings (system state) - */ - class PathManager - { - public: - proc::engine::Processor* buildProcessor () ; - // TODO: allocation, GC?? - }; - - - - } // namespace proc::mobject::controller + public: + engine::Processor* buildProcessor () ; + // TODO: allocation, GC?? + }; - } // namespace proc::mobject -} // namespace proc + + } // namespace mobject::controller + +} // namespace mobject #endif diff --git a/src/proc/mobject/controller/renderstate.cpp b/src/proc/mobject/controller/renderstate.cpp index 5a64eb14b..5a1c52e7b 100644 --- a/src/proc/mobject/controller/renderstate.cpp +++ b/src/proc/mobject/controller/renderstate.cpp @@ -23,25 +23,22 @@ #include "proc/mobject/controller/renderstate.hpp" -namespace proc + +namespace mobject { - namespace mobject + namespace controller { - namespace controller - { - StateProxy& - RenderState::getStateProxy () - { - //////////////TODO - } - - - - } // namespace proc::mobject::controller + StateProxy& + RenderState::getStateProxy () + { + //////////////TODO + } - } // namespace proc::mobject -} // namespace proc + + } // namespace mobject::controller + +} // namespace mobject diff --git a/src/proc/mobject/controller/renderstate.hpp b/src/proc/mobject/controller/renderstate.hpp index 68fbe729e..b9cf195e0 100644 --- a/src/proc/mobject/controller/renderstate.hpp +++ b/src/proc/mobject/controller/renderstate.hpp @@ -21,39 +21,37 @@ */ -#ifndef PROC_MOBJECT_CONTROLLER_RENDERSTATE_H -#define PROC_MOBJECT_CONTROLLER_RENDERSTATE_H +#ifndef MOBJECT_CONTROLLER_RENDERSTATE_H +#define MOBJECT_CONTROLLER_RENDERSTATE_H #include "proc/stateproxy.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace controller { - namespace controller + + typedef proc_interface::StateProxy StateProxy; + + + /** + * Encapsulates the logic used to get a "current render process" + * in accordance to the currently applicable controller settings. + * The provided StateProxy serves to hold any mutalbe state used + * in the render process, so the rest of the render engine + * can be stateless. + */ + class RenderState { - - - /** - * Encapsulates the logic used to get a "current render process" - * in accordance to the currently applicable controller settings. - * The provided StateProxy serves to hold any mutalbe state used - * in the render process, so the rest of the render engine - * can be stateless. - */ - class RenderState - { - public: - StateProxy& getStateProxy () ; - }; - - - - } // namespace proc::mobject::controller + public: + StateProxy& getStateProxy () ; + }; - } // namespace proc::mobject -} // namespace proc + + } // namespace mobject::controller + +} // namespace mobject #endif diff --git a/src/proc/mobject/explicitplacement.cpp b/src/proc/mobject/explicitplacement.cpp index 7bc1a60c5..a81777501 100644 --- a/src/proc/mobject/explicitplacement.cpp +++ b/src/proc/mobject/explicitplacement.cpp @@ -23,15 +23,11 @@ #include "proc/mobject/explicitplacement.hpp" -namespace proc +namespace mobject { - namespace mobject - { - /** */ - - + /** */ - } // namespace proc::mobject -} // namespace proc + +} // namespace mobject diff --git a/src/proc/mobject/explicitplacement.hpp b/src/proc/mobject/explicitplacement.hpp index 58b01a802..00e77812b 100644 --- a/src/proc/mobject/explicitplacement.hpp +++ b/src/proc/mobject/explicitplacement.hpp @@ -21,35 +21,31 @@ */ -#ifndef PROC_MOBJECT_EXPLICITPLACEMENT_H -#define PROC_MOBJECT_EXPLICITPLACEMENT_H +#ifndef MOBJECT_EXPLICITPLACEMENT_H +#define MOBJECT_EXPLICITPLACEMENT_H #include "proc/mobject/placement.hpp" -namespace proc +namespace mobject { - namespace mobject + + namespace session{ class Track; } + + + // TODO: need Garbage Collector for this class!!!!! + + class ExplicitPlacement : public Placement { + protected: - namespace session{ class Track; } - - - // TODO: need Garbage Collector for this class!!!!! - - class ExplicitPlacement : public Placement - { - protected: + Time time; + Track* track; - Time time; - Track* track; + }; - }; - - - - } // namespace proc::mobject -} // namespace proc + +} // namespace mobject #endif diff --git a/src/proc/mobject/interpolator.cpp b/src/proc/mobject/interpolator.cpp index a69cb7398..36bf6e8c3 100644 --- a/src/proc/mobject/interpolator.cpp +++ b/src/proc/mobject/interpolator.cpp @@ -23,15 +23,11 @@ #include "proc/mobject/interpolator.hpp" -namespace proc +namespace mobject { - namespace mobject - { - - /** */ - - - - } // namespace proc::mobject -} // namespace proc + /** */ + + + +} // namespace mobject diff --git a/src/proc/mobject/interpolator.hpp b/src/proc/mobject/interpolator.hpp index e9e19fef2..7c1c4e9cb 100644 --- a/src/proc/mobject/interpolator.hpp +++ b/src/proc/mobject/interpolator.hpp @@ -21,30 +21,26 @@ */ -#ifndef PROC_MOBJECT_INTERPOLATOR_H -#define PROC_MOBJECT_INTERPOLATOR_H +#ifndef MOBJECT_INTERPOLATOR_H +#define MOBJECT_INTERPOLATOR_H -namespace proc +namespace mobject { - namespace mobject - { - - - /** - * Provides the implementation for getting the acutal value - * of a time varying or automated effect/plugin parameter - */ - template - class Interpolator - { - /////////////// - }; - - - - } // namespace proc::mobject -} // namespace proc + + /** + * Provides the implementation for getting the acutal value + * of a time varying or automated effect/plugin parameter + */ + template + class Interpolator + { + /////////////// + }; + + + +} // namespace mobject #endif diff --git a/src/proc/mobject/mobject.cpp b/src/proc/mobject/mobject.cpp index 0cfe2213d..47b47a943 100644 --- a/src/proc/mobject/mobject.cpp +++ b/src/proc/mobject/mobject.cpp @@ -24,14 +24,10 @@ #include "proc/mobject/mobject.hpp" #include "proc/mobject/placement.hpp" -namespace proc +namespace mobject { - namespace mobject - { - - /** */ - - - } // namespace proc::mobject -} // namespace proc + /** */ + + +} // namespace mobject diff --git a/src/proc/mobject/mobject.hpp b/src/proc/mobject/mobject.hpp index 2d5c5e2de..02a3345bc 100644 --- a/src/proc/mobject/mobject.hpp +++ b/src/proc/mobject/mobject.hpp @@ -21,47 +21,43 @@ */ -#ifndef PROC_MOBJECT_MOBJECT_H -#define PROC_MOBJECT_MOBJECT_H +#ifndef MOBJECT_MOBJECT_H +#define MOBJECT_MOBJECT_H #include -#include "common/time.hpp" +#include "cinelerra.h" #include "proc/mobject/buildable.hpp" using std::list; -namespace proc +namespace mobject { - namespace mobject + + class Placement; + + + /** + * 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 + * are MObjects. + */ + class MObject : public Buildable { - - class Placement; + protected: + typedef cinelerra::Time Time; + + // TODO: how to represent time intervals best? + Time length; + + list placement; + + }; - /** - * 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 - * are MObjects. - */ - class MObject : public Buildable - { - protected: - typedef cinelerra::Time Time; - - // TODO: how to represent time intervals best? - Time length; - list placement; - - }; - - - - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/mobject/parameter.cpp b/src/proc/mobject/parameter.cpp index 97c46f9ac..93345f05a 100644 --- a/src/proc/mobject/parameter.cpp +++ b/src/proc/mobject/parameter.cpp @@ -24,20 +24,16 @@ #include "proc/mobject/parameter.hpp" #include "proc/mobject/paramprovider.hpp" -namespace proc +namespace mobject { - namespace mobject - { - - template - VAL - Parameter::getValue () - { - ////////////TODO - } - - - - } // namespace proc::mobject -} // namespace proc + template + VAL + Parameter::getValue () + { + ////////////TODO + } + + + +} // namespace mobject diff --git a/src/proc/mobject/parameter.hpp b/src/proc/mobject/parameter.hpp index c5fafd72b..59832fa26 100644 --- a/src/proc/mobject/parameter.hpp +++ b/src/proc/mobject/parameter.hpp @@ -21,39 +21,35 @@ */ -#ifndef PROC_MOBJECT_PARAMETER_H -#define PROC_MOBJECT_PARAMETER_H +#ifndef MOBJECT_PARAMETER_H +#define MOBJECT_PARAMETER_H -namespace proc +namespace mobject { - namespace mobject + + template class ParamProvider; + + + /** + * Descriptor and access object for a plugin parameter. + * Parameters may be provided with values from the session, + * and this values may be automated. + */ + template + class Parameter { + public: + VAL getValue () ; - template class ParamProvider; + protected: + ParamProvider* provider; - - /** - * Descriptor and access object for a plugin parameter. - * Parameters may be provided with values from the session, - * and this values may be automated. - */ - template - class Parameter - { - public: - VAL getValue () ; - - protected: - ParamProvider* provider; - - }; + }; - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/mobject/paramprovider.cpp b/src/proc/mobject/paramprovider.cpp index cf9c91e9b..d90c91493 100644 --- a/src/proc/mobject/paramprovider.cpp +++ b/src/proc/mobject/paramprovider.cpp @@ -25,20 +25,15 @@ #include "proc/mobject/parameter.hpp" #include "proc/mobject/interpolator.hpp" -namespace proc +namespace mobject { - namespace mobject - { - - template - VAL - ParamProvider::getValue () - { - } - - - - } // namespace proc::mobject -} // namespace proc + template + VAL + ParamProvider::getValue () + {} + + + +} // namespace mobject diff --git a/src/proc/mobject/paramprovider.hpp b/src/proc/mobject/paramprovider.hpp index 79a3b7ddd..4ac155e81 100644 --- a/src/proc/mobject/paramprovider.hpp +++ b/src/proc/mobject/paramprovider.hpp @@ -21,39 +21,35 @@ */ -#ifndef PROC_MOBJECT_PARAMPROVIDER_H -#define PROC_MOBJECT_PARAMPROVIDER_H +#ifndef MOBJECT_PARAMPROVIDER_H +#define MOBJECT_PARAMPROVIDER_H -namespace proc +namespace mobject { - namespace mobject + + template class Parameter; + template class Interpolator; + + + + /** + * A facility to get the actual value of a plugin/effect parameter + */ + template + class ParamProvider { - - template class Parameter; - template class Interpolator; - - - - /** - * A facility to get the actual value of a plugin/effect parameter - */ - template - class ParamProvider - { - protected: - Parameter* param; - Interpolator* ipo; + protected: + Parameter* param; + Interpolator* ipo; - public: - virtual VAL getValue () ; - }; + public: + virtual VAL getValue () ; + }; - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/mobject/placement.cpp b/src/proc/mobject/placement.cpp index 46a928f9e..eccd34e80 100644 --- a/src/proc/mobject/placement.cpp +++ b/src/proc/mobject/placement.cpp @@ -24,24 +24,20 @@ #include "proc/mobject/placement.hpp" #include "proc/mobject/explicitplacement.hpp" -namespace proc +namespace mobject { - namespace mobject - { - /** create an actual (explicit) placement while trying to - * satisfy the network of adjacent objects and placements. - * TODO: need GC!!!!!!!!!!! - */ - ExplicitPlacement& - Placement::resolve () - { - } + /** create an actual (explicit) placement while trying to + * satisfy the network of adjacent objects and placements. + * TODO: need GC!!!!!!!!!!! + */ + ExplicitPlacement& + Placement::resolve () + { + } - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject diff --git a/src/proc/mobject/placement.hpp b/src/proc/mobject/placement.hpp index 7a10fd164..c486c9573 100644 --- a/src/proc/mobject/placement.hpp +++ b/src/proc/mobject/placement.hpp @@ -21,41 +21,37 @@ */ -#ifndef PROC_MOBJECT_PLACEMENT_H -#define PROC_MOBJECT_PLACEMENT_H +#ifndef MOBJECT_PLACEMENT_H +#define MOBJECT_PLACEMENT_H #include "proc/mobject/mobject.hpp" #include "proc/mobject/session/track.hpp" -namespace proc +namespace mobject { - namespace mobject + + + class ExplicitPlacement; + + + class Placement { - - - class ExplicitPlacement; - - - class Placement - { - protected: - typedef cinelerra::Time Time; - typedef proc::mobject::session::Track Track; + protected: + typedef cinelerra::Time Time; + typedef session::Track Track; - MObject* subject; + MObject* subject; - public: - /** resolve the network of placement and - * provide the resulting (explicit) placement. - */ - ExplicitPlacement& resolve () ; - }; - - - - } // namespace proc::mobject + public: + /** resolve the network of placement and + * provide the resulting (explicit) placement. + */ + ExplicitPlacement& resolve () ; + }; -} // namespace proc + + +} // namespace mobject #endif diff --git a/src/proc/mobject/session/abstractmo.cpp b/src/proc/mobject/session/abstractmo.cpp index 338e1fa70..b2ec01b0f 100644 --- a/src/proc/mobject/session/abstractmo.cpp +++ b/src/proc/mobject/session/abstractmo.cpp @@ -23,19 +23,15 @@ #include "proc/mobject/session/abstractmo.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session - { - - /** */ - - - - } // namespace proc::mobject::session - } // namespace proc::mobject + /** */ -} // namespace proc + + + } // namespace mobject::session + +} // namespace mobject diff --git a/src/proc/mobject/session/abstractmo.hpp b/src/proc/mobject/session/abstractmo.hpp index bf610f8ba..560e4e7b6 100644 --- a/src/proc/mobject/session/abstractmo.hpp +++ b/src/proc/mobject/session/abstractmo.hpp @@ -21,31 +21,27 @@ */ -#ifndef PROC_MOBJECT_SESSION_ABSTRACTMO_H -#define PROC_MOBJECT_SESSION_ABSTRACTMO_H +#ifndef MOBJECT_SESSION_ABSTRACTMO_H +#define MOBJECT_SESSION_ABSTRACTMO_H #include "proc/mobject/mobject.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session + + + class AbstractMO : public MObject { + ////////////// TODO: work out common services to provide!!!! + }; - class AbstractMO : public MObject - { - ////////////// TODO: work out common services to provide!!!! - }; - - - - } // namespace proc::mobject::session - } // namespace proc::mobject + } // namespace mobject::session -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/mobject/session/allocation.cpp b/src/proc/mobject/session/allocation.cpp index a4bd6c047..e3ed4b701 100644 --- a/src/proc/mobject/session/allocation.cpp +++ b/src/proc/mobject/session/allocation.cpp @@ -23,19 +23,15 @@ #include "proc/mobject/session/allocation.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session - { - - /** */ - - - - } // namespace proc::mobject::session - } // namespace proc::mobject + /** */ -} // namespace proc + + + } // namespace mobject::session + +} // namespace mobject diff --git a/src/proc/mobject/session/allocation.hpp b/src/proc/mobject/session/allocation.hpp index 2eab5b59e..88605572a 100644 --- a/src/proc/mobject/session/allocation.hpp +++ b/src/proc/mobject/session/allocation.hpp @@ -21,8 +21,8 @@ */ -#ifndef PROC_MOBJECT_SESSION_ALLOCATION_H -#define PROC_MOBJECT_SESSION_ALLOCATION_H +#ifndef MOBJECT_SESSION_ALLOCATION_H +#define MOBJECT_SESSION_ALLOCATION_H #include @@ -32,35 +32,30 @@ using std::string; -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session + + + /** + * a directive to place a MObject in a specific way + */ + class Allocation : public Placement { + protected: + /** human readable representation of the condition + * characterizing this allocaton, e.g. "t >= 10" + */ + string repr; + + public: + const string& getRepr () const { return repr; } + }; - /** - * a directive to place a MObject in a specific way - */ - class Allocation : public Placement - { - protected: - /** human readable representation of the condition - * characterizing this allocaton, e.g. "t >= 10" - */ - string repr; - - public: - const string& getRepr () const { return repr; } - }; - - - - } // namespace proc::mobject::session + } // namespace mobject::session - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/mobject/session/auto.cpp b/src/proc/mobject/session/auto.cpp index 88d3dbedc..2911b39f1 100644 --- a/src/proc/mobject/session/auto.cpp +++ b/src/proc/mobject/session/auto.cpp @@ -23,26 +23,22 @@ #include "proc/mobject/session/auto.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session - { - - template - VAL - Auto::getValue () - { - return 0; //////////////TODO - } - - + template + VAL + Auto::getValue () + { + return 0; //////////////TODO + } - } // namespace proc::mobject::session - } // namespace proc::mobject -} // namespace proc + + } // namespace mobject::session + +} // namespace mobject diff --git a/src/proc/mobject/session/auto.hpp b/src/proc/mobject/session/auto.hpp index 8510374d2..2bc12e8ae 100644 --- a/src/proc/mobject/session/auto.hpp +++ b/src/proc/mobject/session/auto.hpp @@ -21,38 +21,34 @@ */ -#ifndef PROC_MOBJECT_SESSION_AUTO_H -#define PROC_MOBJECT_SESSION_AUTO_H +#ifndef MOBJECT_SESSION_AUTO_H +#define MOBJECT_SESSION_AUTO_H #include "proc/mobject/session/meta.hpp" #include "proc/mobject/paramprovider.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session + + + /** + * Automation data for some parameter + * (i.e. the parameter is a time varying function) + */ + template + class Auto : public Meta, public ParamProvider { - - - /** - * Automation data for some parameter - * (i.e. the parameter is a time varying function) - */ - template - class Auto : public Meta, public ParamProvider - { - public: - virtual VAL getValue () ; - }; + public: + virtual VAL getValue () ; + }; - } // namespace proc::mobject::session + } // namespace mobject::session - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/mobject/session/clip.cpp b/src/proc/mobject/session/clip.cpp index e0f78510d..7fbb30dcb 100644 --- a/src/proc/mobject/session/clip.cpp +++ b/src/proc/mobject/session/clip.cpp @@ -23,19 +23,15 @@ #include "proc/mobject/session/clip.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session - { - - /** */ - - - - } // namespace proc::mobject::session - } // namespace proc::mobject + /** */ -} // namespace proc + + + } // namespace mobject::session + +} // namespace mobject diff --git a/src/proc/mobject/session/clip.hpp b/src/proc/mobject/session/clip.hpp index f913ac716..83696c866 100644 --- a/src/proc/mobject/session/clip.hpp +++ b/src/proc/mobject/session/clip.hpp @@ -21,48 +21,44 @@ */ -#ifndef PROC_MOBJECT_SESSION_CLIP_H -#define PROC_MOBJECT_SESSION_CLIP_H +#ifndef MOBJECT_SESSION_CLIP_H +#define MOBJECT_SESSION_CLIP_H #include "proc/mobject/session/abstractmo.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session + + + /** + * A user visible/editable Clip is a reference to a contiguous + * sequence of media data loaded as Asset into the current Session. + * As such, it is a virtual (non destructive) cut or edit of the + * source material and can be placed into the EDL to be rendered + * into the ouput. The actual media type of a clip will be derived + * at runtime by resolving this reference to the underlying Asset. + * + * TODO: define how to denote Time positions /lengths. This is tricky, + * because it depends on the actual media type, and we wand to encapsulate + * all these details as much as possible. + */ + class Clip : public AbstractMO { + protected: + /** startpos in source */ + Time start; + + //TODO: where to put the duration ??? + + }; - /** - * A user visible/editable Clip is a reference to a contiguous - * sequence of media data loaded as Asset into the current Session. - * As such, it is a virtual (non destructive) cut or edit of the - * source material and can be placed into the EDL to be rendered - * into the ouput. The actual media type of a clip will be derived - * at runtime by resolving this reference to the underlying Asset. - * - * TODO: define how to denote Time positions /lengths. This is tricky, - * because it depends on the actual media type, and we wand to encapsulate - * all these details as much as possible. - */ - class Clip : public AbstractMO - { - protected: - /** startpos in source */ - Time start; - - //TODO: where to put the duration ??? - }; - - - - } // namespace proc::mobject::session + } // namespace mobject::session - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/mobject/session/edl.cpp b/src/proc/mobject/session/edl.cpp index 9a868d7e7..8fc76bb0c 100644 --- a/src/proc/mobject/session/edl.cpp +++ b/src/proc/mobject/session/edl.cpp @@ -25,19 +25,15 @@ #include "proc/mobject/session/track.hpp" #include "proc/mobject/mobject.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session - { - - /** */ - - - - } // namespace proc::mobject::session - } // namespace proc::mobject + /** */ -} // namespace proc + + + } // namespace mobject::session + +} // namespace mobject diff --git a/src/proc/mobject/session/edl.hpp b/src/proc/mobject/session/edl.hpp index 00cf588b7..31b0319a4 100644 --- a/src/proc/mobject/session/edl.hpp +++ b/src/proc/mobject/session/edl.hpp @@ -21,8 +21,8 @@ */ -#ifndef PROC_MOBJECT_SESSION_EDL_H -#define PROC_MOBJECT_SESSION_EDL_H +#ifndef MOBJECT_SESSION_EDL_H +#define MOBJECT_SESSION_EDL_H #include @@ -32,28 +32,23 @@ using std::list; - -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session + + + class EDL { - - - class EDL - { - protected: - list tracks; - list clips; + protected: + list tracks; + list clips; - }; - - - - } // namespace proc::mobject::session + }; - } // namespace proc::mobject -} // namespace proc + + } // namespace mobject::session + +} // namespace mobject #endif diff --git a/src/proc/mobject/session/effect.cpp b/src/proc/mobject/session/effect.cpp index e03537611..36e5835b5 100644 --- a/src/proc/mobject/session/effect.cpp +++ b/src/proc/mobject/session/effect.cpp @@ -23,19 +23,15 @@ #include "proc/mobject/session/effect.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session - { - - /** */ - - - - } // namespace proc::mobject::session - } // namespace proc::mobject + /** */ -} // namespace proc + + + } // namespace mobject::session + +} // namespace mobject diff --git a/src/proc/mobject/session/effect.hpp b/src/proc/mobject/session/effect.hpp index 56ef08a59..09ed321bf 100644 --- a/src/proc/mobject/session/effect.hpp +++ b/src/proc/mobject/session/effect.hpp @@ -21,8 +21,8 @@ */ -#ifndef PROC_MOBJECT_SESSION_EFFECT_H -#define PROC_MOBJECT_SESSION_EFFECT_H +#ifndef MOBJECT_SESSION_EFFECT_H +#define MOBJECT_SESSION_EFFECT_H #include @@ -32,27 +32,23 @@ using std::string; -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session + + + class Effect : public AbstractMO { + protected: + /** Identifier of the Plugin to be used */ + string plugID; + }; + + + + } // namespace mobject::session - class Effect : public AbstractMO - { - protected: - /** Identifier of the Plugin to be used */ - string plugID; - - }; - - - - } // namespace proc::mobject::session - - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/mobject/session/fixedplacement.cpp b/src/proc/mobject/session/fixedplacement.cpp index 5986b9cf1..cfd370501 100644 --- a/src/proc/mobject/session/fixedplacement.cpp +++ b/src/proc/mobject/session/fixedplacement.cpp @@ -23,19 +23,15 @@ #include "proc/mobject/session/fixedplacement.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session - { - - /** */ - - - - } // namespace proc::mobject::session - } // namespace proc::mobject + /** */ -} // namespace proc + + + } // namespace mobject::session + +} // namespace mobject diff --git a/src/proc/mobject/session/fixedplacement.hpp b/src/proc/mobject/session/fixedplacement.hpp index 2dbdf6e2e..badf3e781 100644 --- a/src/proc/mobject/session/fixedplacement.hpp +++ b/src/proc/mobject/session/fixedplacement.hpp @@ -21,33 +21,29 @@ */ -#ifndef PROC_MOBJECT_SESSION_FIXEDPLACEMENT_H -#define PROC_MOBJECT_SESSION_FIXEDPLACEMENT_H +#ifndef MOBJECT_SESSION_FIXEDPLACEMENT_H +#define MOBJECT_SESSION_FIXEDPLACEMENT_H #include "proc/mobject/placement.hpp" #include "proc/mobject/explicitplacement.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session + + // TODO: didn't we plan to rename ExplicitPlacement to DirectPlacement?? + + class DirectPlacement : public ExplicitPlacement { + /////////// + }; - // TODO: didn't we plan to rename ExplicitPlacement to DirectPlacement?? - class DirectPlacement : public ExplicitPlacement - { - /////////// - }; - - - - } // namespace proc::mobject::session - } // namespace proc::mobject + } // namespace mobject::session -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/mobject/session/fixture.cpp b/src/proc/mobject/session/fixture.cpp index c6cf2669d..73fa72e7e 100644 --- a/src/proc/mobject/session/fixture.cpp +++ b/src/proc/mobject/session/fixture.cpp @@ -23,35 +23,31 @@ #include "proc/mobject/session/fixture.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session - { - list & - Fixture::getPlaylistForRender () - { - abort();/////////////////////TODO - } + list & + Fixture::getPlaylistForRender () + { + abort();/////////////////////TODO + } - /** TODO: a placeholder for the Operation needed for - * wiring the Automation providers in the Build process - */ - Auto* - Fixture::getAutomation () - { - return 0;/////////////////////TODO - } + /** TODO: a placeholder for the Operation needed for + * wiring the Automation providers in the Build process + */ + Auto* + Fixture::getAutomation () + { + return 0;/////////////////////TODO + } - } // namespace proc::mobject::session + } // namespace mobject::session - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject diff --git a/src/proc/mobject/session/fixture.hpp b/src/proc/mobject/session/fixture.hpp index 9425dce7c..eebdc87af 100644 --- a/src/proc/mobject/session/fixture.hpp +++ b/src/proc/mobject/session/fixture.hpp @@ -21,8 +21,8 @@ */ -#ifndef PROC_MOBJECT_SESSION_FIXTURE_H -#define PROC_MOBJECT_SESSION_FIXTURE_H +#ifndef MOBJECT_SESSION_FIXTURE_H +#define MOBJECT_SESSION_FIXTURE_H #include @@ -35,32 +35,29 @@ using std::list; -namespace proc + +namespace mobject { - namespace mobject + namespace session { - namespace session + + + + class Fixture : public EDL { - - - - class Fixture : public EDL - { - protected: - Track tracks; - list timeline; + protected: + Track tracks; + list timeline; - public: - list & getPlaylistForRender () ; - Auto* getAutomation () ; /////TODO: just a placeholder at the moment!!! - }; - - - - } // namespace proc::mobject::session + public: + list & getPlaylistForRender () ; + Auto* getAutomation () ; /////TODO: just a placeholder at the moment!!! + }; - } // namespace proc::mobject -} // namespace proc + + } // namespace mobject::session + +} // namespace mobject #endif diff --git a/src/proc/mobject/session/label.cpp b/src/proc/mobject/session/label.cpp index fb969a00c..3fd9f283b 100644 --- a/src/proc/mobject/session/label.cpp +++ b/src/proc/mobject/session/label.cpp @@ -23,19 +23,15 @@ #include "proc/mobject/session/label.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session - { - - /** */ - - - - } // namespace proc::mobject::session - } // namespace proc::mobject + /** */ -} // namespace proc + + + } // namespace mobject::session + +} // namespace mobject diff --git a/src/proc/mobject/session/label.hpp b/src/proc/mobject/session/label.hpp index 1e9e5915b..2998b923c 100644 --- a/src/proc/mobject/session/label.hpp +++ b/src/proc/mobject/session/label.hpp @@ -21,36 +21,32 @@ */ -#ifndef PROC_MOBJECT_SESSION_LABEL_H -#define PROC_MOBJECT_SESSION_LABEL_H +#ifndef MOBJECT_SESSION_LABEL_H +#define MOBJECT_SESSION_LABEL_H #include "proc/mobject/session/meta.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session + + + /** + * Any sort of User visible Marker or Tag, used + * to mark time positions and ranges, or specific + * locations to attach other MObjects to. + */ + class Label : public Meta { + ///////////TODO: timespan fields here or already in class Meta?? + }; - /** - * Any sort of User visible Marker or Tag, used - * to mark time positions and ranges, or specific - * locations to attach other MObjects to. - */ - class Label : public Meta - { - ///////////TODO: timespan fields here or already in class Meta?? - }; - - - } // namespace proc::mobject::session + } // namespace mobject::session - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/mobject/session/meta.cpp b/src/proc/mobject/session/meta.cpp index 91ff85e38..35c1cc7af 100644 --- a/src/proc/mobject/session/meta.cpp +++ b/src/proc/mobject/session/meta.cpp @@ -23,19 +23,15 @@ #include "proc/mobject/session/meta.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session - { - - /** */ - - - - } // namespace proc::mobject::session - } // namespace proc::mobject + /** */ -} // namespace proc + + + } // namespace mobject::session + +} // namespace mobject diff --git a/src/proc/mobject/session/meta.hpp b/src/proc/mobject/session/meta.hpp index dc6f38414..8c141f516 100644 --- a/src/proc/mobject/session/meta.hpp +++ b/src/proc/mobject/session/meta.hpp @@ -21,37 +21,33 @@ */ -#ifndef PROC_MOBJECT_SESSION_META_H -#define PROC_MOBJECT_SESSION_META_H +#ifndef MOBJECT_SESSION_META_H +#define MOBJECT_SESSION_META_H #include "proc/mobject/session/abstractmo.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session + + + /** + * Meta-MObject doesn't represent real Media Content, + * but rather all sorts of Processing Instructions + * and other metadata, which can be placed and + * attached within the EDL/Session. + */ + class Meta : public AbstractMO { + /////////// + }; - /** - * Meta-MObject doesn't represent real Media Content, - * but rather all sorts of Processing Instructions - * and other metadata, which can be placed and - * attached within the EDL/Session. - */ - class Meta : public AbstractMO - { - /////////// - }; - - - - } // namespace proc::mobject::session - } // namespace proc::mobject + } // namespace mobject::session -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/mobject/session/relativeplacement.cpp b/src/proc/mobject/session/relativeplacement.cpp index 1ad7aefd2..6fd934f12 100644 --- a/src/proc/mobject/session/relativeplacement.cpp +++ b/src/proc/mobject/session/relativeplacement.cpp @@ -24,17 +24,12 @@ #include "proc/mobject/session/relativeplacement.hpp" #include "proc/mobject/mobject.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session - { + } // namespace mobject::session - } // namespace proc::mobject::session - - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject diff --git a/src/proc/mobject/session/relativeplacement.hpp b/src/proc/mobject/session/relativeplacement.hpp index 67a898454..ca3041928 100644 --- a/src/proc/mobject/session/relativeplacement.hpp +++ b/src/proc/mobject/session/relativeplacement.hpp @@ -21,53 +21,48 @@ */ -#ifndef PROC_MOBJECT_SESSION_RELATIVEPLACEMENT_H -#define PROC_MOBJECT_SESSION_RELATIVEPLACEMENT_H +#ifndef MOBJECT_SESSION_RELATIVEPLACEMENT_H +#define MOBJECT_SESSION_RELATIVEPLACEMENT_H #include "proc/mobject/placement.hpp" -#include "common/time.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session + + + + class RelativePlacement : public Placement { - - - - class RelativePlacement : public proc::mobject::Placement - { - public: - - /** - * the possible kinds of RelativePlacements - */ - enum RelType - { SAMETIME /** place subject at the same time as the anchor */ + public: + + /** + * the possible kinds of RelativePlacements + */ + enum RelType + { SAMETIME /** place subject at the same time as the anchor */ , ATTACH /** attach subject to anchor (e.g. an effect to a clip) */ - }; - - protected: - MObject* anchor; - - /** the kind of relation denoted by this Placement */ - RelType relType; - - /** Offset the actual position by this (time) value relative to the anchor point. */ - cinelerra::Time offset; - //TODO: suitable representation? - }; - - - - } // namespace proc::mobject::session - } // namespace proc::mobject + protected: + MObject* anchor; -} // namespace proc + /** the kind of relation denoted by this Placement */ + RelType relType; + + /** Offset the actual position by this (time) value relative to the anchor point. */ + cinelerra::Time offset; + //TODO: suitable representation? + + }; + + + + } // namespace mobject::session + +} // namespace mobject #endif diff --git a/src/proc/mobject/session/segment.cpp b/src/proc/mobject/session/segment.cpp index 73c149f50..e89021c2a 100644 --- a/src/proc/mobject/session/segment.cpp +++ b/src/proc/mobject/session/segment.cpp @@ -25,24 +25,20 @@ // Used at the moment (7/07) for partitioning the timeline/fixture into segments // to be rendered by a specialized render node network for each, without the need -// to change any connections within a given segment. +// to change any connections within a given segment. // Note this concept may be superfluos alltogether; is a draft and the real // use still needs to be worked out... -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session - { - - /** */ - - - - } // namespace proc::mobject::session - } // namespace proc::mobject + /** */ -} // namespace proc + + + } // namespace mobject::session + +} // namespace mobject diff --git a/src/proc/mobject/session/segment.hpp b/src/proc/mobject/session/segment.hpp index 8edd75882..af12f6de1 100644 --- a/src/proc/mobject/session/segment.hpp +++ b/src/proc/mobject/session/segment.hpp @@ -21,54 +21,50 @@ */ -#ifndef PROC_MOBJECT_SESSION_SEGMENT_H -#define PROC_MOBJECT_SESSION_SEGMENT_H +#ifndef MOBJECT_SESSION_SEGMENT_H +#define MOBJECT_SESSION_SEGMENT_H #include -#include "common/time.hpp" +#include "cinelerra.h" #include "proc/mobject/explicitplacement.hpp" using std::list; -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session + + + /** + * Used at the moment (7/07) for partitioning the timeline/fixture into segments + * to be rendered by a specialized render node network for each, without the need + * to change any connections within a given segment. + * Note this concept may be superfluos alltogether; is a draft and the real + * use still needs to be worked out... + */ + class Segment { + protected: + typedef cinelerra::Time Time; + + /** begin of this timeline segment. */ + Time start; + /** duration (span) of this timeline segment. */ + Time length; + + /** relevant MObjects comprising this segment. */ + list elements; + // TODO: actually necessary?? + + }; - /** - * Used at the moment (7/07) for partitioning the timeline/fixture into segments - * to be rendered by a specialized render node network for each, without the need - * to change any connections within a given segment. - * Note this concept may be superfluos alltogether; is a draft and the real - * use still needs to be worked out... - */ - class Segment - { - protected: - typedef cinelerra::Time Time; - - /** begin of this timeline segment. */ - Time start; - /** duration (span) of this timeline segment. */ - Time length; - /** relevant MObjects comprising this segment. */ - list elements; - // TODO: actually necessary?? + } // namespace mobject::session - }; - - - - } // namespace proc::mobject::session - - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/mobject/session/session.cpp b/src/proc/mobject/session/session.cpp index 5154b6de2..1bb585d3e 100644 --- a/src/proc/mobject/session/session.cpp +++ b/src/proc/mobject/session/session.cpp @@ -25,19 +25,15 @@ #include "proc/mobject/session/edl.hpp" #include "proc/mobject/session/fixture.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session - { - - /** */ - - - - } // namespace proc::mobject::session - } // namespace proc::mobject + /** */ -} // namespace proc + + + } // namespace mobject::session + +} // namespace mobject diff --git a/src/proc/mobject/session/session.hpp b/src/proc/mobject/session/session.hpp index 5c661d32f..e63730eb0 100644 --- a/src/proc/mobject/session/session.hpp +++ b/src/proc/mobject/session/session.hpp @@ -21,42 +21,38 @@ */ -#ifndef PROC_MOBJECT_SESSION_SESSION_H -#define PROC_MOBJECT_SESSION_SESSION_H +#ifndef MOBJECT_SESSION_SESSION_H +#define MOBJECT_SESSION_SESSION_H -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session + + class EDL; + class Fixture; + + /** + * The (current) Session holds all the user + * visible content to be edited and manipulated + * within the Cinelerra Application. From a users + * perspective, it is a collection of Media Objects + * (--> MObject) placed (--> Placement) onto virtual + * Tracks. + */ + class Session { - - class EDL; - class Fixture; - - /** - * The (current) Session holds all the user - * visible content to be edited and manipulated - * within the Cinelerra Application. From a users - * perspective, it is a collection of Media Objects - * (--> MObject) placed (--> Placement) onto virtual - * Tracks. - */ - class Session - { - protected: - EDL& edl; - Fixture& fixture; + protected: + EDL& edl; + Fixture& fixture; - }; - - - - } // namespace proc::mobject::session + }; - } // namespace proc::mobject -} // namespace proc + + } // namespace mobject::session + +} // namespace mobject #endif diff --git a/src/proc/mobject/session/track.cpp b/src/proc/mobject/session/track.cpp index 4d618cc1d..d3e24a9e4 100644 --- a/src/proc/mobject/session/track.cpp +++ b/src/proc/mobject/session/track.cpp @@ -23,19 +23,15 @@ #include "proc/mobject/session/track.hpp" -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session - { - - /** */ - - - - } // namespace proc::mobject::session - } // namespace proc::mobject + /** */ -} // namespace proc + + + } // namespace mobject::session + +} // namespace mobject diff --git a/src/proc/mobject/session/track.hpp b/src/proc/mobject/session/track.hpp index 7778bb491..f3acec86f 100644 --- a/src/proc/mobject/session/track.hpp +++ b/src/proc/mobject/session/track.hpp @@ -21,39 +21,34 @@ */ -#ifndef PROC_MOBJECT_SESSION_TRACK_H -#define PROC_MOBJECT_SESSION_TRACK_H +#ifndef MOBJECT_SESSION_TRACK_H +#define MOBJECT_SESSION_TRACK_H -namespace proc +namespace mobject { - namespace mobject + namespace session { - namespace session + + + /** + * A Track in the EDL or Session. + * But, honestly, I don't quite know what a Track stands for! + * Usually, this stems from the metaphor of a multitrack tape machine, + * but I doubt this metaphor is really helpful for editing video; mostly + * people stick to such metaphors out of mental laziyness... + * + * So, let's see if the concept "Track" will get any practical functionallity + * or if we end up with "Track" beeing just a disguise for an int ID.... + */ + class Track { + }; - /** - * A Track in the EDL or Session. - * But, honestly, I don't quite know what a Track stands for! - * Usually, this stems from the metaphor of a multitrack tape machine, - * but I doubt this metaphor is really helpful for editing video; mostly - * people stick to such metaphors out of mental laziyness... - * - * So, let's see if the concept "Track" will get any practical functionallity - * or if we end up with "Track" beeing just a disguise for an int ID.... - */ - class Track - { - - }; - - - } // namespace proc::mobject::session + } // namespace mobject::session - } // namespace proc::mobject - -} // namespace proc +} // namespace mobject #endif diff --git a/src/proc/stateproxy.cpp b/src/proc/stateproxy.cpp index a7703e8ab..fa11dc11d 100644 --- a/src/proc/stateproxy.cpp +++ b/src/proc/stateproxy.cpp @@ -24,11 +24,11 @@ #include "proc/stateproxy.hpp" #include "proc/frame.hpp" -namespace proc +namespace proc_interface { /** */ -} // namespace proc +} // namespace proc_interface diff --git a/src/proc/stateproxy.hpp b/src/proc/stateproxy.hpp index 1e6a861cd..02e0914b4 100644 --- a/src/proc/stateproxy.hpp +++ b/src/proc/stateproxy.hpp @@ -21,14 +21,14 @@ */ -#ifndef PROC_STATEPROXY_H -#define PROC_STATEPROXY_H +#ifndef PROC_INTERFACE_STATEPROXY_H +#define PROC_INTERFACE_STATEPROXY_H #include "proc/frame.hpp" -namespace proc +namespace proc_interface { @@ -41,5 +41,5 @@ namespace proc -} // namespace proc +} // namespace proc_interface #endif diff --git a/uml/cinelerra3/128005 b/uml/cinelerra3/128005 index e48b8d387..0d1ddaf0c 100644 --- a/uml/cinelerra3/128005 +++ b/uml/cinelerra3/128005 @@ -1,14 +1,14 @@ -format 38 +format 40 "design" // design - revision 7 - modified_by 61 "ct" + revision 9 + modified_by 5 "hiv" // class settings //class diagram settings 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 //use case diagram settings package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default //sequence diagram settings - show_full_operations_definition default write_horizontally default drawing_language default draw_all_relations default shadow default + show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default //collaboration diagram settings show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default //object diagram settings @@ -40,11 +40,32 @@ Not a real code package, rather a container for design drafts, specifications, d size A4 end + component 129925 "CommonLib" + provided_classes + class_ref 134917 // Time + end + end + component 128005 "Builder" stereotype "subsystem" + provided_classes + class_ref 132741 // StateProxy + end + required_classes + class_ref 128261 // Fixture + class_ref 128005 // Session + end end component 128133 "Session" + stereotype "subsystem" + provided_classes + class_ref 128133 // EDL + class_ref 128261 // Fixture + class_ref 128517 // MObject + class_ref 134661 // ParamProvider + class_ref 128005 // Session + end component 128389 "EDL" stereotype "entity" end @@ -56,10 +77,14 @@ Not a real code package, rather a container for design drafts, specifications, d component 128261 "Controller" stereotype "subsystem" + provided_classes + class_ref 130565 // BuilderFacade + end simplerelation 128261 -_-> on component_ref 128005 // Builder end + end component 128645 "AssetManagement" @@ -69,10 +94,23 @@ Not a real code package, rather a container for design drafts, specifications, d end component 128901 "Engine" + required_classes + class_ref 132741 // StateProxy + end simplerelation 128133 -_-> on component_ref 129029 // Frame (Stream) Provider end + + component 130053 "ProcNode" + stereotype "entity" + provided_classes + class_ref 134533 // Parameter + end + required_classes + class_ref 134661 // ParamProvider + end + end end component 129029 "Frame (Stream) Provider" @@ -86,6 +124,38 @@ Not a real code package, rather a container for design drafts, specifications, d end component 129285 "RenderPathManager" + provided_classes + class_ref 130437 // PathManager + end + end + + end + + componentview 128133 "interfaces" + //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 + componentdiagram 130053 "proc-components" + 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 + size A3 + end + + component 129541 "ControllerFacade" + provided_classes + class_ref 130309 // ControllerFacade + end + required_classes + class_ref 130565 // BuilderFacade + class_ref 130437 // PathManager + end + end + + component 129797 "ConManager" + stereotype "component" + required_classes + class_ref 134661 // ParamProvider + end end end diff --git a/uml/cinelerra3/128645 b/uml/cinelerra3/128645 index 92ee080bb..523b89109 100644 --- a/uml/cinelerra3/128645 +++ b/uml/cinelerra3/128645 @@ -1,6 +1,6 @@ format 40 "codegen" // design::codegen - revision 16 + revision 17 modified_by 5 "hiv" // class settings //class diagram settings @@ -42,57 +42,57 @@ format 40 artifact 128005 "Cinelerra3" stereotype "executable" associated_artifacts - artifact_ref 129413 // clip - artifact_ref 129797 // fixedplacement - artifact_ref 133765 // frame - artifact_ref 130821 // assembler - artifact_ref 133637 // glrender - artifact_ref 134149 // glbuf - artifact_ref 131205 // tool - artifact_ref 133893 // aframe - artifact_ref 131845 // renderstate - artifact_ref 130949 // stateproxy - artifact_ref 132229 // exitnode - artifact_ref 134021 // vframe - artifact_ref 133381 // arender - artifact_ref 128773 // fixture - artifact_ref 128901 // track - artifact_ref 128261 // mobject - artifact_ref 134661 // interpolator - artifact_ref 128645 // edl - artifact_ref 134405 // parameter - artifact_ref 130565 // toolfactory - artifact_ref 132869 // projector - artifact_ref 133253 // openglpipe - artifact_ref 129669 // meta - artifact_ref 131077 // buildable - artifact_ref 131461 // nodecreatertool - artifact_ref 130693 // conmanager - artifact_ref 129925 // relativeplacement - artifact_ref 129541 // effect - artifact_ref 132997 // mask - artifact_ref 128133 // main - artifact_ref 132101 // processor - artifact_ref 131333 // segmentationtool - artifact_ref 130053 // allocation - artifact_ref 130437 // builderfacade - artifact_ref 131589 // controllerfacade - artifact_ref 131717 // pathmanager artifact_ref 133509 // vrender - artifact_ref 128517 // session - artifact_ref 133125 // pluginadapter - artifact_ref 132613 // pipe - artifact_ref 134277 // source - artifact_ref 129029 // placement - artifact_ref 130309 // auto - artifact_ref 131973 // renderengine - artifact_ref 132741 // hub - artifact_ref 132485 // trafo - artifact_ref 129157 // explicitplacement - artifact_ref 132357 // procnode + artifact_ref 130565 // toolfactory + artifact_ref 133765 // frame artifact_ref 129285 // abstractmo - artifact_ref 134533 // paramprovider + artifact_ref 131333 // segmentationtool + artifact_ref 128901 // track + artifact_ref 131973 // renderengine + artifact_ref 129925 // relativeplacement + artifact_ref 130949 // stateproxy + artifact_ref 133125 // pluginadapter + artifact_ref 133253 // glpipe + artifact_ref 133637 // glrender + artifact_ref 129413 // clip artifact_ref 130181 // label + artifact_ref 130437 // builderfacade + artifact_ref 134661 // interpolator + artifact_ref 132485 // trafo + artifact_ref 132997 // mask + artifact_ref 134021 // vframe + artifact_ref 134277 // source + artifact_ref 131077 // buildable + artifact_ref 131205 // tool + artifact_ref 131717 // pathmanager + artifact_ref 134405 // parameter + artifact_ref 129797 // fixedplacement + artifact_ref 132357 // procnode + artifact_ref 132101 // processor + artifact_ref 128773 // fixture + artifact_ref 130309 // auto + artifact_ref 130693 // conmanager + artifact_ref 131845 // renderstate + artifact_ref 128517 // session + artifact_ref 132869 // projector + artifact_ref 130821 // assembler + artifact_ref 134533 // paramprovider + artifact_ref 130053 // allocation + artifact_ref 128261 // mobject + artifact_ref 132741 // hub + artifact_ref 129541 // effect + artifact_ref 132229 // exitnode + artifact_ref 132613 // link + artifact_ref 129669 // meta + artifact_ref 134149 // glbuf + artifact_ref 131589 // controllerfacade + artifact_ref 128645 // edl + artifact_ref 129157 // explicitplacement + artifact_ref 128133 // main + artifact_ref 133381 // arender + artifact_ref 129029 // placement + artifact_ref 131461 // nodecreatertool + artifact_ref 133893 // aframe end comment "the main executable to be built" simplerelation 128517 diff --git a/uml/cinelerra3/128901 b/uml/cinelerra3/128901 index 1e45d5953..c3a70f751 100644 --- a/uml/cinelerra3/128901 +++ b/uml/cinelerra3/128901 @@ -1,6 +1,6 @@ format 40 "Builder" // ProcessingLayer::MObject::Builder - revision 11 + revision 12 modified_by 5 "hiv" // class settings //class diagram settings diff --git a/uml/cinelerra3/129285.diagram b/uml/cinelerra3/129285.diagram index 7acde9bcb..b4b7dc366 100644 --- a/uml/cinelerra3/129285.diagram +++ b/uml/cinelerra3/129285.diagram @@ -46,7 +46,7 @@ classcanvas 130565 class_ref 134277 // SegmentationTool end classcanvas 130949 class_ref 134405 // NodeCreatorTool 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 - xyz 384 469 2004 + xyz 371 469 2004 end note 134277 "{ provided_tool.treat(this); }" xyzwh 182 191 2000 159 39 @@ -101,7 +101,7 @@ relationcanvas 134789 relation_ref 137221 // multiplicity_a_pos 590 418 3000 no_multiplicity_b line 131461 -_-_ from ref 130565 z 1999 to point 301 409 - line 132101 z 1999 to point 260 405 + line 132101 z 1999 to point 264 407 line 132229 z 1999 to ref 128005 line 131589 -_-_ from ref 130565 z 1999 to point 301 429 diff --git a/uml/cinelerra3/129669 b/uml/cinelerra3/129669 index a753b18fa..6ab555985 100644 --- a/uml/cinelerra3/129669 +++ b/uml/cinelerra3/129669 @@ -1,6 +1,6 @@ format 40 "proc" // design::codegen::proc - revision 5 + revision 6 modified_by 5 "hiv" // class settings //class diagram settings @@ -29,7 +29,7 @@ format 40 stereotype "src" cpp_h_dir "proc" cpp_src_dir "proc" - cpp_namespace "proc" + cpp_namespace "proc_interface" comment "sourcecode package All classes belonging to the (middle) processing layer" diff --git a/uml/cinelerra3/129797.diagram b/uml/cinelerra3/129797.diagram index a195e0182..7c7216678 100644 --- a/uml/cinelerra3/129797.diagram +++ b/uml/cinelerra3/129797.diagram @@ -1,4 +1,4 @@ -format 38 +format 40 artifactcanvas 128005 artifact_ref 128005 // Cinelerra3 color midred @@ -36,8 +36,6 @@ packagecanvas 129285 artifactcanvas 129413 artifact_ref 128133 // main color lightred xyz 281 45 2020 -iconcanvas 131077 deploymentdiagram_ref 129925 // src - xyz 201 159 2005 containcanvas 129797 from ref 128005 z 1999 to ref 129413 simplerelationcanvas 130053 simplerelation_ref 128517 geometry VH diff --git a/uml/cinelerra3/130053.diagram b/uml/cinelerra3/130053.diagram new file mode 100644 index 000000000..36438c6a4 --- /dev/null +++ b/uml/cinelerra3/130053.diagram @@ -0,0 +1,135 @@ +format 40 + +packagecanvas 128005 + package_ref 129413 // common + show_context_mode namespace color lightblue xyzwh 689 3 1994 277 166 +note 128389 "namespace" + xyzwh 709 29 2010 86 36 +packagecanvas 128517 + package_ref 129669 // proc + show_context_mode namespace color lightblue xyzwh 62 107 1994 310 200 +note 128645 "namespace" + xyzwh 81 141 2005 85 35 +componentcanvas 128901 component_ref 129541 // ControllerFacade + draw_component_as_icon default show_component_req_prov default show_component_rea default + xyzwh 183 219 2005 156 63 +packagecanvas 129157 + package_ref 130181 // mobject + show_context_mode namespace xyzwh 16 370 1965 946 835 +packagecanvas 129285 + package_ref 130437 // session + show_context_mode namespace xyzwh 503 439 1980 440 296 +packagecanvas 129413 + package_ref 130693 // controller + show_context_mode namespace xyzwh 41 428 1990 385 315 +componentcanvas 129541 component_ref 128261 // Controller + draw_component_as_icon default show_component_req_prov default show_component_rea default + xyzwh 88 546 2010 151 63 +arrowjunctioncanvas 131973 class_ref 130565 // BuilderFacade + xyz 316 456 2000 label_xy 230 507 +arrowjunctioncanvas 132229 class_ref 130565 // BuilderFacade + xyz 313 344 2000 label_xy 239 327 +packagecanvas 132485 + package_ref 130565 // builder + show_context_mode namespace xyzwh 36 770 1970 465 385 +componentcanvas 132869 component_ref 129925 // CommonLib + draw_component_as_icon default show_component_req_prov default show_component_rea default + xyzwh 789 89 2005 156 63 +arrowjunctioncanvas 132997 class_ref 134917 // Time + xyz 830 211 2000 label_xy 828 233 +arrowjunctioncanvas 133253 class_ref 130309 // ControllerFacade + xyz 480 158 2000 label_xy 448 179 +componentcanvas 133509 component_ref 128133 // Session + draw_component_as_icon default show_component_req_prov default show_component_rea default + xyzwh 694 526 2005 156 63 +arrowjunctioncanvas 134533 class_ref 128133 // EDL + xyz 591 603 2000 label_xy 590 624 +arrowjunctioncanvas 134789 class_ref 128261 // Fixture + xyz 596 639 2000 label_xy 589 660 +arrowjunctioncanvas 135045 class_ref 128517 // MObject + xyz 610 798 2000 label_xy 601 819 +arrowjunctioncanvas 135301 class_ref 134661 // ParamProvider + xyz 684 1094 2000 label_xy 658 1115 +componentcanvas 135685 component_ref 128005 // Builder + draw_component_as_icon default show_component_req_prov default show_component_rea default + xyzwh 136 954 2005 151 63 +arrowjunctioncanvas 135813 class_ref 128005 // Session + xyz 571 765 2000 label_xy 562 787 +arrowjunctioncanvas 136197 class_ref 132741 // StateProxy + xyz 535 978 2000 label_xy 517 999 +arrowjunctioncanvas 136453 class_ref 128005 // Session + xyz 526 801 2000 label_xy 517 823 +packagecanvas 136709 + package_ref 130309 // engine + show_context_mode namespace xyzwh 16 1309 1994 561 265 +componentcanvas 136837 component_ref 128901 // Engine + draw_component_as_icon default show_component_req_prov default show_component_rea default + xyzwh 103 1402 2005 156 63 +arrowjunctioncanvas 136965 class_ref 132741 // StateProxy + xyz 535 1224 2000 label_xy 517 1245 +componentcanvas 137349 component_ref 130053 // ProcNode + draw_component_as_icon default show_component_req_prov default show_component_rea default + xyzwh 377 1494 2000 123 63 +arrowjunctioncanvas 137477 class_ref 134533 // Parameter + xyz 623 1379 2000 label_xy 607 1400 +arrowjunctioncanvas 137733 class_ref 134661 // ParamProvider + xyz 684 1368 2000 label_xy 658 1389 +componentcanvas 138373 component_ref 129797 // ConManager + draw_component_as_icon default show_component_req_prov default show_component_rea default + xyzwh 136 1070 2005 156 63 +arrowjunctioncanvas 138501 class_ref 134661 // ParamProvider + xyz 586 1094 2000 label_xy 560 1115 +componentcanvas 138757 component_ref 129285 // RenderPathManager + draw_component_as_icon default show_component_req_prov default show_component_rea default + xyzwh 89 644 2000 156 63 +arrowjunctioncanvas 138885 class_ref 130437 // PathManager + xyz 350 346 2000 label_xy 368 322 +arrowjunctioncanvas 139397 class_ref 130437 // PathManager + xyz 350 458 2000 label_xy 328 479 +arrowjunctioncanvas 140549 class_ref 128261 // Fixture + xyz 494 749 2000 label_xy 487 770 +line 132101 ---O + from ref 129541 z 1999 to point 301 541 + line 139269 z 1999 to ref 131973 +line 132357 ---( + from ref 128901 z 1999 to point 321 311 + line 139909 z 1999 to ref 132229 +line 133125 ---O + from ref 132869 z 1999 to ref 132997 +line 133381 ---O + from ref 128901 z 1999 to ref 133253 +line 134661 ---O + from ref 133509 z 1999 to ref 134533 +line 134917 ---O + from ref 133509 z 1999 to ref 134789 +line 135173 ---O + from ref 133509 z 1999 to ref 135045 +line 135429 ---O + from ref 133509 z 1999 to point 689 914 + line 138245 z 1999 to ref 135301 +line 135941 ---O + from ref 133509 z 1999 to ref 135813 +line 136325 ---O + from ref 135685 z 1999 to ref 136197 +line 136581 ---( + from ref 135685 z 1999 to ref 136453 +line 137093 ---( + from ref 136837 z 1999 to point 540 1302 + line 137221 z 1999 to ref 136965 +line 137605 ---O + from ref 137349 z 1999 to ref 137477 +line 137861 ---( + from ref 137349 z 1999 to point 689 1522 + line 137989 z 1999 to ref 137733 +line 138629 ---( + from ref 138373 z 1999 to ref 138501 +line 139013 ---( + from ref 128901 z 1999 to point 355 289 + line 139141 z 1999 to ref 138885 +line 139525 ---O geometry HV + from ref 138757 z 1999 to point 355 672 + line 139781 z 1999 to ref 139397 +line 140677 ---( + from ref 135685 z 1999 to ref 140549 +preferred_whz 0 0 0.8 +end diff --git a/uml/cinelerra3/130181 b/uml/cinelerra3/130181 index 982375a30..c20af94e1 100644 --- a/uml/cinelerra3/130181 +++ b/uml/cinelerra3/130181 @@ -1,6 +1,6 @@ format 40 "mobject" // design::codegen::proc::mobject - revision 5 + revision 6 modified_by 5 "hiv" // class settings //class diagram settings @@ -29,7 +29,7 @@ format 40 stereotype "src" cpp_h_dir "proc/mobject" cpp_src_dir "proc/mobject" - cpp_namespace "proc::mobject" + cpp_namespace "mobject" comment "sourcecode package MObject Subsystem diff --git a/uml/cinelerra3/130309 b/uml/cinelerra3/130309 index 25cc7e26a..f5c27c9a0 100644 --- a/uml/cinelerra3/130309 +++ b/uml/cinelerra3/130309 @@ -1,6 +1,6 @@ format 40 "engine" // design::codegen::proc::engine - revision 7 + revision 8 modified_by 5 "hiv" // class settings //class diagram settings @@ -29,7 +29,7 @@ format 40 stereotype "src" cpp_h_dir "proc/engine" cpp_src_dir "proc/engine" - cpp_namespace "proc::engine" + cpp_namespace "engine" comment "sourcecode package The Core Render Engine" diff --git a/uml/cinelerra3/130437 b/uml/cinelerra3/130437 index 95197fe72..d1f52243d 100644 --- a/uml/cinelerra3/130437 +++ b/uml/cinelerra3/130437 @@ -1,6 +1,6 @@ format 40 "session" // design::codegen::proc::mobject::session - revision 5 + revision 6 modified_by 5 "hiv" // class settings //class diagram settings @@ -29,7 +29,7 @@ format 40 stereotype "src" cpp_h_dir "proc/mobject/session" cpp_src_dir "proc/mobject/session" - cpp_namespace "proc::mobject::session" + cpp_namespace "mobject::session" comment "sourcecode package Everything concerning the EDL and Session, within the MObject Subsystem" diff --git a/uml/cinelerra3/130565 b/uml/cinelerra3/130565 index adf896c2b..5da60b0f9 100644 --- a/uml/cinelerra3/130565 +++ b/uml/cinelerra3/130565 @@ -1,6 +1,6 @@ format 40 "builder" // design::codegen::proc::mobject::builder - revision 5 + revision 6 modified_by 5 "hiv" // class settings //class diagram settings @@ -29,7 +29,7 @@ format 40 stereotype "src" cpp_h_dir "proc/mobject/builder" cpp_src_dir "proc/mobject/builder" - cpp_namespace "proc::mobject::builder" + cpp_namespace "mobject::builder" comment "sourcecode package The Builder creating the Render Engine, diff --git a/uml/cinelerra3/130693 b/uml/cinelerra3/130693 index 6545b047c..71f67f571 100644 --- a/uml/cinelerra3/130693 +++ b/uml/cinelerra3/130693 @@ -1,6 +1,6 @@ format 40 "controller" // design::codegen::proc::mobject::controller - revision 5 + revision 6 modified_by 5 "hiv" // class settings //class diagram settings @@ -29,7 +29,7 @@ format 40 stereotype "src" cpp_h_dir "proc/mobject/controller" cpp_src_dir "proc/mobject/controller" - cpp_namespace "proc::mobject::controller" + cpp_namespace "mobject::controller" comment "sourcecode package The Processing and Render Controller, diff --git a/uml/cinelerra3/5.session b/uml/cinelerra3/5.session index ebe675d1e..65a46ae7d 100644 --- a/uml/cinelerra3/5.session +++ b/uml/cinelerra3/5.session @@ -1,13 +1,9 @@ window_sizes 1104 756 270 824 557 120 -diagrams - active classdiagram_ref 128133 // Session structure - 824 557 100 4 120 0 -end show_stereotypes selected - package_ref 129 // cinelerra3 +package_ref 129 // cinelerra3 open - package_ref 128645 // codegen +package_ref 129669 // proc end end diff --git a/uml/cinelerra3/cinelerra3.prj b/uml/cinelerra3/cinelerra3.prj index 141c837b0..7c1c4f1f6 100644 --- a/uml/cinelerra3/cinelerra3.prj +++ b/uml/cinelerra3/cinelerra3.prj @@ -1,6 +1,6 @@ format 40 "cinelerra3" - revision 25 + revision 26 modified_by 5 "hiv" cpp_root_dir "../../src/" diff --git a/wiki/renderengine.html b/wiki/renderengine.html index 06c63b227..2c79b42c5 100644 --- a/wiki/renderengine.html +++ b/wiki/renderengine.html @@ -846,6 +846,11 @@ For this Cinelerra3 design, we could consider making GOP just another raw media &rarr;see in [[Wikipedia|http://en.wikipedia.org/wiki/Group_of_pictures]]
+
+
This wiki page is the entry point to some detail notes covering some technical decisions, details and problems encountered in the course of the implementation of the Cinelerra Renderengine, the Builder and the related parts.
+
+* [[Packages, Interfaces and Namespaces|InterfaceNamespaces]]
+
/***
 ''InlineJavascriptPlugin for ~TiddlyWiki version 1.2.x and 2.0''
@@ -1011,6 +1016,182 @@ config.formatters.push( {
 //}}}
+
+
/***
+|''Name:''|InlineJavascriptPlugin|
+|''Source:''|http://www.TiddlyTools.com/#InlineJavascriptPlugin|
+|''Author:''|Eric Shulman - ELS Design Studios|
+|''License:''|[[Creative Commons Attribution-ShareAlike 2.5 License|http://creativecommons.org/licenses/by-sa/2.5/]]|
+|''~CoreVersion:''|2.0.10|
+
+Insert Javascript executable code directly into your tiddler content. Lets you ''call directly into TW core utility routines, define new functions, calculate values, add dynamically-generated TiddlyWiki-formatted output'' into tiddler content, or perform any other programmatic actions each time the tiddler is rendered.
+!!!!!Usage
+<<<
+When installed, this plugin adds new wiki syntax for surrounding tiddler content with {{{<script>}}} and {{{</script>}}} markers, so that it can be treated as embedded javascript and executed each time the tiddler is rendered.
+
+''Deferred execution from an 'onClick' link''
+By including a label="..." parameter in the initial {{{<script>}}} marker, the plugin will create a link to an 'onclick' script that will only be executed when that specific link is clicked, rather than running the script each time the tiddler is rendered.
+
+''External script source files:''
+You can also load javascript from an external source URL, by including a src="..." parameter in the initial {{{<script>}}} marker (e.g., {{{<script src="demo.js"></script>}}}). This is particularly useful when incorporating third-party javascript libraries for use in custom extensions and plugins. The 'foreign' javascript code remains isolated in a separate file that can be easily replaced whenever an updated library file becomes available.
+
+''Display script source in tiddler output''
+By including the keyword parameter "show", in the initial {{{<script>}}} marker, the plugin will include the script source code in the output that it displays in the tiddler.
+
+''Defining javascript functions and libraries:''
+Although the external javascript file is loaded while the tiddler content is being rendered, any functions it defines will not be available for use until //after// the rendering has been completed. Thus, you cannot load a library and //immediately// use it's functions within the same tiddler. However, once that tiddler has been loaded, the library functions can be freely used in any tiddler (even the one in which it was initially loaded).
+
+To ensure that your javascript functions are always available when needed, you should load the libraries from a tiddler that will be rendered as soon as your TiddlyWiki document is opened. For example, you could put your {{{<script src="..."></script>}}} syntax into a tiddler called LoadScripts, and then add {{{<<tiddler LoadScripts>>}}} in your MainMenu tiddler.
+
+Since the MainMenu is always rendered immediately upon opening your document, the library will always be loaded before any other tiddlers that rely upon the functions it defines. Loading an external javascript library does not produce any direct output in the tiddler, so these definitions should have no impact on the appearance of your MainMenu.
+
+''Creating dynamic tiddler content''
+An important difference between this implementation of embedded scripting and conventional embedded javascript techniques for web pages is the method used to produce output that is dynamically inserted into the document:
+* In a typical web document, you use the document.write() function to output text sequences (often containing HTML tags) that are then rendered when the entire document is first loaded into the browser window.
+* However, in a ~TiddlyWiki document, tiddlers (and other DOM elements) are created, deleted, and rendered "on-the-fly", so writing directly to the global 'document' object does not produce the results you want (i.e., replacing the embedded script within the tiddler content), and completely replaces the entire ~TiddlyWiki document in your browser window.
+* To allow these scripts to work unmodified, the plugin automatically converts all occurences of document.write() so that the output is inserted into the tiddler content instead of replacing the entire ~TiddlyWiki document.
+
+If your script does not use document.write() to create dynamically embedded content within a tiddler, your javascript can, as an alternative, explicitly return a text value that the plugin can then pass through the wikify() rendering engine to insert into the tiddler display. For example, using {{{return "thistext"}}} will produce the same output as {{{document.write("thistext")}}}.
+
+//Note: your script code is automatically 'wrapped' inside a function, {{{_out()}}}, so that any return value you provide can be correctly handled by the plugin and inserted into the tiddler. To avoid unpredictable results (and possibly fatal execution errors), this function should never be redefined or called from ''within'' your script code.//
+
+''Accessing the ~TiddlyWiki DOM''
+The plugin provides one pre-defined variable, 'place', that is passed in to your javascript code so that it can have direct access to the containing DOM element into which the tiddler output is currently being rendered.
+
+Access to this DOM element allows you to create scripts that can:
+* vary their actions based upon the specific location in which they are embedded
+* access 'tiddler-relative' information (use findContainingTiddler(place))
+* perform direct DOM manipulations (when returning wikified text is not enough)
+<<<
+!!!!!Examples
+<<<
+an "alert" message box:
+><script show>
+ alert('InlineJavascriptPlugin: this is a demonstration message');
+</script>
+dynamic output:
+><script show>
+ return (new Date()).toString();
+</script>
+wikified dynamic output:
+><script show>
+ return "link to current user: [["+config.options.txtUserName+"]]";
+</script>
+dynamic output using 'place' to get size information for current tiddler:
+><script show>
+ if (!window.story) window.story=window;
+ var title=story.findContainingTiddler(place).id.substr(7);
+ return title+" is using "+store.getTiddlerText(title).length+" bytes";
+</script>
+creating an 'onclick' button/link that runs a script:
+><script label="click here" show>
+ if (!window.story) window.story=window;
+ alert("Hello World!\nlinktext='"+place.firstChild.data+"'\ntiddler='"+story.findContainingTiddler(place).id.substr(7)+"'");
+</script>
+loading a script from a source url:
+>http://www.TiddlyTools.com/demo.js contains:
+>>{{{function demo() { alert('this output is from demo(), defined in demo.js') } }}}
+>>{{{alert('InlineJavascriptPlugin: demo.js has been loaded'); }}}
+><script src="demo.js" show>
+ return "loading demo.js..."
+</script>
+><script label="click to execute demo() function" show>
+ demo()
+</script>
+<<<
+!!!!!Installation
+<<<
+import (or copy/paste) the following tiddlers into your document:
+''InlineJavascriptPlugin'' (tagged with <<tag systemConfig>>)
+<<<
+!!!!!Revision History
+<<<
+''2006.06.01 [1.5.1]'' when calling wikify() on script return value, pass hightlightRegExp and tiddler params so macros that rely on these values can render properly
+''2006.04.19 [1.5.0]'' added 'show' parameter to force display of javascript source code in tiddler output
+''2006.01.05 [1.4.0]'' added support 'onclick' scripts. When label="..." param is present, a button/link is created using the indicated label text, and the script is only executed when the button/link is clicked. 'place' value is set to match the clicked button/link element.
+''2005.12.13 [1.3.1]'' when catching eval error in IE, e.description contains the error text, instead of e.toString(). Fixed error reporting so IE shows the correct response text. Based on a suggestion by UdoBorkowski
+''2005.11.09 [1.3.0]'' for 'inline' scripts (i.e., not scripts loaded with src="..."), automatically replace calls to 'document.write()' with 'place.innerHTML+=' so script output is directed into tiddler content. Based on a suggestion by BradleyMeck
+''2005.11.08 [1.2.0]'' handle loading of javascript from an external URL via src="..." syntax
+''2005.11.08 [1.1.0]'' pass 'place' param into scripts to provide direct DOM access 
+''2005.11.08 [1.0.0]'' initial release
+<<<
+!!!!!Credits
+<<<
+This feature was developed by EricShulman from [[ELS Design Studios|http:/www.elsdesign.com]]
+<<<
+!!!!!Code
+***/
+//{{{
+version.extensions.inlineJavascript= {major: 1, minor: 5, revision: 1, date: new Date(2006,6,1)};
+
+config.formatters.push( {
+ name: "inlineJavascript",
+ match: "\\<script",
+ lookahead: "\\<script(?: src=\\\"((?:.|\\n)*?)\\\")?(?: label=\\\"((?:.|\\n)*?)\\\")?( show)?\\>((?:.|\\n)*?)\\</script\\>",
+
+ handler: function(w) {
+ var lookaheadRegExp = new RegExp(this.lookahead,"mg");
+ lookaheadRegExp.lastIndex = w.matchStart;
+ var lookaheadMatch = lookaheadRegExp.exec(w.source)
+ if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+ if (lookaheadMatch[1]) { // load a script library
+ // make script tag, set src, add to body to execute, then remove for cleanup
+ var script = document.createElement("script"); script.src = lookaheadMatch[1];
+ document.body.appendChild(script); document.body.removeChild(script);
+ }
+ if (lookaheadMatch[4]) { // there is script code
+ if (lookaheadMatch[3]) // show inline script code in tiddler output
+ wikify("{{{\n"+lookaheadMatch[0]+"\n}}}\n",w.output);
+ if (lookaheadMatch[2]) { // create a link to an 'onclick' script
+ // add a link, define click handler, save code in link (pass 'place'), set link attributes
+ var link=createTiddlyElement(w.output,"a",null,"tiddlyLinkExisting",lookaheadMatch[2]);
+ link.onclick=function(){try{return(eval(this.code))}catch(e){alert(e.description?e.description:e.toString())}}
+ link.code="function _out(place){"+lookaheadMatch[4]+"};_out(this);"
+ link.setAttribute("href","javascript:;"); link.setAttribute("title",""); link.style.cursor="pointer";
+ }
+ else { // run inline script code
+ var code="function _out(place){"+lookaheadMatch[4]+"};_out(w.output);"
+ code=code.replace(/document.write\(/gi,'place.innerHTML+=(');
+ try { var out = eval(code); } catch(e) { out = e.description?e.description:e.toString(); }
+ if (out && out.length) wikify(out,w.output,w.highlightRegExp,w.tiddler);
+ }
+ }
+ w.nextMatch = lookaheadMatch.index + lookaheadMatch[0].length;
+ }
+ }
+} )
+//}}}
+
+
+
Because we rely on strong decoupling and separation into self contained components, there is not much need for a common quasi-global namespace. Operations needing the cooperation of another subsystem will be delegated or even dispatched, consequently implementation code needs only the service acces points from "direct cooperation partner" subsystems. Hierarchical scopes besides classes are needed only when multiple subsystems share a set of common abstractions. Interface and Implementation use separate namespaces.
+
+!common definitions
+# surely there will be the need to use some macros (albeit code written in C++ can successfully avoid macros to some extent)
+# there will be one global ''Application State'' representation (and some application services)
+# we have some lib facilities, especially a common [[Time]] abstraction
+For these we have one special (bilingual) header file __cinelerra.h__, which places in its C++ part some declarations into __namespace cinelerra__. These declarations should be pulled into the specific namespaces or (still better) into the implementation //on demand//. There is no nesting (we deliberately don't want an symbol appearing //automatically// in every part of the system).
+
+!subsystem interface and facade
+These large scale interfaces reside in special namespaces "~XXX_interface" (where XXX is the subsystem). The accompanning //definitions// depend on the implementation namespace and are placed in the top-level source folder of the corresponding subsystem.
+
+ &rarr; Example: [[Interfaces/Namespaces of the Session Subsystem(s)|InterfacesSession]]
+
+!contract checks and test code
+From experiences with other middle scale projects, I prefer having the test code in a separate tree (because test code easily doubles the number of source files). But of course it should be placed into the same namespace as the code being checked, or (better?) into a nested namespace "test". It is esp. desirable to have good coverage on the contracts of the subsystem interfaces and mayor components (while it is not always feasible or advisable to cover every implementation detail).
+
+
+
+
+
* Subdir src/proc contains Interface within namespace proc_interface
+* Subdir src/proc/mobject contains commonly used entities (namespace mobject)
+** nested namespace controller
+** nested namespace builder
+** nested namespace session
+* Subdir src/proc/engine (namespace engine) uses directly the (local) interface components StateProxy and ParamProvider; triggering of the render process is initiated by the controller and can be requested via the controller facade. Normally, the playback/render controller located in the backend will just use this interface and won't be aware of the build process at all.
+
+[img[Example: Interfaces/Namespaces of the ~Session-Subsystems|uml/fig130053.png]]
+
+
All sorts of "things" to be placed and manipulated by the user in the EDL. This interface abstracts the details and just provides
 * a duration
@@ -1031,10 +1212,11 @@ This Design strives to achieve a StrongSeparation between the low-level Structur
 [img[Classess related to the EDL|uml/fig128133.png]]
-
+
''[[Cinelerra3|index.html]]''
 [[RenderEngine]]
 [[MObjects]]
+[[Implementation|ImplementationDetails]]
 [[Admin]]
 <<fullscreen>>
@@ -1666,6 +1848,216 @@ Users accustomed with modern GUI applications typically expect that //everything 
a given Render Engine configuration is a list of Processors. Each Processor in turn contains a Graph of ProcNode.s to do the acutal data processing. In order to cary out any calculations, the Processor needs to be called with a StateProxy containing the state information for this RenderProcess
+
+
/***
+|''Name:''|RSSReaderPlugin|
+|''Description:''|This plugin provides a RSSReader for TiddlyWiki|
+|''Version:''|1.1.1|
+|''Date:''|Apr 21, 2007|
+|''Source:''|http://tiddlywiki.bidix.info/#RSSReaderPlugin|
+|''Documentation:''|http://tiddlywiki.bidix.info/#RSSReaderPluginDoc|
+|''Author:''|BidiX (BidiX (at) bidix (dot) info)|
+|''Credit:''|BramChen for RssNewsMacro|
+|''License:''|[[BSD open source license|http://tiddlywiki.bidix.info/#%5B%5BBSD%20open%20source%20license%5D%5D ]]|
+|''~CoreVersion:''|2.2.0|
+|''OptionalRequires:''|http://www.tiddlytools.com/#NestedSlidersPlugin|
+***/
+//{{{
+version.extensions.RSSReaderPlugin = {
+	major: 1, minor: 1, revision: 1,
+	date: new Date("Apr 21, 2007"),
+	source: "http://TiddlyWiki.bidix.info/#RSSReaderPlugin",
+	author: "BidiX",
+	coreVersion: '2.2.0'
+};
+
+config.macros.rssReader = {
+	dateFormat: "DDD, DD MMM YYYY",
+	itemStyle: "display: block;border: 1px solid black;padding: 5px;margin: 5px;", //useed  '@@'+itemStyle+itemText+'@@'
+	msg:{
+		permissionDenied: "Permission to read preferences was denied.",
+		noRSSFeed: "No RSS Feed at this address %0",
+		urlNotAccessible: " Access to %0 is not allowed"
+	},
+	cache: [], 	// url => XMLHttpRequest.responseXML
+	desc: "noDesc",
+	
+	handler: function(place,macroName,params,wikifier,paramString,tiddler) {
+		var desc = params[0];
+		var feedURL = params[1];
+		var toFilter = (params[2] ? true : false);
+		var filterString = (toFilter?(params[2].substr(0,1) == ' '? tiddler.title:params[2]):'');
+		var place = createTiddlyElement(place, "div", "RSSReader");
+		wikify("^^<<rssFeedUpdate "+feedURL+" [[" + tiddler.title + "]]>>^^\n",place);
+		if (this.cache[feedURL]) {
+			this.displayRssFeed(this.cache[feedURL], feedURL, place, desc, toFilter, filterString);
+		}
+		else {
+			var r = loadRemoteFile(feedURL,config.macros.rssReader.processResponse, [place, desc, toFilter, filterString]);
+			if (typeof r == "string")
+				displayMessage(r);
+		}
+		
+	},
+
+	// callback for loadRemoteFile 
+	// params : [place, desc, toFilter, filterString]
+	processResponse: function(status, params, responseText, url, xhr) { // feedURL, place, desc, toFilter, filterString) {	
+		if (window.netscape){
+			try {
+				if (document.location.protocol.indexOf("http") == -1) {
+					netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
+				}
+			}
+			catch (e) { displayMessage(e.description?e.description:e.toString()); }
+		}
+		if (xhr.status == httpStatus.NotFound)
+		 {
+			displayMessage(config.macros.rssReader.noRSSFeed.format([url]));
+			return;
+		}
+		if (!status)
+		 {
+			displayMessage(config.macros.rssReader.noRSSFeed.format([url]));
+			return;
+		}
+		if (xhr.responseXML) {
+			// response is interpreted as XML
+			config.macros.rssReader.cache[url] = xhr.responseXML;
+			config.macros.rssReader.displayRssFeed(xhr.responseXML, params[0], url, params[1], params[2], params[3]);
+		}
+		else {
+			if (responseText.substr(0,5) == "<?xml") {
+				// response exists but not return as XML -> try to parse it 
+				var dom = (new DOMParser()).parseFromString(responseText, "text/xml"); 
+				if (dom) {
+					// parsing successful so use it
+					config.macros.rssReader.cache[url] = dom;
+					config.macros.rssReader.displayRssFeed(dom, params[0], url, params[1], params[2], params[3]);
+					return;
+				}
+			}
+			// no XML display as html 
+			wikify("<html>" + responseText + "</html>", params[0]);
+			displayMessage(config.macros.rssReader.msg.noRSSFeed.format([url]));
+		}
+	},
+
+	// explore down the DOM tree
+	displayRssFeed: function(xml, place, feedURL, desc, toFilter, filterString){
+		// Channel
+		var chanelNode = xml.getElementsByTagName('channel').item(0);
+		var chanelTitleElement = (chanelNode ? chanelNode.getElementsByTagName('title').item(0) : null);
+		var chanelTitle = "";
+		if ((chanelTitleElement) && (chanelTitleElement.firstChild)) 
+			chanelTitle = chanelTitleElement.firstChild.nodeValue;
+		var chanelLinkElement = (chanelNode ? chanelNode.getElementsByTagName('link').item(0) : null);
+		var chanelLink = "";
+		if (chanelLinkElement) 
+			chanelLink = chanelLinkElement.firstChild.nodeValue;
+		var titleTxt = "!![["+chanelTitle+"|"+chanelLink+"]]\n";
+		var title = createTiddlyElement(place,"div",null,"ChanelTitle",null);
+		wikify(titleTxt,title);
+		// ItemList
+		var itemList = xml.getElementsByTagName('item');
+		var article = createTiddlyElement(place,"ul",null,null,null);
+		var lastDate;
+		var re;
+		if (toFilter) 
+			re = new RegExp(filterString.escapeRegExp());
+		for (var i=0; i<itemList.length; i++){
+			var titleElm = itemList[i].getElementsByTagName('title').item(0);
+			var titleText = (titleElm ? titleElm.firstChild.nodeValue : '');
+			if (toFilter && ! titleText.match(re)) {
+				continue;
+			}
+			var descText = '';
+			descElem = itemList[i].getElementsByTagName('description').item(0);
+			if (descElem){
+				try{
+					for (var ii=0; ii<descElem.childNodes.length; ii++) {
+						descText += descElem.childNodes[ii].nodeValue;
+					}
+				}
+				catch(e){}
+				descText = descText.replace(/<br \/>/g,'\n');
+				if (desc == "asHtml")
+					descText = "<html>"+descText+"</html>";
+			}
+			var linkElm = itemList[i].getElementsByTagName("link").item(0);
+			var linkURL = linkElm.firstChild.nodeValue;
+			var pubElm = itemList[i].getElementsByTagName('pubDate').item(0);
+			var pubDate;
+			if (!pubElm) {
+				pubElm = itemList[i].getElementsByTagName('date').item(0); // for del.icio.us
+				if (pubElm) {
+					pubDate = pubElm.firstChild.nodeValue;
+					pubDate = this.formatDateString(this.dateFormat, pubDate);
+					}
+					else {
+						pubDate = '0';
+					}
+				}
+			else {
+				pubDate = (pubElm ? pubElm.firstChild.nodeValue : 0);
+				pubDate = this.formatDate(this.dateFormat, pubDate);
+			}
+			titleText = titleText.replace(/\[|\]/g,'');
+			var rssText = '*'+'[[' + titleText + '|' + linkURL + ']]' + '' ;
+			if ((desc != "noDesc") && descText){
+				rssText = rssText.replace(/\n/g,' ');
+				descText = '@@'+this.itemStyle+descText + '@@\n';				
+				if (version.extensions.nestedSliders){
+					descText = '+++[...]' + descText + '===';
+				}
+				rssText = rssText + descText;
+			}
+			var story;
+			if ((lastDate != pubDate) && ( pubDate != '0')) {
+				story = createTiddlyElement(article,"li",null,"RSSItem",pubDate);
+				lastDate = pubDate;
+			}
+			else {
+				lastDate = pubDate;
+			}
+			story = createTiddlyElement(article,"div",null,"RSSItem",null);
+			wikify(rssText,story);
+		}
+	},
+	
+	formatDate: function(template, date){
+		var dateString = new Date(date);
+		// template = template.replace(/hh|mm|ss/g,'');
+		return dateString.formatString(template);
+	},
+	
+	formatDateString: function(template, date){
+		var dateString = new Date(date.substr(0,4), date.substr(5,2) - 1, date.substr(8,2)
+			);
+		return dateString.formatString(template);
+	}
+	
+};
+
+config.macros.rssFeedUpdate = {
+	label: "Update",
+	prompt: "Clear the cache and redisplay this RssFeed",
+	handler: function(place,macroName,params) {
+		var feedURL = params[0];
+		var tiddlerTitle = params[1];
+		createTiddlyButton(place, this.label, this.prompt, 
+			function () {
+				if (config.macros.rssReader.cache[feedURL]) {
+					config.macros.rssReader.cache[feedURL] = null; 
+			}
+			story.refreshTiddler(tiddlerTitle,null, true);
+		return false;});
+	}
+};
+
+//}}}
+
+
The Render Engine is the part of the application doing the actual video calculations. Its operations are guided by the Objects and Parameters edited by the user in [[the EDL|EDL]] and it retrieves the raw audio and video data from the [[Data backend|backend.html]]. Because the inner workings of the Render Engine are closely related to the structures used in the EDL, this design covers [[this aspect|MObjects]] as well.
 
@@ -1686,11 +2078,11 @@ The design of Cinelerra 2 basically follows this design, but __fails because of
 &rarr; [[Overview]] of Subsystems and Components, and DesignGoals
 &rarr; [[An Introduction|WalkThrough]] discussing the key features
 &rarr; [[Overview Render Engine|OverviewRenderEngine]]
-&rarr; BuildProcess
-&rarr; RenderProcess
+&rarr; BuildProcess and RenderProcess
 &rarr; [[Two Examples|Examples]] (Object diagrams) 
 &rarr; how [[Automation]] works  {{red{to be defined in more detail}}}
 &rarr; [[Problems|ProblemsTodo]] {{red{to be solved}}}
+&rarr; [[Implementation Details|ImplementationDetails]] {{red{WIP}}}