diff --git a/uml/cinelerra3/10.session b/uml/cinelerra3/10.session index 8cbd84327..a137f00a6 100644 --- a/uml/cinelerra3/10.session +++ b/uml/cinelerra3/10.session @@ -1,19 +1,18 @@ window_sizes 1274 775 300 964 633 60 diagrams active classdiagram_ref 128181 // File Mapping - 964 633 81 4 0 0 + 964 633 68 4 0 0 end show_stereotypes open + package_ref 128645 // codegen + package_ref 129285 // ProcessingLayer - class_ref 128437 // FileMapCache + class_ref 128181 // File class_ref 128693 // FileHandle + class_ref 129333 // FileProvider class_ref 128225 // FrameReference class_ref 128778 // FileReference - classview_ref 128645 // Service Components - class_ref 128266 // Condition - class_ref 128394 // Mutex - class_ref 128906 // SmartPointer end end diff --git a/uml/cinelerra3/128138 b/uml/cinelerra3/128138 index 525ce02c1..a7342a713 100644 --- a/uml/cinelerra3/128138 +++ b/uml/cinelerra3/128138 @@ -1,6 +1,6 @@ format 38 "design" // BackendLayer::design - revision 3 + revision 6 modified_by 10 "ct" // class settings //class diagram settings @@ -76,9 +76,10 @@ ${inlines} operation 128181 "getFrame" public return_type class_ref 128821 // Frame - nparams 2 + nparams 3 param in name "" type class_ref 128949 // FrameDescriptor param in name "frame_address" explicit_type "" + param in name "mode" explicit_type "" cpp_decl " ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}${abstract}; " cpp_def "${comment}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${throw}${staticnl}{ @@ -86,6 +87,7 @@ ${inlines} " + comment "mode = READ, WRITE, ..." end classrelation 128225 // handle () @@ -109,10 +111,6 @@ ${inlines} association_explicit_type "index" end - classrelation 128266 // - relation_ref 128138 // - end - classrelation 129162 // relation_ref 128778 // end @@ -304,10 +302,6 @@ ${inlines} classrelation_ref 129505 // end - classrelation 129889 // - relation_ref 129249 // - end - classrelation 128522 // mapping () relation_ref 128266 // end @@ -357,11 +351,6 @@ ${inlines} end - sequencediagram 128437 "QueryFrame" - show_full_operations_definition default write_horizontally default drawing_language default draw_all_relations default shadow default - size A4 - end - class 129333 "FileProvider" visibility package cpp_decl "${comment}${template}class ${name}${inherit} { @@ -384,6 +373,35 @@ ${inlines} " classrelation_ref 129162 // end + + operation 128010 "useFile" + public return_type class_ref 128778 // FileReference + nparams 2 + param in name "name" explicit_type "string" + param in name "mode" explicit_type "" + cpp_decl " ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}${abstract}; +" + cpp_def "${comment}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${throw}${staticnl}{ + ${body}} +" + + + comment "Announces that the application intends to use this file with mode (READ|WRITE|READWRITE)" + end + + operation 128138 "useTemporaryStorage" + public return_type class_ref 128778 // FileReference + nparams 1 + param in name "type" type class_ref 128949 // FrameDescriptor + cpp_decl " ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}${abstract}; +" + cpp_def "${comment}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${throw}${staticnl}{ + ${body}} +" + + + comment "Provides a pool for interminate frames" + end end class 128225 "FrameReference" @@ -396,17 +414,14 @@ ${inlines} idl_decl "" explicit_switch_type "" - classrelation 129761 // frame () - relation 129249 o--- + classrelation 129761 // frame () + relation 129249 ---> a role_name "frame" multiplicity "0..1" protected comment "maybe weak reference" cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; " - classrelation_ref 129761 // frame () - b role_name "" multiplicity "" protected - cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; -" - classrelation_ref 129889 // + classrelation_ref 129761 // frame () + b multiplicity "" parent class_ref 128821 // Frame end classrelation 128906 // @@ -428,16 +443,13 @@ ${inlines} idl_decl "" explicit_switch_type "" - classrelation 128138 // - relation 128138 o--- - a role_name "" multiplicity "" protected + classrelation 128138 // file () + relation 128138 ---> + a role_name "file" multiplicity "0..1" protected cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; " - classrelation_ref 128138 // - b role_name "" multiplicity "" protected - cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; -" - classrelation_ref 128266 // + classrelation_ref 128138 // file () + b multiplicity "" parent class_ref 128181 // File end classrelation 128778 // @@ -447,7 +459,10 @@ ${inlines} classrelation_ref 128778 // b multiplicity "" parent class_ref 128906 // SmartPointer end + end + activity 128010 "get frame" + end end end diff --git a/uml/cinelerra3/128181.diagram b/uml/cinelerra3/128181.diagram index 78856668d..dbe8a49a4 100644 --- a/uml/cinelerra3/128181.diagram +++ b/uml/cinelerra3/128181.diagram @@ -2,79 +2,79 @@ format 38 classcanvas 128010 class_ref 128778 // FileReference 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 56 201 2000 + xyz 57 287 2000 end classcanvas 128053 class_ref 128181 // File 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 289 193 2000 + xyz 289 278 2000 end classcanvas 128181 class_ref 128309 // FileHandleCache 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 60 2000 + xyz 482 146 2000 end classcanvas 128309 class_ref 128437 // FileMapCache 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 664 316 2000 + xyz 662 397 2000 end classcanvas 128394 class_ref 128906 // SmartPointer 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 279 316 3005 + xyz 280 402 3005 end classcanvas 128565 class_ref 128565 // FileMap 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 509 315 2000 + xyz 510 401 2000 end classcanvas 128693 class_ref 128693 // FileHandle 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 507 202 2000 + xyz 508 287 2000 end classcanvas 128821 class_ref 128821 // Frame 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 515 463 2000 + xyz 516 549 2000 end classcanvas 128949 class_ref 128949 // FrameDescriptor 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 269 621 2000 + xyz 270 707 2000 end classcanvas 129461 class_ref 129333 // FileProvider 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 285 70 2005 + xyz 246 85 2005 end fragment 129589 "public interfaces" - xyzwh 240 24 1995 184 700 + xyzwh 232 6 1995 198 803 end fragment 129717 "implementation details" - xyzwh 432 20 1995 398 703 + xyzwh 437 5 1995 391 805 end fragment 131338 "References hold by others" - xyzwh 6 23 1990 227 700 + xyzwh 1 7 1990 225 802 end classcanvas 131553 class_ref 128225 // FrameReference 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 50 462 2000 + xyz 48 549 2000 end -relationcanvas 128138 relation_ref 128138 // +relationcanvas 128138 relation_ref 128138 // from ref 128010 z 1999 to ref 128053 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b + role_a_pos 251 279 3000 no_role_b + multiplicity_a_pos 246 321 3000 no_multiplicity_b relationcanvas 128266 relation_ref 128266 // from ref 128565 z 1999 to ref 128821 - role_a_pos 544 439 3000 role_b_pos 545 370 3000 - multiplicity_a_pos 531 438 3000 multiplicity_b_pos 528 370 3000 + role_a_pos 545 525 3000 role_b_pos 545 455 3000 + multiplicity_a_pos 532 524 3000 multiplicity_b_pos 529 455 3000 relationcanvas 128353 relation_ref 128225 // from ref 128053 z 1999 to ref 128693 - role_a_pos 456 196 3000 no_role_b - multiplicity_a_pos 478 235 3000 no_multiplicity_b + role_a_pos 442 279 3000 no_role_b + multiplicity_a_pos 463 321 3000 no_multiplicity_b relationcanvas 128481 relation_ref 128353 // geometry HVr - from ref 128821 z 1999 to point 540 655 + from ref 128821 z 1999 to point 541 741 line 131978 z 1999 to ref 128949 - role_a_pos 396 628 3000 no_role_b + role_a_pos 396 714 3000 no_role_b no_multiplicity_a no_multiplicity_b relationcanvas 128609 relation_ref 128481 // from ref 128053 z 1999 to ref 128565 - role_a_pos 430 298 3000 no_role_b - multiplicity_a_pos 493 338 3000 no_multiplicity_b + role_a_pos 424 382 3000 no_role_b + multiplicity_a_pos 488 424 3000 no_multiplicity_b relationcanvas 128650 relation_ref 128522 // from ref 128010 z 1999 to ref 128394 no_role_a no_role_b @@ -84,27 +84,27 @@ relationcanvas 129034 relation_ref 128650 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b relationcanvas 129121 relation_ref 128609 // - from ref 128181 z 1999 stereotype "<>" xyz 523 143 3000 to ref 128693 - role_a_pos 552 174 3000 no_role_b - multiplicity_a_pos 538 174 3000 no_multiplicity_b + from ref 128181 z 1999 stereotype "<>" xyz 523 229 3000 to ref 128693 + role_a_pos 552 259 3000 no_role_b + multiplicity_a_pos 539 259 3000 no_multiplicity_b relationcanvas 129290 relation_ref 128778 // from ref 129461 z 1999 to ref 128053 - role_a_pos 336 165 3000 no_role_b - multiplicity_a_pos 321 165 3000 no_multiplicity_b + role_a_pos 347 246 3000 no_role_b + multiplicity_a_pos 311 246 3000 no_multiplicity_b relationcanvas 129930 relation_ref 128906 // - from ref 128309 z 1999 stereotype "<>" xyz 722 290 3000 to point 715 275 - line 130314 z 1999 to point 642 275 + from ref 128309 z 1999 stereotype "<>" xyz 719 372 3000 to point 714 361 + line 130314 z 1999 to point 643 361 line 130058 z 1999 to ref 128565 - role_a_pos 637 252 3000 no_role_b - multiplicity_a_pos 574 296 3000 no_multiplicity_b + role_a_pos 638 337 3000 no_role_b + multiplicity_a_pos 575 381 3000 no_multiplicity_b relationcanvas 131425 relation_ref 129121 // - from ref 128309 z 1999 to point 716 387 - line 130186 z 1999 stereotype "<>" xyz 721 369 3000 to point 643 387 + from ref 128309 z 1999 to point 714 473 + line 130186 z 1999 stereotype "<>" xyz 720 455 3000 to point 644 473 line 130570 z 1999 to ref 128565 - role_a_pos 651 391 3000 no_role_b - multiplicity_a_pos 573 354 3000 no_multiplicity_b -relationcanvas 131681 relation_ref 129249 // + role_a_pos 649 483 3000 no_role_b + multiplicity_a_pos 573 440 3000 no_multiplicity_b +relationcanvas 131681 relation_ref 129249 // from ref 131553 z 1999 to ref 128821 - role_a_pos 471 457 3000 no_role_b - multiplicity_a_pos 485 496 3000 no_multiplicity_b + role_a_pos 459 542 3000 no_role_b + multiplicity_a_pos 473 584 3000 no_multiplicity_b end diff --git a/uml/cinelerra3/128437.diagram b/uml/cinelerra3/128437.diagram deleted file mode 100644 index 1c61b8251..000000000 --- a/uml/cinelerra3/128437.diagram +++ /dev/null @@ -1,3 +0,0 @@ -format 38 - -end diff --git a/uml/cinelerra3/128901 b/uml/cinelerra3/128901 index 5e78dff58..830d7e1de 100644 --- a/uml/cinelerra3/128901 +++ b/uml/cinelerra3/128901 @@ -1,7 +1,7 @@ format 38 "Builder" // ProcessingLayer::MObject::Builder - revision 7 - modified_by 5 "hiv" + revision 9 + modified_by 10 "ct" // 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 diff --git a/uml/cinelerra3/cinelerra3.prj b/uml/cinelerra3/cinelerra3.prj index cb174d0d8..9f547a2ac 100644 --- a/uml/cinelerra3/cinelerra3.prj +++ b/uml/cinelerra3/cinelerra3.prj @@ -1,6 +1,6 @@ format 38 "cinelerra3" - revision 14 + revision 16 modified_by 10 "ct" cpp_root_dir "../../src/"