AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AudioSubmix reference fix; macOS window icon

This commit is contained in:
Jack Andersen 2018-01-13 20:37:17 -10:00
parent cbfd4ddad0
commit 5d310c008f
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/audiodev/AudioVoice.cpp
View File

@ -169,7 +169,7 @@ size_t AudioVoiceMono::_pumpAndMix(size_t frames)
} }
else else
{ {
AudioSubmix& smx = reinterpret_cast<AudioSubmix&>(m_head->m_mainSubmix); AudioSubmix& smx = *m_head->m_mainSubmix;
m_cb->routeAudio(oDone, 1, dt, m_head->m_mainSubmix->m_busId, scratchPre.data(), scratchPost.data()); m_cb->routeAudio(oDone, 1, dt, m_head->m_mainSubmix->m_busId, scratchPre.data(), scratchPost.data());
DefaultMonoMtx.mixMonoSampleData(m_head->clientMixInfo(), scratchPost.data(), DefaultMonoMtx.mixMonoSampleData(m_head->clientMixInfo(), scratchPost.data(),
smx._getMergeBuf<T>(oDone), oDone); smx._getMergeBuf<T>(oDone), oDone);
@ -319,7 +319,7 @@ size_t AudioVoiceStereo::_pumpAndMix(size_t frames)
} }
else else
{ {
AudioSubmix& smx = reinterpret_cast<AudioSubmix&>(m_head->m_mainSubmix); AudioSubmix& smx = *m_head->m_mainSubmix;
m_cb->routeAudio(oDone, 2, dt, m_head->m_mainSubmix->m_busId, scratchPre.data(), scratchPost.data()); m_cb->routeAudio(oDone, 2, dt, m_head->m_mainSubmix->m_busId, scratchPre.data(), scratchPost.data());
DefaultStereoMtx.mixStereoSampleData(m_head->clientMixInfo(), scratchPost.data(), DefaultStereoMtx.mixStereoSampleData(m_head->clientMixInfo(), scratchPost.data(),
smx._getMergeBuf<T>(oDone), oDone); smx._getMergeBuf<T>(oDone), oDone);

14
lib/mac/WindowCocoa.mm
View File

@ -15,7 +15,7 @@
#endif #endif
namespace boo {class WindowCocoa; class GraphicsContextCocoa;} namespace boo {class WindowCocoa; class GraphicsContextCocoa;}
@interface WindowCocoaInternal : NSWindow @interface WindowCocoaInternal : NSWindow <NSWindowDelegate>
{ {
std::shared_ptr<boo::WindowCocoa> booWindow; std::shared_ptr<boo::WindowCocoa> booWindow;
id touchBarProvider; id touchBarProvider;
@ -1608,11 +1608,23 @@ std::shared_ptr<IWindow> _WindowCocoaNew(SystemStringView title, NSOpenGLContext
NSWindowStyleMaskResizable NSWindowStyleMaskResizable
backing:NSBackingStoreBuffered backing:NSBackingStoreBuffered
defer:YES]; defer:YES];
self.delegate = self;
self.releasedWhenClosed = NO; self.releasedWhenClosed = NO;
self.title = [NSString stringWithUTF8String:title.data()]; self.title = [NSString stringWithUTF8String:title.data()];
NSString* titleImgPath = [[NSBundle mainBundle] pathForResource:@"mainicon" ofType:@"icns"];
NSImage* titleImg = [[NSImage alloc] initByReferencingFile:titleImgPath];
[self setRepresentedURL:[NSURL URLWithString:@""]];
NSButton* iconButton = [self standardWindowButton:NSWindowDocumentIconButton];
[iconButton setImage:titleImg];
booWindow = bw; booWindow = bw;
return self; return self;
} }
- (BOOL)window:(NSWindow*)window shouldPopUpDocumentPathMenu:(NSMenu*)menu
{
return NO;
}
- (void)setFrameDefault - (void)setFrameDefault
{ {
[self setFrame:[self genFrameDefault] display:NO]; [self setFrame:[self genFrameDefault] display:NO];

2
logvisor

@ -1 +1 @@
Subproject commit f28fa0dbb2e59d02eb659542b28b13f8d1bfe4fb Subproject commit b89d18c47181371c7871f49751f5d657f02f1fd6