When creating layout transition subtype menu, set the transition name explicitly so it doesn't fall back to instantiating an actual LayoutSource and creating a bunch of audio engines.

Dealloc transition menu when it closes
This commit is contained in:
Zakk 2019-05-26 17:26:36 -04:00
parent b69f46ac8a
commit cbf6f41f03
4 changed files with 9 additions and 3 deletions

View file

@ -35,7 +35,6 @@
340FE50815F444AA00E4CE4E /* CaptureController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FE50715F444AA00E4CE4E /* CaptureController.m */; };
3410FEAF205EF80800C5F8C2 /* CSTransitionCIFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 3410FEAE205EF80800C5F8C2 /* CSTransitionCIFilter.m */; };
3410FECB205FFB6300C5F8C2 /* CSTransitionLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 3410FECA205FFB6300C5F8C2 /* CSTransitionLayout.m */; };
3414047D1D76EA3200505A5D /* CSSyphonCapturePlugin.bundle in Copy Files */ = {isa = PBXBuildFile; fileRef = 34AFC26819B05B7C0007C07B /* CSSyphonCapturePlugin.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3414C6AE1CBB9EBF00107C69 /* CSIRCompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = 3414C6AD1CBB9EBF00107C69 /* CSIRCompressor.m */; };
3415CED31AE257DA002F11F5 /* CSTextCaptureBaseView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3415CED21AE257DA002F11F5 /* CSTextCaptureBaseView.xib */; };
34210B3E1606001200362FC8 /* OutputDestination.m in Sources */ = {isa = PBXBuildFile; fileRef = 34210B3D1606001100362FC8 /* OutputDestination.m */; };
@ -606,7 +605,6 @@
34BE2B5D201527CE00E37382 /* CSNewTekNDIStreamServicePlugin.bundle in Copy Files */,
3483599E2010807B00E711AF /* CSNDICapturePlugin.bundle in Copy Files */,
345BECE51F3DB4F000B46F29 /* CSLayoutCapturePlugin.bundle in Copy Files */,
3414047D1D76EA3200505A5D /* CSSyphonCapturePlugin.bundle in Copy Files */,
3473D2871D4C359700842EEE /* CSVaughnliveStreamServicePlugin.bundle in Copy Files */,
340C802D1D450A5100B2FD7D /* CSYoutubeStreamServicePlugin.bundle in Copy Files */,
343C79ED1D0C796E00B36EEC /* CSFFMpegCapturePlugin.bundle in Copy Files */,

View file

@ -7,7 +7,7 @@
#import "CSViewController.h"
@interface CSTransitionSwitcherView : CSViewController <NSCollectionViewDelegate>
@interface CSTransitionSwitcherView : CSViewController <NSCollectionViewDelegate, NSMenuDelegate>
{
NSMenu *_transitionsMenu;
}

View file

@ -65,9 +65,16 @@
-(void)menuDidClose:(NSMenu *)menu
{
_transitionsMenu = nil;
}
-(void)buildTransitionMenu
{
_transitionsMenu = [[NSMenu alloc] init];
_transitionsMenu.delegate = self;
NSArray *transitionClasses = @[CSTransitionCA.class, CSTransitionCIFilter.class,CSTransitionLayout.class, CSTransitionImageFilter.class, CSTransitionScript.class];

View file

@ -75,6 +75,7 @@
CSTransitionLayout *newTransition = [[CSTransitionLayout alloc] init];
newTransition.name = layout.name;
newTransition.layout = layout;
[ret addObject:newTransition];
}