diff --git a/uml/cinelerra3/10.session b/uml/cinelerra3/10.session index 3452ee2e9..f80e2d5e0 100644 --- a/uml/cinelerra3/10.session +++ b/uml/cinelerra3/10.session @@ -1,9 +1,21 @@ -window_sizes 1274 775 300 964 533 160 +window_sizes 1274 775 300 964 633 60 +diagrams + active classdiagram_ref 128181 // File Mapping + 964 633 100 4 105 0 +end show_stereotypes open - package_ref 129157 // BackendLayer - - package_ref 128517 // CommonLib + package_ref 129285 // ProcessingLayer + class_ref 131205 // FrameProvider + class_ref 128437 // FileMapCache + class_ref 128693 // FileHandle + class_ref 128225 // FrameReference + class_ref 128778 // FileReference + class_ref 129034 // FrameHandle + 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 02ab16d14..44d706564 100644 --- a/uml/cinelerra3/128138 +++ b/uml/cinelerra3/128138 @@ -1,6 +1,6 @@ format 38 "design" // BackendLayer::design - revision 1 + revision 3 modified_by 10 "ct" // class settings //class diagram settings @@ -83,6 +83,7 @@ ${members}}; classdiagram 128181 "File Mapping" 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 + comment "Shows whats used to access Frames" size A4 end @@ -145,6 +146,14 @@ ${inlines} b multiplicity "" parent class_ref 128565 // FileMap association_explicit_type "index" end + + classrelation 128266 // + relation_ref 128138 // + end + + classrelation 129162 // + relation_ref 128778 // + end end class 128309 "FileHandleCache" @@ -157,17 +166,14 @@ ${inlines} idl_decl "" explicit_switch_type "" - classrelation 128737 // handles () - relation 128609 *--- + classrelation 128737 // handles () + relation 128609 *--> stereotype "list" a role_name "handles" multiplicity "*" protected - cpp default " ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value}; + cpp default " ${comment}${static}${mutable}${volatile}${const}${stereotype}<${type}> ${name}${value}; " - classrelation_ref 128737 // handles () - b role_name "" multiplicity "" protected - cpp default " ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value}; -" - classrelation_ref 128865 // + classrelation_ref 128737 // handles () + b multiplicity "" parent class_ref 128693 // FileHandle end attribute 128225 "handles_available" @@ -192,34 +198,29 @@ ${inlines} idl_decl "" explicit_switch_type "" - attribute 128481 "checked_out" - protected explicit_type "list" - cpp_decl " ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value}; -" - java_decl "" - idl_decl "" - end - classrelation 129505 // relation_ref 128993 // end - attribute 128609 "checked_in" - protected explicit_type "list" - cpp_decl " ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value}; -" - java_decl "" - idl_decl "" - end - - classrelation 129633 // + classrelation 129633 // checked_in () relation 129121 *--> stereotype "list" - a role_name "" multiplicity "" protected - comment "FileMap objects are moved (spliced) between the checked_in and checked_out lists depending if they are in use or subject of cache aging" + a role_name "checked_in" multiplicity "*" protected + comment "checked_in objects are subject of cache aging and must be not in use" cpp default " ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value}; " - classrelation_ref 129633 // + classrelation_ref 129633 // checked_in () + b multiplicity "" parent class_ref 128565 // FileMap + end + + classrelation 129290 // checked_out () + relation 128906 *--> + stereotype "list" + a role_name "checked_out" multiplicity "*" protected + comment "this list keeps all mappings which are in use, and thus prevents them from Cache aging" + cpp default " ${comment}${static}${mutable}${volatile}${const}${stereotype}<${type}> ${name}${value}; +" + classrelation_ref 129290 // checked_out () b multiplicity "" parent class_ref 128565 // FileMap end end @@ -235,6 +236,17 @@ ${inlines} explicit_switch_type "" associated_diagram classdiagram_ref 128181 // File Mapping + classrelation 128394 // frames () + relation 128266 o--- + a role_name "frames" multiplicity "*" private + cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; +" + classrelation_ref 128394 // frames () + b role_name "mapping" multiplicity "1" private + cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; +" + classrelation_ref 128522 // mapping () + end end class 128693 "FileHandle" @@ -247,9 +259,6 @@ ${inlines} idl_decl "" explicit_switch_type "" - classrelation 128865 // - relation_ref 128609 // - end end class 128821 "Frame" @@ -321,16 +330,6 @@ ${inlines} b multiplicity "" parent class_ref 128949 // FrameDescriptor end - classrelation 129249 // mapping () - relation 128865 ---> - a role_name "mapping" multiplicity "1" private - comment "Frames are a continous sequence in a mapping" - cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; -" - classrelation_ref 129249 // mapping () - b multiplicity "" parent class_ref 128565 // FileMap - end - classrelation 129377 // relation 128993 ---- a role_name "" multiplicity "" protected @@ -346,6 +345,10 @@ ${inlines} classrelation 129889 // relation_ref 129249 // end + + classrelation 128522 // mapping () + relation_ref 128266 // + end end class 128949 "FrameDescriptor" @@ -408,6 +411,17 @@ ${inlines} explicit_switch_type "" comment "This is the Factory for Files, whenever something wants to use some file (or temporary storage), This Factory will hand out some smart/shared pointer to a File object which will be used to retrieve Frames." + classrelation 129034 // files () + relation 128778 o--- + a role_name "files" multiplicity "*" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; +" + classrelation_ref 129034 // files () + b role_name "" multiplicity "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; +" + classrelation_ref 129162 // + end end class 128225 "FrameReference" @@ -432,6 +446,46 @@ ${inlines} " classrelation_ref 129889 // end + + classrelation 128906 // + relation 128650 -_-|> + a public + cpp default "${type}" + classrelation_ref 128906 // + b multiplicity "" parent class_ref 128906 // SmartPointer + end end + + class 128778 "FileReference" + visibility package + cpp_decl "${comment}${template}class ${name}${inherit} { +${members}}; +${inlines} +" + java_decl "" + idl_decl "" + explicit_switch_type "" + + classrelation 128138 // + relation 128138 o--- + a role_name "" multiplicity "" 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 // + end + + classrelation 128778 // + relation 128522 -_-|> + a public + cpp default "${type}" + classrelation_ref 128778 // + b multiplicity "" parent class_ref 128906 // SmartPointer + end + end + end end diff --git a/uml/cinelerra3/128181.diagram b/uml/cinelerra3/128181.diagram index cc94a2628..78856668d 100644 --- a/uml/cinelerra3/128181.diagram +++ b/uml/cinelerra3/128181.diagram @@ -1,82 +1,110 @@ 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 + 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 62 215 2000 + xyz 289 193 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 282 91 2000 + xyz 481 60 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 445 395 2000 + xyz 664 316 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 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 463 298 2000 + xyz 509 315 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 308 188 2000 + xyz 507 202 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 297 390 2000 + xyz 515 463 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 45 505 2000 - end -classcanvas 129077 class_ref 129077 // Prefetch - 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 689 242 2000 - end -classcanvas 129205 class_ref 129205 // Scheduler - 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 78 2000 + xyz 269 621 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 61 105 2005 + xyz 285 70 2005 end fragment 129589 "public interfaces" - xyzwh 23 26 1995 177 567 + xyzwh 240 24 1995 184 700 end fragment 129717 "implementation details" - xyzwh 227 26 1995 605 567 + xyzwh 432 20 1995 398 703 +end +fragment 131338 "References hold by others" + xyzwh 6 23 1990 227 700 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 49 348 2000 + xyz 50 462 2000 end +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 +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 relationcanvas 128353 relation_ref 128225 // from ref 128053 z 1999 to ref 128693 - role_a_pos 157 209 3000 no_role_b - multiplicity_a_pos 277 225 3000 no_multiplicity_b + role_a_pos 456 196 3000 no_role_b + multiplicity_a_pos 478 235 3000 no_multiplicity_b relationcanvas 128481 relation_ref 128353 // - from ref 128821 z 1999 to ref 128949 - role_a_pos 167 474 3000 no_role_b + geometry HVr + from ref 128821 z 1999 to point 540 655 + line 131978 z 1999 to ref 128949 + role_a_pos 396 628 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 390 288 3000 no_role_b - multiplicity_a_pos 451 325 3000 no_multiplicity_b -relationcanvas 129121 relation_ref 128609 // - from ref 128181 z 1999 stereotype "<>" xyz 323 170 3000 to ref 128693 - role_a_pos 356 161 3000 no_role_b - multiplicity_a_pos 336 161 3000 no_multiplicity_b -relationcanvas 129889 relation_ref 128865 // - from ref 128821 z 1999 to ref 128565 - role_a_pos 398 303 3000 no_role_b - multiplicity_a_pos 448 340 3000 no_multiplicity_b -relationcanvas 131425 relation_ref 129121 // - from ref 128309 z 1999 stereotype "<>" xyz 470 369 3000 to ref 128565 + role_a_pos 430 298 3000 no_role_b + multiplicity_a_pos 493 338 3000 no_multiplicity_b +relationcanvas 128650 relation_ref 128522 // + from ref 128010 z 1999 to ref 128394 no_role_a no_role_b no_multiplicity_a no_multiplicity_b +relationcanvas 129034 relation_ref 128650 // + from ref 131553 z 1999 to ref 128394 + 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 +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 +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 + 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 +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 + 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 // - from ref 131553 z 1999 to point 235 393 - line 132065 z 1999 to ref 128821 - role_a_pos 182 388 3000 no_role_b - multiplicity_a_pos 269 377 3000 no_multiplicity_b + 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 end diff --git a/uml/cinelerra3/128517 b/uml/cinelerra3/128517 index 0a47bb34f..3357e104a 100644 --- a/uml/cinelerra3/128517 +++ b/uml/cinelerra3/128517 @@ -138,4 +138,38 @@ ${inlines} end end end + + classview 128266 "SmartPointers" + //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 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 + + class 128906 "SmartPointer" + abstract visibility package stereotype "auxiliary" + cpp_decl "${comment}${template}class ${name}${inherit} { +${members}}; +${inlines} +" + java_decl "${comment}${@}${visibility}${final}${abstract}class ${name}${extends}${implements} { +${members}} +" + idl_decl "${comment}${abstract}${custom}valuetype ${name}${inherit} { +${members}}; +" + explicit_switch_type "" + + end + end end diff --git a/uml/cinelerra3/129157 b/uml/cinelerra3/129157 index adbe5462a..10e4a87d1 100644 --- a/uml/cinelerra3/129157 +++ b/uml/cinelerra3/129157 @@ -27,4 +27,16 @@ format 38 show_infonote default drawing_language default package_ref 128138 // design + + componentview 128138 "Cache" + //component diagram settings + package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default + draw_component_as_icon default show_component_req_prov default show_component_rea default + end + + componentview 128266 "FileMapping" + //component diagram settings + package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default + draw_component_as_icon default show_component_req_prov default show_component_rea default + end end