diff --git a/doc/devel/uml/class135557.html b/doc/devel/uml/class135557.html index fdcef57fa..cb97dca6f 100644 --- a/doc/devel/uml/class135557.html +++ b/doc/devel/uml/class135557.html @@ -17,7 +17,7 @@

Declaration :

Directly inherited by : Config External Invalid Logic State

-

Artifact : error

+

Artifact : error, Component(s) : CommonLib

Operation what

Declaration :

Operation rootCause

Declaration :

If this exception was caused by a chain of further exceptions,
return the first one registered in this throw sequence.
This works only, if every exceptions thrown as a consequence
of another exception is propperly constructed by passing
the original exception to the constructor

diff --git a/doc/devel/uml/class137989.html b/doc/devel/uml/class137989.html index 5ee601cc6..6c5bf6158 100644 --- a/doc/devel/uml/class137989.html +++ b/doc/devel/uml/class137989.html @@ -17,7 +17,8 @@

Declaration :

structural asset holding the configuration of a track in the EDL

Artifact : track

-
+ +
Relation wiringTemplate (<unidirectional association>)

Declaration :

All public operations : enable , getDependant , getParents , isActive

diff --git a/doc/devel/uml/class139397.html b/doc/devel/uml/class139397.html new file mode 100644 index 000000000..1bfe82fbf --- /dev/null +++ b/doc/devel/uml/class139397.html @@ -0,0 +1,22 @@ + + + + + + +Class MediaFactory + + + + + +
Class MediaFactory
+

+ + + + +

Declaration :

Depends on BackendLayer

Depends on BackendLayer

specialized Asset Factory for configuring (new) media asset instances based on existing media files on disk; can create placeholder assets as well

Artifact : media

+
+ + diff --git a/doc/devel/uml/class139525.html b/doc/devel/uml/class139525.html new file mode 100644 index 000000000..e5acd9bec --- /dev/null +++ b/doc/devel/uml/class139525.html @@ -0,0 +1,20 @@ + + + + + + +Class MediaAccessFacade + + + + + +
Class MediaAccessFacade
+

+ + + + +

Declaration :

provides functions for querying (opening) a media file, detecting the channels or streams found within this file, etc. Delegating to the actual backend functions

Component(s) : Media Access

+ diff --git a/doc/devel/uml/classdiagrams.html b/doc/devel/uml/classdiagrams.html index 8c55bf4b0..63f1a4fcf 100644 --- a/doc/devel/uml/classdiagrams.html +++ b/doc/devel/uml/classdiagrams.html @@ -23,9 +23,12 @@ File MappingShows whats used to access Frames HierarchyCinelerra Exception hierarchy In Memory Database +interface components Media-Asset Relations +Proc-Asset Relations Render Entities Session structure +Struct-Asset Relations diff --git a/doc/devel/uml/classes.html b/doc/devel/uml/classes.html index b522e0caf..a34ff3876 100644 --- a/doc/devel/uml/classes.html +++ b/doc/devel/uml/classes.html @@ -78,6 +78,8 @@ Logic Mask Mediakey abstraction: media-like assets +MediaAccessFacadeboundaryprovides functions for querying (opening) a media file, detecting the channels or streams found within this file, etc. Delegating to the actual backend functions +MediaFactoryspecialized Asset Factory for configuring (new) media asset instances based on existing media files on disk; can create placeholder assets as well Metakey abstraction: metadata and organisational asset Meta MObjectinterface diff --git a/doc/devel/uml/classes_list.html b/doc/devel/uml/classes_list.html index ffe1ccbab..b394be64d 100644 --- a/doc/devel/uml/classes_list.html +++ b/doc/devel/uml/classes_list.html @@ -79,6 +79,8 @@ Logic
Mask
Media
+MediaAccessFacade
+MediaFactory
Meta
Meta
MObject
diff --git a/doc/devel/uml/componentdiagrams.html b/doc/devel/uml/componentdiagrams.html index 15a1086a2..967828869 100644 --- a/doc/devel/uml/componentdiagrams.html +++ b/doc/devel/uml/componentdiagrams.html @@ -16,6 +16,7 @@ +
backend-components
OverviewThis drawing shows the top level compoents and relations
proc-components
diff --git a/doc/devel/uml/fig128005.png b/doc/devel/uml/fig128005.png index 68d6a056f..7290793c8 100644 Binary files a/doc/devel/uml/fig128005.png and b/doc/devel/uml/fig128005.png differ diff --git a/doc/devel/uml/fig130693.png b/doc/devel/uml/fig130693.png new file mode 100644 index 000000000..81351d39b Binary files /dev/null and b/doc/devel/uml/fig130693.png differ diff --git a/doc/devel/uml/fig130821.png b/doc/devel/uml/fig130821.png new file mode 100644 index 000000000..8f9dab369 Binary files /dev/null and b/doc/devel/uml/fig130821.png differ diff --git a/doc/devel/uml/fig130949.png b/doc/devel/uml/fig130949.png new file mode 100644 index 000000000..c86283700 Binary files /dev/null and b/doc/devel/uml/fig130949.png differ diff --git a/doc/devel/uml/fig131077.png b/doc/devel/uml/fig131077.png new file mode 100644 index 000000000..eb1cfb2cf Binary files /dev/null and b/doc/devel/uml/fig131077.png differ diff --git a/doc/devel/uml/fig131205.png b/doc/devel/uml/fig131205.png new file mode 100644 index 000000000..04fc181b7 Binary files /dev/null and b/doc/devel/uml/fig131205.png differ diff --git a/doc/devel/uml/index.html b/doc/devel/uml/index.html index 9f3edecf9..6e665f205 100644 --- a/doc/devel/uml/index.html +++ b/doc/devel/uml/index.html @@ -29,7 +29,7 @@ Documentation

Overview



This drawing shows the top level compoents and relations

Component CommonLib
-

provided classes : Time

+

provided classes : Error, Time

Component Builder

provided classes : StateProxy

@@ -73,6 +73,11 @@ Documentation
Component RenderPathManager

provided classes : PathManager

+ +
Component MediaFactory
+

required classes : MediaAccessFacade

+ +
Component AssetDB

1.2 Component View interfaces

@@ -87,6 +92,12 @@ Documentation
Component ConManager

required classes : ParamProvider

+ +

+

backend-components



+ +
Component Media Access
+

provided classes : MediaAccessFacade

1.3 Package codegen

@@ -101,7 +112,7 @@ Documentation
Artifact Cinelerra3

Depends on common

Depends on gui

Depends on proc

Depends on backend

the main executable to be built

-

executable associated with : allocation, vframe, arender, renderstate, label, glbuf, procnode, stateproxy, hub, buildable, abstractmo, 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

+

executable associated with : arender, renderstate, label, glbuf, procnode, stateproxy, hub, buildable, abstractmo, 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

Artifact main

Artifact source

@@ -197,7 +208,7 @@ Documentation
Artifact media

key abstraction: media-like assets

-

Artifact source associated with : Media

+

Artifact source associated with : Media, MediaFactory

Artifact proc

key abstraction: media-like assets

@@ -532,9 +543,16 @@ Documentation

Media-Asset Relations



+ +

+

Proc-Asset Relations



+ +

+

Struct-Asset Relations



Class Asset
Class AssetManager
Class Media
+
Class MediaFactory
Class CompoundMedia
Class Proc
Class Struct
@@ -982,11 +1000,36 @@ reuse exiting Engine

Selection :

Transformation

3 Package BackendLayer

