From 02b19268402dea3cd79dec6b17b0299f41656b0a Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Sat, 22 Sep 2007 16:44:50 +0200 Subject: [PATCH] WIP: start implementing the new entities --- src/backend/mediaaccessfacade.cpp | 33 ++++++ src/backend/mediaaccessfacade.hpp | 45 ++++++++ src/proc/asset/buildinstruct.cpp | 35 +++++++ src/proc/asset/buildinstruct.hpp | 71 +++++++++++++ src/proc/asset/compoundmedia.cpp | 33 ++++++ src/proc/asset/compoundmedia.hpp | 54 ++++++++++ src/proc/asset/procpatt.cpp | 34 ++++++ src/proc/asset/procpatt.hpp | 56 ++++++++++ src/proc/mobject/session/compoundclip.cpp | 38 +++++++ src/proc/mobject/session/compoundclip.hpp | 53 ++++++++++ src/proc/mobject/session/simpleclip.cpp | 38 +++++++ src/proc/mobject/session/simpleclip.hpp | 50 +++++++++ uml/cinelerra3/128133 | 26 +---- uml/cinelerra3/128261 | 25 ++++- uml/cinelerra3/129541 | 42 +++++++- uml/cinelerra3/130053 | 122 +++++++++++++++++++++- uml/cinelerra3/130437 | 80 +++++++++++++- uml/cinelerra3/130437.diagram | 6 +- uml/cinelerra3/5.session | 3 +- 19 files changed, 812 insertions(+), 32 deletions(-) create mode 100644 src/backend/mediaaccessfacade.cpp create mode 100644 src/backend/mediaaccessfacade.hpp create mode 100644 src/proc/asset/buildinstruct.cpp create mode 100644 src/proc/asset/buildinstruct.hpp create mode 100644 src/proc/asset/compoundmedia.cpp create mode 100644 src/proc/asset/compoundmedia.hpp create mode 100644 src/proc/asset/procpatt.cpp create mode 100644 src/proc/asset/procpatt.hpp create mode 100644 src/proc/mobject/session/compoundclip.cpp create mode 100644 src/proc/mobject/session/compoundclip.hpp create mode 100644 src/proc/mobject/session/simpleclip.cpp create mode 100644 src/proc/mobject/session/simpleclip.hpp diff --git a/src/backend/mediaaccessfacade.cpp b/src/backend/mediaaccessfacade.cpp new file mode 100644 index 000000000..b41277436 --- /dev/null +++ b/src/backend/mediaaccessfacade.cpp @@ -0,0 +1,33 @@ +/* + MediaAccessFacade - functions for querying media file and channels. + + Copyright (C) CinelerraCV + 2007, Christian Thaeter + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +* *****************************************************/ + + +#include "backend/mediaaccessfacade.hpp" + +namespace backend_interface + { + + /** */ + + + +} // namespace backend_interface diff --git a/src/backend/mediaaccessfacade.hpp b/src/backend/mediaaccessfacade.hpp new file mode 100644 index 000000000..be02109e6 --- /dev/null +++ b/src/backend/mediaaccessfacade.hpp @@ -0,0 +1,45 @@ +/* + MEDIAACCESSFACADE.hpp - functions for querying media file and channels. + + Copyright (C) CinelerraCV + 2007, Christian Thaeter + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the 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 BACKEND_INTERFACE_MEDIAACCESSFACADE_H +#define BACKEND_INTERFACE_MEDIAACCESSFACADE_H + + + +namespace backend_interface + { + + + /** + * provides functions for querying (opening) a media file, + * detecting the channels or streams found within this file etc. + * Delegating to the actual backend functions + */ + class MediaAccessFacade + { + }; + + + +} // namespace backend_interface +#endif diff --git a/src/proc/asset/buildinstruct.cpp b/src/proc/asset/buildinstruct.cpp new file mode 100644 index 000000000..b344d9ddf --- /dev/null +++ b/src/proc/asset/buildinstruct.cpp @@ -0,0 +1,35 @@ +/* + BuildInstruct - Instructions for building some configuration of render nodes. + + Copyright (C) CinelerraCV + 2007, Christian Thaeter + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +* *****************************************************/ + + +#include "proc/asset/buildinstruct.hpp" +#include "proc/asset/procpatt.hpp" +#include "proc/asset/proc.hpp" + +namespace asset + { + + /** */ + + + +} // namespace asset diff --git a/src/proc/asset/buildinstruct.hpp b/src/proc/asset/buildinstruct.hpp new file mode 100644 index 000000000..5aef64eb4 --- /dev/null +++ b/src/proc/asset/buildinstruct.hpp @@ -0,0 +1,71 @@ +/* + BUILDINSTRUCT.hpp - Instructions for building some configuration of render nodes. + + Copyright (C) CinelerraCV + 2007, Christian Thaeter + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the 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 ASSET_BUILDINSTRUCT_H +#define ASSET_BUILDINSTRUCT_H + +#include + +using std::string; + + + +namespace asset + { + + class Proc; + class ProcPatt; + + + /** + * (Interface) building instructions to be executed by the Builder + * on the render node network under construction. + */ + class BuildInstruct + { + }; + + + + class DoRecurse : public BuildInstruct + { + protected: + const ProcPatt* subPattern; + + }; + + + class DoAttach : public BuildInstruct + { + public: + const Proc* nodes; + + /** identifying the point where the nodes should be attached */ + const string point; + + }; + + + +} // namespace asset +#endif diff --git a/src/proc/asset/compoundmedia.cpp b/src/proc/asset/compoundmedia.cpp new file mode 100644 index 000000000..5cabaee22 --- /dev/null +++ b/src/proc/asset/compoundmedia.cpp @@ -0,0 +1,33 @@ +/* + CompoundMedia - multichannel media + + Copyright (C) CinelerraCV + 2007, Christian Thaeter + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +* *****************************************************/ + + +#include "proc/asset/compoundmedia.hpp" + +namespace asset + { + + /** */ + + + +} // namespace asset diff --git a/src/proc/asset/compoundmedia.hpp b/src/proc/asset/compoundmedia.hpp new file mode 100644 index 000000000..62e4f4de0 --- /dev/null +++ b/src/proc/asset/compoundmedia.hpp @@ -0,0 +1,54 @@ +/* + COMPOUNDMEDIA.hpp - multichannel media + + Copyright (C) CinelerraCV + 2007, Christian Thaeter + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the 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 ASSET_COMPOUNDMEDIA_H +#define ASSET_COMPOUNDMEDIA_H + +#include "proc/asset/media.hpp" + +#include + +using std::vector; + + + +namespace asset + { + + + /** + * compound of several elementary media tracks, + * e.g. the individual media streams found in one media file + */ + class CompoundMedia : public Media + { + protected: + /** elementary media assets comprising this compound */ + vector tracks; + + }; + + + +} // namespace asset +#endif diff --git a/src/proc/asset/procpatt.cpp b/src/proc/asset/procpatt.cpp new file mode 100644 index 000000000..e1404e028 --- /dev/null +++ b/src/proc/asset/procpatt.cpp @@ -0,0 +1,34 @@ +/* + ProcPatt - template for building some render processing network + + Copyright (C) CinelerraCV + 2007, Christian Thaeter + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +* *****************************************************/ + + +#include "proc/asset/procpatt.hpp" +#include "proc/asset/buildinstruct.hpp" + +namespace asset + { + + /** */ + + + +} // namespace asset diff --git a/src/proc/asset/procpatt.hpp b/src/proc/asset/procpatt.hpp new file mode 100644 index 000000000..9cf9db9d7 --- /dev/null +++ b/src/proc/asset/procpatt.hpp @@ -0,0 +1,56 @@ +/* + PROCPATT.hpp - template for building some render processing network + + Copyright (C) CinelerraCV + 2007, Christian Thaeter + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the 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 ASSET_PROCPATT_H +#define ASSET_PROCPATT_H + +#include "proc/asset/struct.hpp" + +#include + +using std::vector; + + + +namespace asset + { + + class BuildInstruct; + + + /** + * special type of structural Asset + * representing information how to build some part + * of the render engine's processing nodes network. + */ + class ProcPatt : public Struct + { + protected: + const vector instructions; + + }; + + + +} // namespace asset +#endif diff --git a/src/proc/mobject/session/compoundclip.cpp b/src/proc/mobject/session/compoundclip.cpp new file mode 100644 index 000000000..e5bea5744 --- /dev/null +++ b/src/proc/mobject/session/compoundclip.cpp @@ -0,0 +1,38 @@ +/* + CompoundClip - compound of several clips (multichannel) + + Copyright (C) CinelerraCV + 2007, Christian Thaeter + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +* *****************************************************/ + + +#include "proc/mobject/session/compoundclip.hpp" + +namespace mobject + { + + namespace session + { + + /** */ + + + + } // namespace mobject::session + +} // namespace mobject diff --git a/src/proc/mobject/session/compoundclip.hpp b/src/proc/mobject/session/compoundclip.hpp new file mode 100644 index 000000000..ee2fc5785 --- /dev/null +++ b/src/proc/mobject/session/compoundclip.hpp @@ -0,0 +1,53 @@ +/* + COMPOUNDCLIP.hpp - compound of several clips (multichannel) + + Copyright (C) CinelerraCV + 2007, Christian Thaeter + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + + +#ifndef MOBJECT_SESSION_COMPOUNDCLIP_H +#define MOBJECT_SESSION_COMPOUNDCLIP_H + +#include "proc/mobject/session/clip.hpp" + + + +namespace mobject + { + + namespace session + { + + + /** + * Clip MObject which is actually a compound of several elementary clips, + * e.g. the several streams found within multichannels media. + */ + class CompoundClip : public Clip + { + protected: + Clip* components; + + }; + + + } // namespace mobject::session + +} // namespace mobject +#endif diff --git a/src/proc/mobject/session/simpleclip.cpp b/src/proc/mobject/session/simpleclip.cpp new file mode 100644 index 000000000..0797ed1de --- /dev/null +++ b/src/proc/mobject/session/simpleclip.cpp @@ -0,0 +1,38 @@ +/* + SimpleClip - Elementary clip (single media stream only) + + Copyright (C) CinelerraCV + 2007, Christian Thaeter + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +* *****************************************************/ + + +#include "proc/mobject/session/simpleclip.hpp" + +namespace mobject + { + + namespace session + { + + /** */ + + + + } // namespace mobject::session + +} // namespace mobject diff --git a/src/proc/mobject/session/simpleclip.hpp b/src/proc/mobject/session/simpleclip.hpp new file mode 100644 index 000000000..f462eff94 --- /dev/null +++ b/src/proc/mobject/session/simpleclip.hpp @@ -0,0 +1,50 @@ +/* + SIMPLECLIP.hpp - Elementary clip (single media stream only) + + Copyright (C) CinelerraCV + 2007, Christian Thaeter + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + + +#ifndef MOBJECT_SESSION_SIMPLECLIP_H +#define MOBJECT_SESSION_SIMPLECLIP_H + +#include "proc/mobject/session/clip.hpp" + + + +namespace mobject + { + + namespace session + { + + + /** + * Elementary clip consisting of only one media stream + */ + class SimpleClip : public Clip + { + }; + + + + } // namespace mobject::session + +} // namespace mobject +#endif diff --git a/uml/cinelerra3/128133 b/uml/cinelerra3/128133 index 9e7642989..83eaacc4c 100644 --- a/uml/cinelerra3/128133 +++ b/uml/cinelerra3/128133 @@ -1,6 +1,6 @@ format 40 "Asset" // ProcessingLayer::Asset - revision 12 + revision 13 modified_by 5 "hiv" // class settings //class diagram settings @@ -433,7 +433,7 @@ ${inlines} classrelation 144261 // relation 142341 -_-> a default - cpp default "Generated" + cpp default "#include in header" classrelation_ref 144261 // b multiplicity "" parent class_ref 139525 // MediaAccessFacade end @@ -727,6 +727,7 @@ ${inlines} idl_decl "" explicit_switch_type "" + comment "special type of structural Asset representing information how to build some part of the render engine's processing nodes network." classrelation 143109 // relation 141189 ---|> a public @@ -781,26 +782,6 @@ ${inlines} comment "Implementation of the registry holding all Asset instances known to the Asset Manager subsystem. As of 8/2007 implemented by a hashtable." end - class 138885 "SimpleClip" - visibility package - cpp_decl "${comment}${template}class ${name}${inherit} - { -${members} }; -${inlines} -" - java_decl "" - idl_decl "" - explicit_switch_type "" - - classrelation 143365 // - relation 141445 ---|> - a public - cpp default "${type}" - classrelation_ref 143365 // - b multiplicity "" parent class_ref 128901 // Clip - end - end - class 139013 "BuildInstruct" visibility package cpp_decl "${comment}${template}class ${name}${inherit} @@ -812,6 +793,7 @@ ${inlines} idl_decl "" explicit_switch_type "" + comment "(Interface) building instructions to be executed by the Builder on the render node network under construction." end class 139141 "DoAttach" diff --git a/uml/cinelerra3/128261 b/uml/cinelerra3/128261 index 0e2183209..5addfc8e9 100644 --- a/uml/cinelerra3/128261 +++ b/uml/cinelerra3/128261 @@ -1,6 +1,6 @@ format 40 "MObject" // ProcessingLayer::MObject - revision 19 + revision 20 modified_by 5 "hiv" // class settings //class diagram settings @@ -426,6 +426,27 @@ ${inlines} end end + class 138885 "SimpleClip" + visibility package + cpp_decl "${comment}${template}class ${name}${inherit} + { +${members} }; +${inlines} +" + java_decl "" + idl_decl "" + explicit_switch_type "" + + comment "Elementary clip consisting of only one media stream" + classrelation 143365 // + relation 141445 ---|> + a public + cpp default "${type}" + classrelation_ref 143365 // + b multiplicity "" parent class_ref 128901 // Clip + end + end + class 138629 "CompoundClip" visibility package cpp_decl "${comment}${template}class ${name}${inherit} @@ -438,6 +459,8 @@ ${inlines} explicit_switch_type "" associated_diagram classdiagram_ref 128133 // Session structure + comment "Clip MObject which is actually a compound of several elementary clips, +e.g. the several streams found within multichannels media." classrelation 142597 // relation 140805 ---|> a public diff --git a/uml/cinelerra3/129541 b/uml/cinelerra3/129541 index 71af7ea97..17dbcb447 100644 --- a/uml/cinelerra3/129541 +++ b/uml/cinelerra3/129541 @@ -1,6 +1,6 @@ format 40 "backend" // design::codegen::backend - revision 5 + revision 6 modified_by 5 "hiv" // class settings //class diagram settings @@ -29,7 +29,7 @@ format 40 stereotype "src" cpp_h_dir "backend" cpp_src_dir "backend" - cpp_namespace "data" + cpp_namespace "backend_interface" comment "sourcecode package Data backend classes here..." @@ -37,5 +37,43 @@ Data backend classes here..." //deployment diagram settings package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default draw_component_as_icon default show_component_req_prov default show_component_rea default + artifact 138629 "mediaaccessfacade" + stereotype "source" + cpp_h "/* + ${NAME}.hpp - ${description} +@{CopyrightClaim}@{GPLHeader} +*/ + + +#ifndef ${NAMESPACE}_${NAME}_H +#define ${NAMESPACE}_${NAME}_H + +${includes} +${declarations} + + +${namespace_start} + +${definition} +${namespace_end} +#endif +" + cpp_src "/* + ${Name} - ${description} +@{CopyrightClaim}@{GPLHeader} +* *****************************************************/ + + +${includes} +${namespace_start} + + +${members} +${namespace_end}" + associated_classes + class_ref 139525 // MediaAccessFacade + end + comment "functions for querying media file and channels." + end end end diff --git a/uml/cinelerra3/130053 b/uml/cinelerra3/130053 index c61e1e94f..73baabcbc 100644 --- a/uml/cinelerra3/130053 +++ b/uml/cinelerra3/130053 @@ -1,6 +1,6 @@ format 40 "asset" // design::codegen::proc::asset - revision 6 + revision 7 modified_by 5 "hiv" // class settings //class diagram settings @@ -312,6 +312,46 @@ ${namespace_end}" comment "bookkeeping (asset) view of a media clip." end + artifact 138245 "compoundmedia" + stereotype "source" + cpp_h "/* + ${NAME}.hpp - ${description} +@{CopyrightClaim}@{GPLHeader} +*/ + + +#ifndef ${NAMESPACE}_${NAME}_H +#define ${NAMESPACE}_${NAME}_H + +${includes} +${declarations} + + +${namespace_start} + +${definition} +${namespace_end} +#endif +" + cpp_src "/* + ${Name} - ${description} +@{CopyrightClaim}@{GPLHeader} +* *****************************************************/ + + +${includes} +${namespace_start} + + +${members} +${namespace_end}" + associated_classes + class_ref 138501 // CompoundMedia + end + comment "a special clip as a compound of several elementary media tracks, +e.g. the individual media streams found in one media file" + end + artifact 136965 "preview" stereotype "source" cpp_h "/* @@ -546,6 +586,86 @@ ${namespace_end}" comment "structural asset holding the configuration of a track in the EDL" end + artifact 137989 "procpatt" + stereotype "source" + cpp_h "/* + ${NAME}.hpp - ${description} +@{CopyrightClaim}@{GPLHeader} +*/ + + +#ifndef ${NAMESPACE}_${NAME}_H +#define ${NAMESPACE}_${NAME}_H + +${includes} +${declarations} + + +${namespace_start} + +${definition} +${namespace_end} +#endif +" + cpp_src "/* + ${Name} - ${description} +@{CopyrightClaim}@{GPLHeader} +* *****************************************************/ + + +${includes} +${namespace_start} + + +${members} +${namespace_end}" + associated_classes + class_ref 138757 // ProcPatt + end + comment "template for building some render processing network" + end + + artifact 138117 "buildinstruct" + stereotype "source" + cpp_h "/* + ${NAME}.hpp - ${description} +@{CopyrightClaim}@{GPLHeader} +*/ + + +#ifndef ${NAMESPACE}_${NAME}_H +#define ${NAMESPACE}_${NAME}_H + +${includes} +${declarations} + + +${namespace_start} + +${definition} +${namespace_end} +#endif +" + cpp_src "/* + ${Name} - ${description} +@{CopyrightClaim}@{GPLHeader} +* *****************************************************/ + + +${includes} +${namespace_start} + + +${members} +${namespace_end}" + associated_classes + class_ref 139013 // BuildInstruct + class_ref 139269 // DoRecurse + class_ref 139141 // DoAttach + end + comment "Instructions for building some configuration of render nodes." + end + artifact 137861 "db" stereotype "source" cpp_h "/* diff --git a/uml/cinelerra3/130437 b/uml/cinelerra3/130437 index d1f52243d..734633b1d 100644 --- a/uml/cinelerra3/130437 +++ b/uml/cinelerra3/130437 @@ -1,6 +1,6 @@ format 40 "session" // design::codegen::proc::mobject::session - revision 6 + revision 7 modified_by 5 "hiv" // class settings //class diagram settings @@ -316,6 +316,84 @@ ${namespace_end}" comment "a Media Clip" end + artifact 138373 "simpleclip" + stereotype "source" + cpp_h "/* + ${NAME}.hpp - ${description} +@{CopyrightClaim}@{GPLHeader} +*/ + + +#ifndef ${NAMESPACE}_${NAME}_H +#define ${NAMESPACE}_${NAME}_H + +${includes} +${declarations} + + +${namespace_start} + +${definition} +${namespace_end} +#endif +" + cpp_src "/* + ${Name} - ${description} +@{CopyrightClaim}@{GPLHeader} +* *****************************************************/ + + +${includes} +${namespace_start} + + +${members} +${namespace_end}" + associated_classes + class_ref 138885 // SimpleClip + end + comment "Elementary clip (single media stream only)" + end + + artifact 138501 "compoundclip" + stereotype "source" + cpp_h "/* + ${NAME}.hpp - ${description} +@{CopyrightClaim}@{GPLHeader} +*/ + + +#ifndef ${NAMESPACE}_${NAME}_H +#define ${NAMESPACE}_${NAME}_H + +${includes} +${declarations} + + +${namespace_start} + +${definition} +${namespace_end} +#endif +" + cpp_src "/* + ${Name} - ${description} +@{CopyrightClaim}@{GPLHeader} +* *****************************************************/ + + +${includes} +${namespace_start} + + +${members} +${namespace_end}" + associated_classes + class_ref 138629 // CompoundClip + end + comment "compound of several clips (multichannel)" + end + artifact 129541 "effect" stereotype "source" cpp_h "/* diff --git a/uml/cinelerra3/130437.diagram b/uml/cinelerra3/130437.diagram index afc8cb1fb..2388a38ee 100644 --- a/uml/cinelerra3/130437.diagram +++ b/uml/cinelerra3/130437.diagram @@ -221,7 +221,7 @@ relationcanvas 140549 relation_ref 141573 // multiplicity_a_pos 160 260 3000 multiplicity_b_pos 142 268 3000 relationcanvas 140933 relation_ref 141701 // from ref 139013 z 1999 stereotype "<>" xyz 713 174 3000 to ref 140805 - role_a_pos 745 206 3000 no_role_b + role_a_pos 748 206 3000 no_role_b multiplicity_a_pos 712 206 3000 multiplicity_b_pos 733 164 3000 relationcanvas 141445 relation_ref 141829 // geometry VHV @@ -241,11 +241,11 @@ relationcanvas 142213 relation_ref 142085 // from ref 141317 z 1999 to point 812 270 line 142341 z 1999 to point 812 131 line 142469 z 1999 to ref 139013 - role_a_pos 780 159 3000 no_role_b + role_a_pos 794 109 3000 no_role_b multiplicity_a_pos 794 142 3000 multiplicity_b_pos 794 299 3000 relationcanvas 142597 relation_ref 142213 // from ref 141189 z 1999 stereotype "<>" xyz 656 360 3000 to ref 141061 - role_a_pos 643 374 3000 no_role_b + role_a_pos 650 367 3000 no_role_b multiplicity_a_pos 614 367 3000 no_multiplicity_b relationcanvas 142853 relation_ref 139269 // from ref 142725 z 1999 to ref 141061 diff --git a/uml/cinelerra3/5.session b/uml/cinelerra3/5.session index 15afb5ad6..b6381c7cf 100644 --- a/uml/cinelerra3/5.session +++ b/uml/cinelerra3/5.session @@ -16,8 +16,7 @@ open package_ref 128005 // design classview_ref 128901 // Assets - classview_ref 128133 // Engine Workings + classview_ref 128005 // Session classview_ref 129029 // Interface - componentview_ref 128266 // FileMapping end end