+ +

3.1 Class View Interface

+
+ +

+

interface components



+
Class MediaAccessFacade
+
+ +

3.2 Use Case View usage

+
+ +

+

backend use cases



+ +

3.2.1 Use Case load Media

+
+
+ +

3.2.2 Use Case access File

+ +

3.2.3 Use Case detect Channels

+ +

3.2.4 Use Case access Channel

+
-

3.1 Package design

+

3.3 Package design

-

3.1.1 Class View Backend Components

+

3.3.1 Class View Backend Components

@@ -1007,15 +1050,15 @@ reuse exiting Engine

Selection :

    Transformation
    Class FrameReference
    Class FileReference
    -

    3.1.1.1 Activity get frame

    +

    3.3.1.1 Activity get frame

    Pre Condition :

      Post Condition :

        Class WriteBufferPool
        Class WriteBuffer
        -

        3.2 Component View Cache

        +

        3.4 Component View Cache

        -

        3.3 Component View FileMapping

        +

        3.5 Component View FileMapping

        4 Package GUI

        diff --git a/doc/devel/uml/index_60.html b/doc/devel/uml/index_60.html index cc286ecf2..4909e634c 100644 --- a/doc/devel/uml/index_60.html +++ b/doc/devel/uml/index_60.html @@ -17,8 +17,8 @@ - + @@ -30,8 +30,8 @@ - + diff --git a/doc/devel/uml/index_65.html b/doc/devel/uml/index_65.html index b2473717c..7fc8a769c 100644 --- a/doc/devel/uml/index_65.html +++ b/doc/devel/uml/index_65.html @@ -19,6 +19,8 @@ + + @@ -40,18 +42,19 @@ + - + - + diff --git a/doc/devel/uml/index_66.html b/doc/devel/uml/index_66.html index 1d3f8104b..2f6812bb3 100644 --- a/doc/devel/uml/index_66.html +++ b/doc/devel/uml/index_66.html @@ -19,6 +19,8 @@ + + diff --git a/doc/devel/uml/index_67.html b/doc/devel/uml/index_67.html index 9cba96588..d9c7fd522 100644 --- a/doc/devel/uml/index_67.html +++ b/doc/devel/uml/index_67.html @@ -27,27 +27,27 @@ - - - - - - - - - - - - + + + + + + + + + + + + - + @@ -73,8 +73,8 @@ - + diff --git a/doc/devel/uml/index_68.html b/doc/devel/uml/index_68.html index 81b2f665f..75c620c08 100644 --- a/doc/devel/uml/index_68.html +++ b/doc/devel/uml/index_68.html @@ -27,8 +27,9 @@ - + + diff --git a/doc/devel/uml/index_70.html b/doc/devel/uml/index_70.html index 3eb653613..14b9fb500 100644 --- a/doc/devel/uml/index_70.html +++ b/doc/devel/uml/index_70.html @@ -33,8 +33,8 @@ - + diff --git a/doc/devel/uml/index_73.html b/doc/devel/uml/index_73.html index 3701bbfcd..6bb5ea25f 100644 --- a/doc/devel/uml/index_73.html +++ b/doc/devel/uml/index_73.html @@ -21,10 +21,12 @@ - + + + diff --git a/doc/devel/uml/index_76.html b/doc/devel/uml/index_76.html index ddbe5c66d..9403a79d7 100644 --- a/doc/devel/uml/index_76.html +++ b/doc/devel/uml/index_76.html @@ -23,6 +23,7 @@ + diff --git a/doc/devel/uml/index_77.html b/doc/devel/uml/index_77.html index 793afbce2..dac7b6a5a 100644 --- a/doc/devel/uml/index_77.html +++ b/doc/devel/uml/index_77.html @@ -24,7 +24,11 @@ + + + + diff --git a/doc/devel/uml/index_79.html b/doc/devel/uml/index_79.html index a8226191c..4902abfdc 100644 --- a/doc/devel/uml/index_79.html +++ b/doc/devel/uml/index_79.html @@ -19,9 +19,9 @@ - - + + diff --git a/doc/devel/uml/index_80.html b/doc/devel/uml/index_80.html index 27ab841fa..2380ad9ce 100644 --- a/doc/devel/uml/index_80.html +++ b/doc/devel/uml/index_80.html @@ -44,6 +44,7 @@ + diff --git a/doc/devel/uml/index_83.html b/doc/devel/uml/index_83.html index e5e139dc4..15423df50 100644 --- a/doc/devel/uml/index_83.html +++ b/doc/devel/uml/index_83.html @@ -30,8 +30,8 @@ - + @@ -40,8 +40,8 @@ - + @@ -55,6 +55,7 @@ +
        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
        NameKindDescription
        abstractmoartifactabstract base class for all Media Objects
        AbstractMOclass
        access Channeluse case
        access Fileuse case
        activity finalactivity final
        activity finalactivity final
        AFrameclass
        assetpackagesourcecode package

        Asset Management
        Assetpackage
        Asset Kindsclass diagram
        AssetDBcomponent
        AssetManagementcomponent
        AssetManagerclassFacade for the Asset subsystem
        assetmanagerartifactFacade for the Asset subsystem
        Assetsclass view
        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
        audio1class instance
        audio1class instance
        autoartifactMedia Object holding automation data
        AutoclassAutomation data for some parameter (i.e. a time varying function)
        Automation Entitiesclass diagram
        NameKindDescription
        backendpackagesourcecode package

        Data backend classes here...
        Backend Componentsclass view
        backend use casesuse case diagram
        backend-componentscomponent diagram
        BackendLayerpackage
        buildoperation
        build flowactivity diagram
        checked_outrelationthis list keeps all mappings which are in use, and thus prevents them from Cache aging
        Cinelerra3artifactthe main executable to be built
        cinelerra3package
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        class instanceclass instance
        Clipclassbookkeeping (asset) view of a media clip.
        clipartifacta Media Clip
        clipartifactbookkeeping (asset) view of a media clip.
        clipartifacta Media Clip
        Clipclass
        clipsrelation
        Codecclassdescription of some media data decoder or encoder facility
        connectopaque activity action
        Constraintclass
        Controllercomponent
        Controllerpackage
        controllerpackagesourcecode package

        The Processing and Render Controller,
        located within the MObject Subsystem
        Controllerpackage
        Controller Entitiesclass diagram
        Controller Workingsclass view
        ControllerFacadeclassProvides unified access to the Proc-Subsystem Controller. Especially, this Facade class provides the functions to get a render engine to carry out actual renderings.
        descriptorrelation
        designpackage
        designpackageAll things concering the big picture.
        Not a real code package, rather a container for design drafts, specifications, decisions.
        determine Render Paramsopaque activity action
        detect Channelsuse case
        determine Render Paramsexpansion region
        determine Render Paramsopaque activity action
        devnullclass instance
        DirectPlacementclass
        Dispatchercomponent
        Fixtureactivity object
        fixtureartifactthe (low level) representation of the EDL with concrete placement data
        fixturerelation
        Fixturecomponent
        Fixtureclass
        Fixturecomponent
        fork activity nodefork activity node
        FrameclassFrames are just a low level lump of continous memory, most parts are opaque. Frames are memory sensitive, they will be small constant sized structures which can be efficently managed in a pool.
        Framenode
        In Memory Databaseclass diagram
        inFixtureactivity action pin
        inputclass instance
        inputclass instance
        inputclass instance
        inputclass instance
        instanceoperation
        instructionsrelation
        Interfaceclass view
        interface componentsclass diagram
        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
        lengthattributeduration (span) of this timeline segment.
        Linkclass
        linkartifactforwarding, adapting or connecting ProcNode
        load Mediause case
        Lockclass
        Lockclass
        Logicclass
        maskartifactVideo ProcNode for masking regions of the image (automatable)
        Mediaclasskey abstraction: media-like assets
        mediaartifactkey abstraction: media-like assets
        Media Accesscomponent
        Media-Asset Relationsclass diagram
        MediaAccessFacadeclassprovides functions for querying (opening) a media file, detecting the channels or streams found within this file, etc. Delegating to the actual backend functions
        MediaFactorycomponent
        MediaFactoryclassspecialized Asset Factory for configuring (new) media asset instances based on existing media files on disk; can create placeholder assets as well
        merge activity nodemerge activity node
        Metaclasskey abstraction: metadata and organisational asset
        metaartifactkey abstraction: metadata and organisational asset
        NameKindDescription
        offsetattributeOffset the actual position by this (time) value relative to the anchor point. TODO: Representation?
        orgattributeorigin or authorship id. Can be a project abbreviation, a package id or just the authors nickname or UID. This allows for the compnent name to be more generic (e.g. "blur"). Default for all assets provided by the core cinelerra-3 codebase is "cin3".
        ouputclass instance
        ouputclass instance
        ouputclass instance
        ouputclass instance
        ouputclass instance
        OutPortclassstructural asset corresponding to some port generating media output
        outportartifactstructural asset corresponding to some port generating media output
        outputrelation
        procnode
        procartifactkey abstraction: media-like assets
        procattributeholds the Processor (Render Engine Element) to be built by the current build step
        Proc-Asset Relationsclass diagram
        proc-componentscomponent diagram
        ProcessingLayerpackage
        Processorclass
        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
        SimpleClipclass
        SmartPointerclass
        SmartPointersclass view
        sourcerelationmedia source of this clip
        sourcerelationthe media source this clip referes to
        sourcerelationmedia source of this clip
        SourceclassSource Node: represents a media source to pull data from.
        sourceartifactRepresentation of a Media source
        Source Overviewdeployment diagram
        std::exceptionclass
        Structclasskey abstraction: structural asset
        structartifactkey abstraction: structural asset
        Struct-Asset Relationsclass diagram
        subjectrelation
        subPatternrelation
        diff --git a/doc/devel/uml/index_84.html b/doc/devel/uml/index_84.html index 90cbd038f..b86c2c7b0 100644 --- a/doc/devel/uml/index_84.html +++ b/doc/devel/uml/index_84.html @@ -40,13 +40,13 @@ tracksrelation Trafoclass trafoartifacttransforming processing Node -treatoperation -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_85.html b/doc/devel/uml/index_85.html index b5f26dfb9..6075e15d1 100644 --- a/doc/devel/uml/index_85.html +++ b/doc/devel/uml/index_85.html @@ -19,6 +19,7 @@ NameKindDescription Unknownclassplaceholder for unknown or unavailable media source unknownartifactplaceholder for unknown or unavailable media source +usageuse case view useFileoperationAnnounces that the application intends to use this file with mode (READ|WRITE|READWRITE) useTemporaryStorageoperationProvides a pool for interminate frames diff --git a/doc/devel/uml/index_86.html b/doc/devel/uml/index_86.html index 191657818..1a10d10b0 100644 --- a/doc/devel/uml/index_86.html +++ b/doc/devel/uml/index_86.html @@ -20,23 +20,23 @@ versionattributeversion number of the thing or concept represented by this asset. Of each unique tuple (name, category, org) there will be only one version in the whole system. Version 0 is reserved for internal purposes. Versions are considered to be ordered, and any higher version is supposed to be fully backwards compatible to all previous versions. VFrameclass vframeartifacta buffer and render process holding a Video frame -vid1class instance vid1class instance -vid_aclass instance -vid_Aclass instance +vid1class instance +vid_Aclass instance vid_aclass instance vid_Aclass instance -vid_Aclass instance -videoclass instance -videoclass instance +vid_aclass instance +vid_Aclass instance videoclass instance +videoclass instance +videoclass instance videoclass instance -video1class instance -video1class instance -video1class instance video1class instance -video1class instance +video1class instance video1class instance +video1class instance +video1class instance +video1class instance VRenderclassRepresentation of a Video render process. (Encapsulates the video buffers for the actual calculations) vrenderartifactRepresentation of a Video render process diff --git a/doc/devel/uml/index_87.html b/doc/devel/uml/index_87.html index 4af6e38d9..cdf4db578 100644 --- a/doc/devel/uml/index_87.html +++ b/doc/devel/uml/index_87.html @@ -19,6 +19,7 @@ NameKindDescription whatoperation whatoperationthe base class of all exceptions thrown by the standard library +wiringTemplaterelation Wishclass write_bufferrelation WriteBufferclass diff --git a/doc/devel/uml/navig.html b/doc/devel/uml/navig.html index 2bdbe6770..1d6f86b34 100644 --- a/doc/devel/uml/navig.html +++ b/doc/devel/uml/navig.html @@ -9,7 +9,7 @@

        -

        -Top- -Classes- -Public Operations- -Public properties- -Packages- -Activities- -Class Diagrams- -Object Diagrams- -Activity Diagrams- -Collaboration Diagrams- -Component Diagrams- -Deployment Diagrams-

        +

        -Top- -Classes- -Public Operations- -Public properties- -Packages- -Use Cases- -Activities- -Class Diagrams- -Object Diagrams- -Activity Diagrams- -Use Case Diagrams- -Collaboration Diagrams- -Component Diagrams- -Deployment Diagrams-

        < A B C D E F G H I K L M N O P R S T U V W

        diff --git a/doc/devel/uml/usecasediagrams.html b/doc/devel/uml/usecasediagrams.html new file mode 100644 index 000000000..62cd42a0e --- /dev/null +++ b/doc/devel/uml/usecasediagrams.html @@ -0,0 +1,22 @@ + + + + + + +Use Case Diagram Index + + + + + +
        Use Case Diagram Index
        +

        + + + + + +
        backend use cases
        + + diff --git a/doc/devel/uml/usecases.html b/doc/devel/uml/usecases.html new file mode 100644 index 000000000..d55241488 --- /dev/null +++ b/doc/devel/uml/usecases.html @@ -0,0 +1,25 @@ + + + + + + +Use Cases Index + + + + + +
        Use Cases Index
        +

        + + + + + + + + +
        access Channel
        access File
        detect Channels
        load Media
        + + diff --git a/src/proc/asset/media.hpp b/src/proc/asset/media.hpp index 350ba86f2..66c21da04 100644 --- a/src/proc/asset/media.hpp +++ b/src/proc/asset/media.hpp @@ -22,8 +22,8 @@ /** @file media.hpp - ** Media data is a specific Kind of Asset. - ** For the different Kinds of Assets, we use sub-intefaces inheriting + ** Media data is a specific kind of Asset. + ** For the different kinds of Assets, we use sub-intefaces inheriting ** from the general Asset interface. To be able to get asset::Media instances ** directly from the AssetManager, we define a specialization of the Asset ID. ** @@ -89,7 +89,7 @@ namespace asset /** - * Factory specialized for createing Media Asset objects. + * Factory specialized for creating Media Asset objects. */ class MediaFactory : public cinelerra::Factory { diff --git a/uml/cinelerra3/128005 b/uml/cinelerra3/128005 index 0d1ddaf0c..e16107985 100644 --- a/uml/cinelerra3/128005 +++ b/uml/cinelerra3/128005 @@ -1,6 +1,6 @@ format 40 "design" // design - revision 9 + revision 10 modified_by 5 "hiv" // class settings //class diagram settings @@ -42,6 +42,7 @@ Not a real code package, rather a container for design drafts, specifications, d component 129925 "CommonLib" provided_classes + class_ref 135557 // Error class_ref 134917 // Time end end @@ -84,10 +85,10 @@ Not a real code package, rather a container for design drafts, specifications, d -_-> on component_ref 128005 // Builder end - end component 128645 "AssetManagement" + stereotype "subsystem" end component 128773 "Dispatcher" @@ -129,6 +130,16 @@ Not a real code package, rather a container for design drafts, specifications, d end end + component 130181 "MediaFactory" + stereotype "component" + required_classes + class_ref 139525 // MediaAccessFacade + end + end + + component 130309 "AssetDB" + stereotype "service" + end end componentview 128133 "interfaces" @@ -157,6 +168,19 @@ Not a real code package, rather a container for design drafts, specifications, d class_ref 134661 // ParamProvider end end + + componentdiagram 130693 "backend-components" + 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 + size A4 + end + + component 130437 "Media Access" + stereotype "service" + provided_classes + class_ref 139525 // MediaAccessFacade + end + end end package_ref 128645 // codegen diff --git a/uml/cinelerra3/128005.diagram b/uml/cinelerra3/128005.diagram index cf3c8dfa1..a16e8f676 100644 --- a/uml/cinelerra3/128005.diagram +++ b/uml/cinelerra3/128005.diagram @@ -1,4 +1,4 @@ -format 38 +format 40 fragment 128005 "UI Layer" xyzwh 321 22 2000 829 100 @@ -11,8 +11,8 @@ fragment 128261 "Backend Layer" xyzwh 64 848 2000 1089 105 end packagecanvas 128389 - package_ref 128133 // AssetManager - xyzwh 561 201 2005 265 214 + package_ref 128133 // Asset + xyzwh 561 201 2005 265 241 packagecanvas 128517 package_ref 128261 // MObject xyzwh 94 201 2006 458 335 @@ -38,7 +38,7 @@ note 129541 "Structures edited by the User" xyzwh 43 269 2016 181 41 componentcanvas 129669 component_ref 128645 // AssetManagement draw_component_as_icon default show_component_req_prov default show_component_rea default - xyzwh 577 241 2010 208 159 + xyzwh 577 232 2010 217 201 componentcanvas 129797 component_ref 128773 // Dispatcher draw_component_as_icon default show_component_req_prov default show_component_rea default xyzwh 406 31 2005 193 75 @@ -59,6 +59,12 @@ note 131973 "just works, never decides" xyzwh 317 668 2015 110 59 note 132101 "codecs, stream I/O here" xyzwh 376 592 2005 166 39 +componentcanvas 132229 component_ref 130181 // MediaFactory + draw_component_as_icon default show_component_req_prov default show_component_rea default + xyzwh 593 354 2015 158 67 +componentcanvas 132357 component_ref 130309 // AssetDB + draw_component_as_icon default show_component_req_prov default show_component_rea default + xyzwh 629 289 2020 155 63 simplerelationcanvas 131205 simplerelation_ref 128005 from ref 130053 z 2004 to ref 130181 simplerelationcanvas 131333 simplerelation_ref 128133 diff --git a/uml/cinelerra3/128133 b/uml/cinelerra3/128133 index 64b57bac8..9e7642989 100644 --- a/uml/cinelerra3/128133 +++ b/uml/cinelerra3/128133 @@ -1,6 +1,6 @@ format 40 "Asset" // ProcessingLayer::Asset - revision 11 + revision 12 modified_by 5 "hiv" // class settings //class diagram settings @@ -53,6 +53,16 @@ format 40 size A4 end + classdiagram 131077 "Proc-Asset Relations" + 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 + size A4 + end + + classdiagram 131205 "Struct-Asset Relations" + 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 + size A4 + end + class 136453 "Asset" abstract visibility public stereotype "interface" cpp_decl "${comment}${template}class ${name}${inherit} @@ -396,6 +406,39 @@ ${class}::${name} ${(}${)}${const}${volatile} ${throw}${staticnl} end end + class 139397 "MediaFactory" + visibility public + cpp_decl "${comment}${template}class ${name}${inherit} + { +${members} }; +${inlines} +" + java_decl "" + idl_decl "" + explicit_switch_type "" + + comment "specialized Asset Factory for configuring (new) media asset instances based on existing media files on disk; can create placeholder assets as well" + simplerelation 129285 + -_-> + on + package_ref 129157 // BackendLayer + end + + simplerelation 129413 + -_-> + on + package_ref 129157 // BackendLayer + end + + classrelation 144261 // + relation 142341 -_-> + a default + cpp default "Generated" + classrelation_ref 144261 // + b multiplicity "" parent class_ref 139525 // MediaAccessFacade + end + end + class 138501 "CompoundMedia" visibility public cpp_decl "${comment}${template}class ${name}${inherit} @@ -641,6 +684,15 @@ ${inlines} classrelation_ref 141317 // b multiplicity "" parent class_ref 136965 // Struct end + + classrelation 144389 // wiringTemplate () + relation 142469 ---> + a role_name "wiringTemplate" multiplicity "1" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 144389 // wiringTemplate () + b multiplicity "" parent class_ref 138757 // ProcPatt + end end class 138117 "OutPort" diff --git a/uml/cinelerra3/128138 b/uml/cinelerra3/128138 index 33c1211c8..be431c6db 100644 --- a/uml/cinelerra3/128138 +++ b/uml/cinelerra3/128138 @@ -1,7 +1,7 @@ format 40 "design" // BackendLayer::design - revision 8 - modified_by 10 "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 @@ -318,7 +318,7 @@ ${inlines} classrelation_ref 129802 // end - classrelation 130058 // write_buffer () + classrelation 130058 // relation_ref 129418 // end end @@ -528,7 +528,7 @@ ${inlines} b role_name "write_buffer" multiplicity "0..1" protected cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; " - classrelation_ref 130058 // write_buffer () + classrelation_ref 130058 // end classrelation 130314 // diff --git a/uml/cinelerra3/128389 b/uml/cinelerra3/128389 index 6581cb200..35d64e6bd 100644 --- a/uml/cinelerra3/128389 +++ b/uml/cinelerra3/128389 @@ -1,6 +1,6 @@ format 40 "RenderEngine" // ProcessingLayer::RenderEngine - revision 11 + revision 12 modified_by 5 "hiv" // class settings //class diagram settings @@ -563,7 +563,7 @@ ${inlines} classrelation 141701 // relation 139909 -_-> a default - cpp default "Generated" + cpp default "#include in header" classrelation_ref 141701 // b multiplicity "" parent class_ref 136709 // Media end diff --git a/uml/cinelerra3/128389.diagram b/uml/cinelerra3/128389.diagram index 7c1a670cd..b031adc09 100644 --- a/uml/cinelerra3/128389.diagram +++ b/uml/cinelerra3/128389.diagram @@ -14,11 +14,11 @@ classcanvas 128389 class_ref 131589 // ExitNode end classcanvas 128517 class_ref 131717 // ProcNode 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 462 265 2000 + xyz 462 264 2000 end classcanvas 129029 class_ref 131845 // Trafo 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 496 444 2000 + xyz 496 443 2000 end classcanvas 129157 class_ref 131973 // Link 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 @@ -38,7 +38,7 @@ classcanvas 129541 class_ref 132357 // Mask end classcanvas 129669 class_ref 132485 // PluginAdapter 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 506 622 2000 + xyz 506 621 2000 end classcanvas 129797 class_ref 132613 // GLPipe 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 @@ -82,7 +82,7 @@ classcanvas 137221 class_ref 133765 // Source end classcanvas 139781 class_ref 135045 // CodecAdapter 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 599 622 2000 + xyz 599 621 2000 end relationcanvas 128261 relation_ref 131845 // from ref 128005 z 1999 stereotype "<>" xyz 178 278 3000 to point 216 200 @@ -102,8 +102,8 @@ relationcanvas 129925 relation_ref 132101 // no_multiplicity_a no_multiplicity_b relationcanvas 130053 relation_ref 132229 // geometry VHV - from ref 129029 z 1999 to point 516 384 - line 130949 z 1999 to point 499 384 + from ref 129029 z 1999 to point 516 383 + line 130949 z 1999 to point 499 383 line 131077 z 1999 to ref 128517 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -198,11 +198,11 @@ relationcanvas 137989 relation_ref 134917 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b relationcanvas 139397 relation_ref 135429 // - from ref 128517 z 1999 to point 432 265 - line 139525 z 1999 to point 432 295 + from ref 128517 z 1999 to point 432 264 + line 139525 z 1999 to point 432 294 line 139653 z 1999 to ref 128517 - role_a_pos 414 273 3000 no_role_b - no_multiplicity_a multiplicity_b_pos 445 292 3000 + role_a_pos 414 272 3000 no_role_b + no_multiplicity_a multiplicity_b_pos 445 291 3000 relationcanvas 139909 relation_ref 136965 // from ref 139781 z 1999 to ref 129029 no_role_a no_role_b diff --git a/uml/cinelerra3/129157 b/uml/cinelerra3/129157 index 10e4a87d1..c1920331a 100644 --- a/uml/cinelerra3/129157 +++ b/uml/cinelerra3/129157 @@ -1,14 +1,14 @@ -format 38 +format 40 "BackendLayer" // BackendLayer - revision 5 - modified_by 10 "ct" + revision 6 + 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 @@ -26,6 +26,116 @@ format 38 package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default show_infonote default drawing_language default + classview 129029 "Interface" + //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 + //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 + write_horizontally default 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 class_drawing_mode default drawing_language default draw_all_relations default shadow default + //state diagram settings + package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default + show_activities default region_horizontally default drawing_language default + //class settings + //activity diagram settings + package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default + show_infonote default drawing_language default + + classdiagram 130949 "interface components" + draw_all_relations no 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 + size A4 + end + + class 139525 "MediaAccessFacade" + visibility public stereotype "boundary" + cpp_decl "${comment}${template}class ${name}${inherit} + { +${members} }; +${inlines} +" + java_decl "" + idl_decl "${comment}${abstract}${local}interface ${name}${inherit} { +${members}}; +" + explicit_switch_type "" + + comment "provides functions for querying (opening) a media file, detecting the channels or streams found within this file, etc. Delegating to the actual backend functions" + end + end + + usecaseview 128133 "usage" + //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 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 + write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default + usecasediagram 130821 "backend use cases" + package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default + size A4 + end + + usecase 128005 "load Media" + //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 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 + write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default + simplerelation 129029 + -_-> + stereotype "include" + on usecase_ref 128133 // access File + end + + simplerelation 129157 + -_-> + stereotype "include" + on usecase_ref 128261 // detect Channels + comment "after accessing the file, detect the channel/stream structure" + end + end + + usecase 128133 "access File" + //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 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 + write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default + end + + usecase 128261 "detect Channels" + //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 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 + write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default + end + + usecase 128389 "access Channel" + //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 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 + write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default + end + end + package_ref 128138 // design componentview 128138 "Cache" diff --git a/uml/cinelerra3/130053 b/uml/cinelerra3/130053 index 27985ba52..c61e1e94f 100644 --- a/uml/cinelerra3/130053 +++ b/uml/cinelerra3/130053 @@ -1,6 +1,6 @@ format 40 "asset" // design::codegen::proc::asset - revision 5 + revision 6 modified_by 5 "hiv" // class settings //class diagram settings @@ -151,6 +151,7 @@ ${members} ${namespace_end}" associated_classes class_ref 136709 // Media + class_ref 139397 // MediaFactory end comment "key abstraction: media-like assets" end diff --git a/uml/cinelerra3/130053.diagram b/uml/cinelerra3/130053.diagram index 36438c6a4..da938cd73 100644 --- a/uml/cinelerra3/130053.diagram +++ b/uml/cinelerra3/130053.diagram @@ -88,6 +88,8 @@ 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 +arrowjunctioncanvas 140805 class_ref 135557 // Error + xyz 790 194 2000 label_xy 787 215 line 132101 ---O from ref 129541 z 1999 to point 301 541 line 139269 z 1999 to ref 131973 @@ -131,5 +133,7 @@ line 139525 ---O geometry HV line 139781 z 1999 to ref 139397 line 140677 ---( from ref 135685 z 1999 to ref 140549 +line 140933 ---O + from ref 132869 z 1999 to ref 140805 preferred_whz 0 0 0.8 end diff --git a/uml/cinelerra3/130309.diagram b/uml/cinelerra3/130309.diagram index bfff7acc4..d9d44ae03 100644 --- a/uml/cinelerra3/130309.diagram +++ b/uml/cinelerra3/130309.diagram @@ -10,126 +10,126 @@ classcanvas 128133 class_ref 136581 // AssetManager end packagecanvas 128517 package_ref 128133 // Asset - show_context_mode namespace xyzwh 215 182 1994 610 571 + show_context_mode namespace xyzwh 214 182 1994 610 571 classcanvas 128645 class_ref 136709 // Media 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 259 330 2005 + xyz 258 330 2005 end classcanvas 128773 class_ref 136837 // Proc 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 503 347 2005 + xyz 502 330 2005 end classcanvas 128901 class_ref 136965 // Struct 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 655 347 2005 + xyz 654 330 2005 end classcanvas 129029 class_ref 137093 // Meta 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 761 347 2005 + xyz 760 330 2005 end classcanvas 130821 class_ref 137221 // Category 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 277 233 2004 + xyz 276 233 2004 end classcanvas 131077 class_ref 137349 // Clip 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 319 445 2000 + xyz 318 445 2000 end classcanvas 131333 class_ref 137477 // Unknown 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 382 529 2000 + xyz 381 529 2000 end classcanvas 131461 class_ref 137605 // Preview 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 387 445 2005 + xyz 386 445 2005 end classcanvas 131973 class_ref 137733 // Effect 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 477 445 2000 + xyz 476 445 2000 end classcanvas 132101 class_ref 137861 // Codec 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 538 445 2000 + xyz 537 445 2000 end classcanvas 132485 class_ref 137989 // Track 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 615 445 2000 + xyz 614 445 2000 end classcanvas 132613 class_ref 138117 // OutPort 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 678 445 2000 + xyz 677 445 2000 end classcanvas 132997 class_ref 138245 // Dataset 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 757 445 2000 + xyz 756 445 2000 end classcanvas 133253 class_ref 138373 // DB 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 486 233 2000 + xyz 485 233 2000 end classcanvas 133765 class_ref 138501 // CompoundMedia 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 245 529 2005 + xyz 244 529 2005 end classcanvas 135813 class_ref 138757 // ProcPatt 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 638 506 2000 + xyz 637 506 2000 end classcanvas 136709 class_ref 139141 // DoAttach 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 567 688 2000 + xyz 566 688 2000 end classcanvas 136837 class_ref 139013 // BuildInstruct 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 605 620 2000 + xyz 604 620 2000 end classcanvas 136965 class_ref 139269 // DoRecurse 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 639 688 2000 + xyz 638 688 2000 end relationcanvas 129157 relation_ref 138117 // geometry VHV - from ref 128645 z 1999 to point 293 307 + from ref 128645 z 1999 to point 292 307 line 129797 z 1999 to point 138 307 line 129925 z 1999 to ref 128005 no_role_a no_role_b no_multiplicity_a no_multiplicity_b relationcanvas 129285 relation_ref 138245 // geometry VHV - from ref 128773 z 1999 to point 523 315 - line 130053 z 1999 to point 138 315 + from ref 128773 z 1999 to point 522 307 + line 130053 z 1999 to point 138 307 line 130181 z 1999 to ref 128005 no_role_a no_role_b no_multiplicity_a no_multiplicity_b relationcanvas 129413 relation_ref 138373 // geometry VHV - from ref 128901 z 1999 to point 675 315 - line 130309 z 1999 to point 138 315 + from ref 128901 z 1999 to point 674 307 + line 130309 z 1999 to point 138 307 line 130437 z 1999 to ref 128005 no_role_a no_role_b no_multiplicity_a no_multiplicity_b relationcanvas 129541 relation_ref 138501 // geometry VHV - from ref 129029 z 1999 to point 781 315 - line 130565 z 1999 to point 138 315 + from ref 129029 z 1999 to point 780 307 + line 130565 z 1999 to point 138 307 line 130693 z 1999 to ref 128005 no_role_a no_role_b no_multiplicity_a no_multiplicity_b relationcanvas 130949 relation_ref 138629 // from ref 128005 z 1999 to ref 130821 - role_a_pos 223 229 3000 no_role_b - multiplicity_a_pos 260 250 3000 multiplicity_b_pos 194 194 3000 + role_a_pos 222 217 3000 no_role_b + multiplicity_a_pos 259 250 3000 multiplicity_b_pos 194 194 3000 relationcanvas 131205 relation_ref 138757 // geometry VHV - from ref 131077 z 1999 to point 339 423 - line 134277 z 1999 to point 293 423 + from ref 131077 z 1999 to point 338 423 + line 134277 z 1999 to point 292 423 line 134405 z 1999 to ref 128645 no_role_a no_role_b no_multiplicity_a no_multiplicity_b relationcanvas 131717 relation_ref 139013 // geometry VHV - from ref 131461 z 2004 to point 411 423 - line 134021 z 2004 to point 293 423 + from ref 131461 z 2004 to point 410 423 + line 134021 z 2004 to point 292 423 line 134149 z 2004 to ref 128645 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -159,20 +159,20 @@ relationcanvas 133125 relation_ref 139781 // no_multiplicity_a no_multiplicity_b relationcanvas 133381 relation_ref 140293 // geometry HV - from ref 128133 z 1999 to point 506 93 + from ref 128133 z 1999 to point 505 93 line 133637 z 1999 to ref 133253 - role_a_pos 518 208 3000 no_role_b - multiplicity_a_pos 492 208 3000 multiplicity_b_pos 386 104 3000 + role_a_pos 517 208 3000 no_role_b + multiplicity_a_pos 491 208 3000 multiplicity_b_pos 386 104 3000 relationcanvas 134533 relation_ref 140421 // from ref 133765 z 2004 to ref 128645 no_role_a no_role_b no_multiplicity_a no_multiplicity_b relationcanvas 134917 relation_ref 140549 // - from ref 133765 z 2004 stereotype "<>" xyz 229 493 3000 to point 225 545 + from ref 133765 z 2004 stereotype "<>" xyz 228 493 3000 to point 225 545 line 135301 z 2004 to point 225 365 line 135173 z 2004 to ref 128645 - role_a_pos 217 343 3000 no_role_b - multiplicity_a_pos 232 376 3000 multiplicity_b_pos 230 556 3000 + role_a_pos 216 343 3000 no_role_b + multiplicity_a_pos 231 376 3000 multiplicity_b_pos 229 556 3000 relationcanvas 136069 relation_ref 141189 // from ref 135813 z 1999 to ref 128901 no_role_a no_role_b @@ -185,9 +185,9 @@ relationcanvas 136197 relation_ref 141317 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b relationcanvas 137093 relation_ref 141701 // - from ref 135813 z 1999 stereotype "<>" xyz 632 569 3000 to ref 136837 - role_a_pos 655 600 3000 no_role_b - multiplicity_a_pos 622 599 3000 multiplicity_b_pos 643 557 3000 + from ref 135813 z 1999 stereotype "<>" xyz 631 569 3000 to ref 136837 + role_a_pos 657 595 3000 no_role_b + multiplicity_a_pos 621 595 3000 multiplicity_b_pos 642 557 3000 relationcanvas 137221 relation_ref 141829 // from ref 136709 z 1999 to ref 136837 no_role_a no_role_b @@ -200,13 +200,13 @@ relationcanvas 137477 relation_ref 142085 // from ref 136965 z 1999 to point 728 656 line 137605 z 1999 to point 728 562 line 137733 z 1999 to ref 135813 - role_a_pos 704 524 3000 no_role_b - multiplicity_a_pos 736 560 3000 multiplicity_b_pos 705 688 3000 + role_a_pos 703 523 3000 no_role_b + multiplicity_a_pos 703 556 3000 multiplicity_b_pos 704 688 3000 relationcanvas 137861 relation_ref 142213 // from ref 136709 z 1999 stereotype "<>" xyz 538 659 3000 to point 595 388 line 137989 z 1999 to ref 128773 - role_a_pos 559 553 3000 no_role_b - multiplicity_a_pos 571 541 3000 no_multiplicity_b + role_a_pos 556 343 3000 no_role_b + multiplicity_a_pos 556 376 3000 no_multiplicity_b line 128261 -_-_ geometry HV from ref 128005 z 1999 to point 331 150 line 128389 z 1999 to ref 128133 diff --git a/uml/cinelerra3/130693.diagram b/uml/cinelerra3/130693.diagram new file mode 100644 index 000000000..1602c55a2 --- /dev/null +++ b/uml/cinelerra3/130693.diagram @@ -0,0 +1,23 @@ +format 40 + +packagecanvas 128005 + package_ref 129541 // backend + xyzwh 59 425 1994 717 262 +packagecanvas 128133 + package_ref 130053 // asset + color lightblue xyzwh 437 34 1994 342 257 +componentcanvas 128261 component_ref 130181 // MediaFactory + draw_component_as_icon default show_component_req_prov default show_component_rea default + xyzwh 536 127 2005 155 63 +componentcanvas 128389 component_ref 130437 // Media Access + draw_component_as_icon default show_component_req_prov default show_component_rea default + xyzwh 550 504 2005 155 63 +arrowjunctioncanvas 128517 class_ref 139525 // MediaAccessFacade + xyz 617 395 2000 label_xy 575 414 +arrowjunctioncanvas 128773 class_ref 139525 // MediaAccessFacade + xyz 616 349 2000 label_xy 574 368 +line 128645 ---O + from ref 128389 z 1999 to ref 128517 +line 128901 ---( + from ref 128261 z 1999 to ref 128773 +end diff --git a/uml/cinelerra3/130821.diagram b/uml/cinelerra3/130821.diagram new file mode 100644 index 000000000..369aa3f38 --- /dev/null +++ b/uml/cinelerra3/130821.diagram @@ -0,0 +1,37 @@ +format 40 + +packagecanvas 128005 + package_ref 128133 // Asset + xyzwh 32 26 2000 226 311 +classcanvas 128133 class_ref 139397 // MediaFactory + xyz 131 95 3005 label_xy 118 135 +usecasecanvas 128389 usecase_ref 128005 // load Media + xyzwh 340 148 3005 64 32 label_xy 346 180 +usecasecanvas 128645 usecase_ref 128133 // access File + xyzwh 537 190 3005 64 32 label_xy 540 222 +usecasecanvas 128773 usecase_ref 128261 // detect Channels + xyzwh 502 254 3005 64 32 label_xy 495 286 +subject 129413 "" + xyzwh 12 5 2005 280 676 +subject 129541 "" + xyzwh 305 6 2000 351 673 +packagecanvas 129669 + package_ref 128389 // RenderEngine + xyzwh 31 344 2010 227 327 +classcanvas 129797 class_ref 132741 // StateProxy + xyz 129 449 3005 label_xy 122 489 +usecasecanvas 129925 usecase_ref 128389 // access Channel + xyzwh 457 378 3005 64 32 label_xy 450 410 +note 130437 "using channel handle" + xyzwh 471 323 3009 128 35 +line 128517 ---> + from ref 128133 z 3004 to ref 128389 +simplerelationcanvas 129157 simplerelation_ref 129029 + from ref 128389 z 3004 stereotype "<>" xyz 452 185 3000 to ref 128645 +simplerelationcanvas 129285 simplerelation_ref 129157 + from ref 128389 z 3004 stereotype "<>" xyz 424 216 3000 to ref 128773 +line 130053 ---> + from ref 129797 z 3004 to ref 129925 +line 130309 -_-_ + from ref 128773 z 3004 to ref 129925 +end diff --git a/uml/cinelerra3/130949.diagram b/uml/cinelerra3/130949.diagram new file mode 100644 index 000000000..8b766f1c6 --- /dev/null +++ b/uml/cinelerra3/130949.diagram @@ -0,0 +1,21 @@ +format 40 + +classcanvas 128005 class_ref 139525 // MediaAccessFacade + 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 149 277 2000 + end +packagecanvas 128133 + package_ref 129157 // BackendLayer + xyzwh 49 191 1995 561 424 +packagecanvas 128261 + package_ref 128133 // Asset + xyzwh 324 29 2000 287 138 +classcanvas 128389 class_ref 139397 // MediaFactory + 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 375 83 2005 + end +relationcanvas 129285 relation_ref 142341 // + from ref 128389 z 1999 to ref 128005 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end diff --git a/uml/cinelerra3/131077.diagram b/uml/cinelerra3/131077.diagram new file mode 100644 index 000000000..5da417c64 --- /dev/null +++ b/uml/cinelerra3/131077.diagram @@ -0,0 +1,92 @@ +format 40 + +classcanvas 128005 class_ref 139013 // BuildInstruct + 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 693 369 2000 + end +classcanvas 128133 class_ref 136837 // Proc + 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 591 79 2005 + end +classcanvas 128261 class_ref 137861 // Codec + 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 581 216 2000 + end +classcanvas 128389 class_ref 138757 // ProcPatt + 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 726 255 2000 + end +classcanvas 128517 class_ref 137733 // Effect + 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 550 152 2000 + end +classcanvas 128645 class_ref 139141 // DoAttach + 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 655 437 2000 + end +packagecanvas 128773 + package_ref 128133 // Asset + show_context_mode namespace xyzwh 406 24 1994 417 478 +packagecanvas 129669 + package_ref 128389 // RenderEngine + xyzwh 20 90 1994 330 411 +classcanvas 129797 class_ref 135045 // CodecAdapter + 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 198 348 2000 + end +classcanvas 129925 class_ref 131717 // ProcNode + 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 79 137 2000 + end +classcanvas 130053 class_ref 132485 // PluginAdapter + 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 233 285 2000 + end +classcanvas 130181 class_ref 131845 // Trafo + 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 96 238 2000 + end +relationcanvas 128901 relation_ref 142213 // + from ref 128645 z 1999 stereotype "<>" xyz 626 407 3000 to point 683 134 + line 129029 z 1999 to ref 128133 + role_a_pos 645 92 3000 no_role_b + multiplicity_a_pos 645 125 3000 no_multiplicity_b +relationcanvas 129157 relation_ref 139269 // + from ref 128517 z 1999 to ref 128133 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 129285 relation_ref 139397 // + from ref 128261 z 1999 to ref 128133 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 129413 relation_ref 141701 // + from ref 128389 z 1999 stereotype "<>" xyz 714 332 3000 to ref 128005 + role_a_pos 746 344 3000 no_role_b + multiplicity_a_pos 710 344 3000 multiplicity_b_pos 731 306 3000 +relationcanvas 129541 relation_ref 141829 // + from ref 128645 z 1999 to ref 128005 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 130309 relation_ref 135429 // + from ref 129925 z 1999 to point 49 137 + line 130437 z 1999 to point 49 167 + line 130565 z 1999 to ref 129925 + role_a_pos 31 145 3000 no_role_b + no_multiplicity_a multiplicity_b_pos 62 164 3000 +relationcanvas 130693 relation_ref 132229 // + from ref 130181 z 1999 to ref 129925 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 131077 relation_ref 136965 // + from ref 129797 z 1999 to ref 130181 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 131205 relation_ref 132997 // + from ref 130053 z 1999 to ref 130181 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +line 131333 -_-_ + from ref 130053 z 1999 to ref 128517 +line 131461 -_-_ + from ref 129797 z 1999 to ref 128261 +end diff --git a/uml/cinelerra3/131205.diagram b/uml/cinelerra3/131205.diagram new file mode 100644 index 000000000..02ad56b41 --- /dev/null +++ b/uml/cinelerra3/131205.diagram @@ -0,0 +1,79 @@ +format 40 + +packagecanvas 128005 + package_ref 128133 // Asset + xyzwh 328 34 1994 448 544 +classcanvas 128133 class_ref 139013 // BuildInstruct + 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 651 391 2000 + end +classcanvas 128261 class_ref 136837 // Proc + 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 481 508 2005 + end +classcanvas 128389 class_ref 138757 // ProcPatt + 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 684 277 2000 + end +classcanvas 128517 class_ref 138117 // OutPort + 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 510 196 2000 + end +classcanvas 128645 class_ref 139141 // DoAttach + 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 613 459 2000 + end +classcanvas 128773 class_ref 137989 // Track + 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 604 196 2000 + end +classcanvas 128901 class_ref 139269 // DoRecurse + 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 685 459 2000 + end +classcanvas 129029 class_ref 136965 // Struct + 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 701 101 2005 + end +relationcanvas 129157 relation_ref 139653 // + geometry VHV + from ref 128517 z 1999 to point 535 167 + line 130437 z 1999 to point 721 167 + line 130565 z 1999 to ref 129029 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 129285 relation_ref 141189 // + from ref 128389 z 1999 to point 721 228 + line 130693 z 1999 to ref 129029 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 129413 relation_ref 139525 // + geometry VHV + from ref 128773 z 1999 to point 624 167 + line 130181 z 1999 to point 721 167 + line 130309 z 1999 to ref 129029 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 129541 relation_ref 141701 // + from ref 128389 z 1999 stereotype "<>" xyz 678 340 3000 to ref 128133 + role_a_pos 704 366 3000 no_role_b + multiplicity_a_pos 668 366 3000 multiplicity_b_pos 689 328 3000 +relationcanvas 129669 relation_ref 141829 // + from ref 128645 z 1999 to ref 128133 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 129797 relation_ref 142213 // + from ref 128645 z 1999 stereotype "<>" xyz 510 628 3000 to ref 128261 + role_a_pos 535 494 3000 no_role_b + multiplicity_a_pos 535 527 3000 no_multiplicity_b +relationcanvas 130053 relation_ref 141957 // + from ref 128901 z 1999 to ref 128133 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +relationcanvas 130821 relation_ref 142469 // + geometry VH + from ref 128773 z 1999 to point 624 296 + line 131205 z 1999 to ref 128389 + role_a_pos 587 295 3000 no_role_b + multiplicity_a_pos 667 307 3000 no_multiplicity_b +end diff --git a/uml/cinelerra3/5.session b/uml/cinelerra3/5.session index 41ab92dac..15afb5ad6 100644 --- a/uml/cinelerra3/5.session +++ b/uml/cinelerra3/5.session @@ -1,38 +1,23 @@ window_sizes 1140 783 270 860 633 71 diagrams - active classdiagram_ref 130309 // Asset Kinds + classdiagram_ref 130309 // Asset Kinds 860 633 100 4 180 0 classdiagram_ref 128133 // Session structure 688 506 100 4 120 0 - classdiagram_ref 130437 // Media-Asset Relations + active classdiagram_ref 130437 // Media-Asset Relations 860 633 100 4 0 0 + classdiagram_ref 128389 // Render Entities + 688 506 100 4 120 0 end show_stereotypes -selected objectdiagram_ref 128773 // EDL Example1 +selected + package_ref 129 // cinelerra3 open package_ref 128005 // design - class_ref 136453 // Asset - operation_ref 133125 // getID - operation_ref 132357 // reg - class_ref 136709 // Media - class_ref 138501 // CompoundMedia - class_ref 137349 // Clip - class_ref 138757 // ProcPatt - class_ref 139141 // DoAttach - class_ref 139269 // DoRecurse - class_ref 128901 // Clip - class_ref 138629 // CompoundClip - - package_ref 128389 // RenderEngine - usecaseview_ref 128005 // Renderengine Use - class_ref 135685 // Logic - class_ref 135813 // Config - class_ref 135941 // State - class_ref 136069 // Invalid - class_ref 136197 // External - class_ref 136325 // std::exception - class_ref 135429 // Appconfig - classview_ref 128266 // SmartPointers + classview_ref 128901 // Assets + classview_ref 128133 // Engine Workings + classview_ref 129029 // Interface + componentview_ref 128266 // FileMapping end end diff --git a/uml/cinelerra3/cinelerra3.prj b/uml/cinelerra3/cinelerra3.prj index 7d03110f4..cd49f3161 100644 --- a/uml/cinelerra3/cinelerra3.prj +++ b/uml/cinelerra3/cinelerra3.prj @@ -1,6 +1,6 @@ format 40 "cinelerra3" - revision 28 + revision 29 modified_by 5 "hiv" cpp_root_dir "../../src/" diff --git a/wiki/renderengine.html b/wiki/renderengine.html index 53f84aa82..f845eb46c 100644 --- a/wiki/renderengine.html +++ b/wiki/renderengine.html @@ -1367,9 +1367,10 @@ As a //first shot// Ichthyo considers the following approach: <style type="text/css">#contentWrapper {display:none;}</style><div id="SplashScreen" style="border: 3px solid #ccc; display: block; text-align: center; width: 320px; margin: 100px auto; padding: 50px; color:#000; font-size: 28px; font-family:Tahoma; background-color:#eee;">loading <b>Cinelerra Renderengine</b> devel doku<blink> ...</blink><br><br><span style="font-size: 14px; color:red;">Requires Javascript.</span></div> -
        +
        The Interface asset::Media is a //key abstraction// It ties together several concepts and enables to deal with them on the interfaces in a uniform manner. Besides, as every Asset kind it belongs rather to the bookkeeping view: it holds the specific properties and parametrisation of the media source it stands for. Regarding the __inward interface__ &mdash; as used from within the [[EDL]] or the [[Render Nodes|ProcNode]], it is irrelevant if a given asset::Media object stands for a complete media source, just a clip taken from this source or if a placeholder version of the real media source is used instead.
-[img[Asset Classess|uml/fig130437.png]]
        +[img[Asset Classess|uml/fig130437.png]] + 
        Of course: Cinelerra currently leaks memory and crashes regularilly. For the newly written code, besides retaining the same performance level, a main goal is to use methods and techniques known to support the writing of quality code. So, besides the MultithreadConsiderations, a solid strategy for managing the ownership of allocated memory blocks is necessary right from start.
@@ -2063,6 +2064,16 @@ Simple relations can be hard wired. But, on the contrary, it would be as naive t
 
 One example of this problem is the [[handling of multichannel media|MultichannelMedia]]. Following the above reasoning, we end with having a [["structural processing pattern"|ProcPatt]], typically one video stream with MPEG decoder and a pair of audio streams which need either to be routed to some "left" and "right" output ports, or have to be passed through a panning filter accordingly. Now the problem is: //create a new instance of this structure for each new media, or detect which media to subsume under a existing pattern instance.//
        +
        +
        All Assets of kind asset::Proc represent //processing algorithms// in the bookkeeping view. They enable loading, browsing and maybe even parametrizing all the Effects, Plugins and Codecs available for use within the Cinelerra Session.
+
+Besides, they provide an important __inward interface__ for the [[ProcNode]]s, which will use these asset entries to dispatch the actual processing call when rendering. 
+
+{{red{todo: the naming scheme??}}}
+
+[img[Asset Classess|uml/fig131077.png]]
+
        +
        The middle Layer of our current Architecture plan, i.e. the layer managing all processing and manipulation, while the actual data handling is done in the backend and the user interaction belongs to the GUI Layer.
 
@@ -2430,6 +2441,17 @@ Instead, we should try to just connect the various subsystems via Interfaces and
 * to shield the rendering code of all complexities of thread communication and synchronization, we use the StateProxy
        +
        +
        Structural Assets are intended mainly for internal use, but the user should be able to see and query them. By changing the parametrisation of some structural Asset, we can customize the default behaviour of Cinelerra to some extent.
+* [[Processing Patterns|ProcPatt]] encode the information, how to get at the actual media data when rendering a clip.
+* Tracks are one of the dimensions used for organizing the EDL. Besides, they carry parametrisation of output port, overlay mode etc.
+* Output Ports {{red{still need to be defined...}}}
+
+The Asset name field of structural Assets utilizes a special naming scheme, which allows to derive the name based on the capabilities of the structural asset. For example, by default all media clips with a given media stream type (e.g. H264) will use the same [[processing Pattern|ProcPatt]] for rendering. {{red{todo: work out the details of this naming scheme??}}}
+
+[img[Asset Classess|uml/fig131205.png]]
+
        +
        /*{{{*/
 /* a contrasting background so I can see where one tiddler ends and the other begins */