mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 15:11:37 +00:00
Prefixed all ivars with underscore
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14970 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer
parent
6c0cb17c64
commit
4f3eee6035
7 changed files with 410 additions and 521 deletions
15
ChangeLog
15
ChangeLog
|
|
@ -1,3 +1,18 @@
|
|||
2002-11-10 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Source/GSComboSupport.h
|
||||
* Source/GSComboSupport.m
|
||||
Removed files.
|
||||
* GNUmakefile
|
||||
Removed GSComboSupport.m
|
||||
* Source/NSComboBoxCell.m
|
||||
Moved all ComboBox code to here to make further changes easier.
|
||||
* Headers/gnustep/gui/NSSound.h:
|
||||
Prefixed all ivars with underscore
|
||||
* Source/NSSound.m
|
||||
Adopted to change in header and simplified [copyWithZone:] and
|
||||
[initWithCoder:].
|
||||
|
||||
2002-11-09 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/NSDocumentController.m: Don't try to store NSURL objects in
|
||||
|
|
|
|||
|
|
@ -41,21 +41,19 @@
|
|||
|
||||
@interface NSSound : NSObject <NSCoding, NSCopying>
|
||||
{
|
||||
id gsnd;
|
||||
|
||||
NSString *name;
|
||||
NSString *uniqueIdentifier;
|
||||
BOOL onlyReference;
|
||||
id delegate;
|
||||
NSString *_name;
|
||||
NSString *_uniqueIdentifier;
|
||||
BOOL _onlyReference;
|
||||
id _delegate;
|
||||
|
||||
long dataLocation;
|
||||
long dataSize;
|
||||
int dataFormat;
|
||||
float samplingRate;
|
||||
float frameSize;
|
||||
long frameCount;
|
||||
int channelCount;
|
||||
NSMutableData *data;
|
||||
NSData *_data;
|
||||
float _samplingRate;
|
||||
float _frameSize;
|
||||
long _dataLocation;
|
||||
long _dataSize;
|
||||
long _frameCount;
|
||||
int _channelCount;
|
||||
int _dataFormat;
|
||||
}
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -150,7 +150,6 @@ NSView.m \
|
|||
NSWindow.m \
|
||||
NSWindowController.m \
|
||||
NSWorkspace.m \
|
||||
GSComboSupport.m \
|
||||
GSDisplayServer.m \
|
||||
GSFusedSilica.m \
|
||||
GSFusedSilicaContext.m \
|
||||
|
|
|
|||
|
|
@ -1,59 +0,0 @@
|
|||
/*
|
||||
GSComboSupport.h
|
||||
|
||||
Copyright (C) 1999 Free Software Foundation, Inc.
|
||||
|
||||
Author: Gerrit van Dyk <gerritvd@decillion.net>
|
||||
Date: 1999
|
||||
|
||||
This file is part of the GNUstep GUI Library.
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
|
||||
This library 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
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with this library; see the file COPYING.LIB.
|
||||
If not, write to the Free Software Foundation,
|
||||
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef _GNUstep_H_GSComboSupport
|
||||
#define _GNUstep_H_GSComboSupport
|
||||
|
||||
#include <AppKit/NSWindow.h>
|
||||
|
||||
@class NSArray;
|
||||
@class NSBrowser;
|
||||
@class NSComboBoxCell;
|
||||
@class NSMatrix;
|
||||
|
||||
@interface GSComboWindow : NSWindow
|
||||
{
|
||||
NSBrowser *browser;
|
||||
|
||||
@private;
|
||||
NSArray *list;
|
||||
NSComboBoxCell *_cell;
|
||||
BOOL _stopped;
|
||||
}
|
||||
|
||||
+ (GSComboWindow *)defaultPopUp;
|
||||
|
||||
- (NSMatrix *)matrix;
|
||||
- (NSSize)popUpCellSizeForPopUp:(NSComboBoxCell *)aCell;
|
||||
- (void)popUpCell:(NSComboBoxCell *)aCell
|
||||
popUpAt:(NSPoint)aPoint
|
||||
width:(float)aWidth;
|
||||
- (void)runModalPopUp;
|
||||
- (void)runLoop;
|
||||
|
||||
@end
|
||||
|
||||
#endif /* _GNUstep_H_GSComboSupport */
|
||||
|
|
@ -1,301 +0,0 @@
|
|||
/*
|
||||
GSComboSupport.m
|
||||
|
||||
Copyright (C) 1999 Free Software Foundation, Inc.
|
||||
|
||||
Author: Gerrit van Dyk <gerritvd@decillion.net>
|
||||
Date: 1999
|
||||
|
||||
This file is part of the GNUstep GUI Library.
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
|
||||
This library 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
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with this library; see the file COPYING.LIB.
|
||||
If not, write to the Free Software Foundation,
|
||||
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#include <Foundation/NSString.h>
|
||||
#include <Foundation/NSArray.h>
|
||||
#include <Foundation/NSRunLoop.h>
|
||||
#include <Foundation/NSException.h>
|
||||
#include <Foundation/NSAutoreleasePool.h>
|
||||
#include <AppKit/NSApplication.h>
|
||||
#include <AppKit/NSBox.h>
|
||||
#include <AppKit/NSBrowser.h>
|
||||
#include <AppKit/NSBrowserCell.h>
|
||||
#include <AppKit/NSComboBox.h>
|
||||
#include <AppKit/NSComboBoxCell.h>
|
||||
#include <AppKit/NSMatrix.h>
|
||||
#include <AppKit/NSScroller.h>
|
||||
#include <AppKit/NSWindow.h>
|
||||
#include "GSComboSupport.h"
|
||||
|
||||
@implementation GSComboWindow
|
||||
|
||||
+ (GSComboWindow *) defaultPopUp
|
||||
{
|
||||
static GSComboWindow *gsWindow = nil;
|
||||
|
||||
if (!gsWindow)
|
||||
gsWindow = [[self alloc] initWithContentRect: NSMakeRect(0,0,100,100)
|
||||
styleMask: NSBorderlessWindowMask
|
||||
backing: NSBackingStoreNonretained //NSBackingStoreBuffered
|
||||
defer: YES];
|
||||
return gsWindow;
|
||||
}
|
||||
|
||||
- (id) initWithContentRect: (NSRect)contentRect
|
||||
styleMask: (unsigned int)aStyle
|
||||
backing: (NSBackingStoreType)bufferingType
|
||||
defer: (BOOL)flag
|
||||
{
|
||||
NSBox *box;
|
||||
|
||||
self = [super initWithContentRect: contentRect
|
||||
styleMask: aStyle
|
||||
backing: bufferingType
|
||||
defer: flag];
|
||||
box = [[NSBox alloc] initWithFrame: contentRect];
|
||||
[box setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
|
||||
[box setBorderType: NSLineBorder];
|
||||
[box setTitlePosition: NSNoTitle];
|
||||
[box setContentViewMargins: NSMakeSize(1,1)];
|
||||
[box sizeToFit];
|
||||
[self setContentView:box];
|
||||
RELEASE(box);
|
||||
browser = [[NSBrowser alloc] initWithFrame: contentRect];
|
||||
[browser setMaxVisibleColumns: 1];
|
||||
[browser setTitled: NO];
|
||||
[browser setHasHorizontalScroller: NO];
|
||||
[browser setTarget: self];
|
||||
[browser setAction: @selector(selectItem:)];
|
||||
[browser setDelegate: self];
|
||||
// [browser setRefusesFirstResponder: YES];
|
||||
[browser setAutoresizingMask: NSViewWidthSizable | NSViewWidthSizable];
|
||||
[browser setAllowsEmptySelection: NO];
|
||||
[browser setAllowsMultipleSelection: NO];
|
||||
[box setContentView: browser];
|
||||
RELEASE(browser);
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)dealloc
|
||||
{
|
||||
// Browser was not retained so don't release it
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
- (NSMatrix *) matrix { return [browser matrixInColumn:0]; }
|
||||
|
||||
- (NSSize) popUpCellSizeForPopUp: (NSComboBoxCell *)aCell
|
||||
{
|
||||
NSSize size;
|
||||
float itemHeight;
|
||||
float cellSpacing;
|
||||
|
||||
itemHeight = [aCell itemHeight];
|
||||
cellSpacing = [aCell intercellSpacing].height;
|
||||
|
||||
if (itemHeight <= 0)
|
||||
itemHeight = [[self matrix] cellSize].height;
|
||||
|
||||
if (cellSpacing <= 0)
|
||||
cellSpacing = [[self matrix] intercellSpacing].height;
|
||||
|
||||
size = NSMakeSize(2.0 + [NSScroller scrollerWidth] + 100.0,
|
||||
2.0 + (itemHeight * [aCell numberOfVisibleItems]) +
|
||||
(cellSpacing * [aCell numberOfVisibleItems]));
|
||||
size.height += 4.0;
|
||||
size.width += 4.0;
|
||||
|
||||
return size;
|
||||
}
|
||||
|
||||
- (void) popUpCell: (NSComboBoxCell *)aCell
|
||||
popUpAt: (NSPoint)aPoint
|
||||
width: (float)aWidth
|
||||
{
|
||||
NSRect rect;
|
||||
|
||||
rect.size = [self popUpCellSizeForPopUp: aCell];
|
||||
_cell = aCell;
|
||||
|
||||
rect.size.width = aWidth;
|
||||
rect.origin.x = aPoint.x;
|
||||
rect.origin.y = aPoint.y;
|
||||
[self setFrame: rect display: NO];
|
||||
|
||||
[browser loadColumnZero];
|
||||
|
||||
// [self enableKeyEquivalentForDefaultButtonCell];
|
||||
[self runModalPopUp];
|
||||
|
||||
_cell = nil;
|
||||
}
|
||||
|
||||
- (void) runModalPopUp
|
||||
{
|
||||
NSWindow *onWindow;
|
||||
NSEvent *event;
|
||||
NSException *exception = nil;
|
||||
|
||||
onWindow = [[_cell controlView] window];
|
||||
[self setLevel: [onWindow level]];
|
||||
[self orderWindow: NSWindowAbove relativeTo: [onWindow windowNumber]];
|
||||
|
||||
while ((event = [NSApp nextEventMatchingMask: NSAnyEventMask
|
||||
untilDate: [NSDate dateWithTimeIntervalSinceNow: 0]
|
||||
inMode: NSDefaultRunLoopMode
|
||||
dequeue: NO]))
|
||||
{
|
||||
if ([event type] == NSAppKitDefined ||
|
||||
[event type] == NSSystemDefined ||
|
||||
[event type] == NSApplicationDefined ||
|
||||
[event windowNumber] == [self windowNumber])
|
||||
break;
|
||||
[NSApp nextEventMatchingMask: NSAnyEventMask
|
||||
untilDate: [NSDate distantFuture]
|
||||
inMode: NSDefaultRunLoopMode
|
||||
dequeue: YES];
|
||||
}
|
||||
|
||||
[self makeKeyAndOrderFront: nil];
|
||||
|
||||
NS_DURING
|
||||
[self runLoop];
|
||||
NS_HANDLER
|
||||
exception = localException;
|
||||
NS_ENDHANDLER;
|
||||
|
||||
if (onWindow)
|
||||
{
|
||||
[onWindow makeKeyWindow];
|
||||
[onWindow orderFrontRegardless];
|
||||
}
|
||||
|
||||
if ([self isVisible])
|
||||
[self orderOut:nil];
|
||||
|
||||
if (exception)
|
||||
[exception raise];
|
||||
}
|
||||
|
||||
- (void) runLoop
|
||||
{
|
||||
NSEvent *event;
|
||||
int cnt = 0;
|
||||
BOOL kDown;
|
||||
CREATE_AUTORELEASE_POOL (pool);
|
||||
|
||||
_stopped = NO;
|
||||
while (!_stopped)
|
||||
{
|
||||
kDown = NO;
|
||||
cnt++;
|
||||
if (cnt >= 5)
|
||||
{
|
||||
RELEASE(pool);
|
||||
IF_NO_GC(pool = [[NSAutoreleasePool alloc] init]);
|
||||
cnt = 0;
|
||||
}
|
||||
event = [NSApp nextEventMatchingMask: NSAnyEventMask
|
||||
untilDate: [NSDate distantFuture]
|
||||
inMode: NSDefaultRunLoopMode
|
||||
dequeue: NO];
|
||||
if (event)
|
||||
{
|
||||
if ([event type] == NSAppKitDefined ||
|
||||
[event type] == NSSystemDefined ||
|
||||
[event type] == NSApplicationDefined ||
|
||||
[event windowNumber] == [self windowNumber])
|
||||
{
|
||||
event = [NSApp nextEventMatchingMask: NSAnyEventMask
|
||||
untilDate: [NSDate distantFuture]
|
||||
inMode: NSDefaultRunLoopMode
|
||||
dequeue: YES];
|
||||
[NSApp sendEvent: event];
|
||||
if ([event type] == NSKeyDown)
|
||||
kDown = YES;
|
||||
}
|
||||
else if ([event type] == NSMouseMoved ||
|
||||
[event type] == NSLeftMouseDragged ||
|
||||
[event type] == NSOtherMouseDragged ||
|
||||
[event type] == NSRightMouseDragged ||
|
||||
[event type] == NSMouseEntered ||
|
||||
[event type] == NSMouseExited ||
|
||||
[event type] == NSCursorUpdate)
|
||||
{
|
||||
event = [NSApp nextEventMatchingMask:NSAnyEventMask
|
||||
untilDate:[NSDate distantFuture]
|
||||
inMode:NSDefaultRunLoopMode
|
||||
dequeue:YES];
|
||||
[NSApp sendEvent:event];
|
||||
}
|
||||
else
|
||||
_stopped = YES;
|
||||
}
|
||||
}
|
||||
if (kDown)
|
||||
while ((event = [NSApp nextEventMatchingMask: NSAnyEventMask
|
||||
untilDate: [NSDate distantFuture]
|
||||
inMode: NSDefaultRunLoopMode
|
||||
dequeue: NO]))
|
||||
{
|
||||
if ([event windowNumber] != [self windowNumber])
|
||||
break;
|
||||
event = [NSApp nextEventMatchingMask:NSAnyEventMask
|
||||
untilDate:[NSDate distantFuture]
|
||||
inMode:NSDefaultRunLoopMode
|
||||
dequeue:YES];
|
||||
[NSApp sendEvent:event];
|
||||
if ([event type] == NSKeyUp)
|
||||
break;
|
||||
}
|
||||
RELEASE(pool);
|
||||
}
|
||||
|
||||
- (BOOL) canBecomeKeyWindow { return YES; }
|
||||
- (BOOL) worksWhenModal { return NO; }
|
||||
|
||||
// Target/Action of Browser
|
||||
- (void) selectItem: (id)sender
|
||||
{
|
||||
if (_cell)
|
||||
{
|
||||
[_cell setStringValue: [[sender selectedCell] stringValue]];
|
||||
_stopped = YES;
|
||||
}
|
||||
}
|
||||
|
||||
// Browser Delegate Methods
|
||||
- (int) browser: (NSBrowser *)sender
|
||||
numberOfRowsInColumn: (int)column
|
||||
{
|
||||
if (!_cell)
|
||||
return 0;
|
||||
|
||||
ASSIGN(list, [_cell objectValues]);
|
||||
return [_cell numberOfItems];
|
||||
}
|
||||
|
||||
- (void)browser: (NSBrowser *)sender
|
||||
willDisplayCell: (id)aCell
|
||||
atRow: (int)row
|
||||
column:(int)column
|
||||
{
|
||||
[aCell setStringValue: [list objectAtIndex:row]];
|
||||
[aCell setLeaf: YES];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -26,15 +26,45 @@
|
|||
#include <Foundation/NSNotification.h>
|
||||
#include <Foundation/NSString.h>
|
||||
#include <Foundation/NSArray.h>
|
||||
#include <Foundation/NSRunLoop.h>
|
||||
#include <Foundation/NSException.h>
|
||||
#include <Foundation/NSAutoreleasePool.h>
|
||||
#include <AppKit/NSApplication.h>
|
||||
#include <AppKit/NSBox.h>
|
||||
#include <AppKit/NSBrowser.h>
|
||||
#include <AppKit/NSBrowserCell.h>
|
||||
#include <AppKit/NSButtonCell.h>
|
||||
#include <AppKit/NSComboBox.h>
|
||||
#include <AppKit/NSComboBoxCell.h>
|
||||
#include <AppKit/NSGraphicsContext.h>
|
||||
#include <AppKit/NSImage.h>
|
||||
#include <AppKit/NSMatrix.h>
|
||||
#include <AppKit/NSScreen.h>
|
||||
#include <AppKit/NSScroller.h>
|
||||
#include <AppKit/NSWindow.h>
|
||||
|
||||
@interface GSComboWindow : NSWindow
|
||||
{
|
||||
NSBrowser *browser;
|
||||
|
||||
@private;
|
||||
NSArray *list;
|
||||
NSComboBoxCell *_cell;
|
||||
BOOL _stopped;
|
||||
}
|
||||
|
||||
+ (GSComboWindow *)defaultPopUp;
|
||||
|
||||
- (NSMatrix *)matrix;
|
||||
- (NSSize)popUpCellSizeForPopUp:(NSComboBoxCell *)aCell;
|
||||
- (void)popUpCell:(NSComboBoxCell *)aCell
|
||||
popUpAt:(NSPoint)aPoint
|
||||
width:(float)aWidth;
|
||||
- (void)runModalPopUp;
|
||||
- (void)runLoop;
|
||||
|
||||
@end
|
||||
|
||||
#include "GSComboSupport.h"
|
||||
|
||||
static NSNotificationCenter *nc;
|
||||
|
||||
|
|
@ -46,6 +76,267 @@ static NSNotificationCenter *nc;
|
|||
- (GSComboWindow *) _popUp;
|
||||
@end
|
||||
|
||||
|
||||
@implementation GSComboWindow
|
||||
|
||||
+ (GSComboWindow *) defaultPopUp
|
||||
{
|
||||
static GSComboWindow *gsWindow = nil;
|
||||
|
||||
if (!gsWindow)
|
||||
gsWindow = [[self alloc] initWithContentRect: NSMakeRect(0,0,100,100)
|
||||
styleMask: NSBorderlessWindowMask
|
||||
backing: NSBackingStoreNonretained //NSBackingStoreBuffered
|
||||
defer: YES];
|
||||
return gsWindow;
|
||||
}
|
||||
|
||||
- (id) initWithContentRect: (NSRect)contentRect
|
||||
styleMask: (unsigned int)aStyle
|
||||
backing: (NSBackingStoreType)bufferingType
|
||||
defer: (BOOL)flag
|
||||
{
|
||||
NSBox *box;
|
||||
|
||||
self = [super initWithContentRect: contentRect
|
||||
styleMask: aStyle
|
||||
backing: bufferingType
|
||||
defer: flag];
|
||||
box = [[NSBox alloc] initWithFrame: contentRect];
|
||||
[box setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
|
||||
[box setBorderType: NSLineBorder];
|
||||
[box setTitlePosition: NSNoTitle];
|
||||
[box setContentViewMargins: NSMakeSize(1,1)];
|
||||
[box sizeToFit];
|
||||
[self setContentView:box];
|
||||
RELEASE(box);
|
||||
browser = [[NSBrowser alloc] initWithFrame: contentRect];
|
||||
[browser setMaxVisibleColumns: 1];
|
||||
[browser setTitled: NO];
|
||||
[browser setHasHorizontalScroller: NO];
|
||||
[browser setTarget: self];
|
||||
[browser setAction: @selector(selectItem:)];
|
||||
[browser setDelegate: self];
|
||||
// [browser setRefusesFirstResponder: YES];
|
||||
[browser setAutoresizingMask: NSViewWidthSizable | NSViewWidthSizable];
|
||||
[browser setAllowsEmptySelection: NO];
|
||||
[browser setAllowsMultipleSelection: NO];
|
||||
[box setContentView: browser];
|
||||
RELEASE(browser);
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)dealloc
|
||||
{
|
||||
// Browser was not retained so don't release it
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
- (NSMatrix *) matrix { return [browser matrixInColumn:0]; }
|
||||
|
||||
- (NSSize) popUpCellSizeForPopUp: (NSComboBoxCell *)aCell
|
||||
{
|
||||
NSSize size;
|
||||
float itemHeight;
|
||||
float cellSpacing;
|
||||
|
||||
itemHeight = [aCell itemHeight];
|
||||
cellSpacing = [aCell intercellSpacing].height;
|
||||
|
||||
if (itemHeight <= 0)
|
||||
itemHeight = [[self matrix] cellSize].height;
|
||||
|
||||
if (cellSpacing <= 0)
|
||||
cellSpacing = [[self matrix] intercellSpacing].height;
|
||||
|
||||
size = NSMakeSize(2.0 + [NSScroller scrollerWidth] + 100.0,
|
||||
2.0 + (itemHeight * [aCell numberOfVisibleItems]) +
|
||||
(cellSpacing * [aCell numberOfVisibleItems]));
|
||||
size.height += 4.0;
|
||||
size.width += 4.0;
|
||||
|
||||
return size;
|
||||
}
|
||||
|
||||
- (void) popUpCell: (NSComboBoxCell *)aCell
|
||||
popUpAt: (NSPoint)aPoint
|
||||
width: (float)aWidth
|
||||
{
|
||||
NSRect rect;
|
||||
|
||||
rect.size = [self popUpCellSizeForPopUp: aCell];
|
||||
_cell = aCell;
|
||||
|
||||
rect.size.width = aWidth;
|
||||
rect.origin.x = aPoint.x;
|
||||
rect.origin.y = aPoint.y;
|
||||
[self setFrame: rect display: NO];
|
||||
|
||||
[browser loadColumnZero];
|
||||
|
||||
// [self enableKeyEquivalentForDefaultButtonCell];
|
||||
[self runModalPopUp];
|
||||
|
||||
_cell = nil;
|
||||
}
|
||||
|
||||
- (void) runModalPopUp
|
||||
{
|
||||
NSWindow *onWindow;
|
||||
NSEvent *event;
|
||||
NSException *exception = nil;
|
||||
|
||||
onWindow = [[_cell controlView] window];
|
||||
[self setLevel: [onWindow level]];
|
||||
[self orderWindow: NSWindowAbove relativeTo: [onWindow windowNumber]];
|
||||
|
||||
while ((event = [NSApp nextEventMatchingMask: NSAnyEventMask
|
||||
untilDate: [NSDate dateWithTimeIntervalSinceNow: 0]
|
||||
inMode: NSDefaultRunLoopMode
|
||||
dequeue: NO]))
|
||||
{
|
||||
if ([event type] == NSAppKitDefined ||
|
||||
[event type] == NSSystemDefined ||
|
||||
[event type] == NSApplicationDefined ||
|
||||
[event windowNumber] == [self windowNumber])
|
||||
break;
|
||||
[NSApp nextEventMatchingMask: NSAnyEventMask
|
||||
untilDate: [NSDate distantFuture]
|
||||
inMode: NSDefaultRunLoopMode
|
||||
dequeue: YES];
|
||||
}
|
||||
|
||||
[self makeKeyAndOrderFront: nil];
|
||||
|
||||
NS_DURING
|
||||
[self runLoop];
|
||||
NS_HANDLER
|
||||
exception = localException;
|
||||
NS_ENDHANDLER;
|
||||
|
||||
if (onWindow)
|
||||
{
|
||||
[onWindow makeKeyWindow];
|
||||
[onWindow orderFrontRegardless];
|
||||
}
|
||||
|
||||
if ([self isVisible])
|
||||
[self orderOut:nil];
|
||||
|
||||
if (exception)
|
||||
[exception raise];
|
||||
}
|
||||
|
||||
- (void) runLoop
|
||||
{
|
||||
NSEvent *event;
|
||||
int cnt = 0;
|
||||
BOOL kDown;
|
||||
CREATE_AUTORELEASE_POOL (pool);
|
||||
|
||||
_stopped = NO;
|
||||
while (!_stopped)
|
||||
{
|
||||
kDown = NO;
|
||||
cnt++;
|
||||
if (cnt >= 5)
|
||||
{
|
||||
RELEASE(pool);
|
||||
IF_NO_GC(pool = [[NSAutoreleasePool alloc] init]);
|
||||
cnt = 0;
|
||||
}
|
||||
event = [NSApp nextEventMatchingMask: NSAnyEventMask
|
||||
untilDate: [NSDate distantFuture]
|
||||
inMode: NSDefaultRunLoopMode
|
||||
dequeue: NO];
|
||||
if (event)
|
||||
{
|
||||
if ([event type] == NSAppKitDefined ||
|
||||
[event type] == NSSystemDefined ||
|
||||
[event type] == NSApplicationDefined ||
|
||||
[event windowNumber] == [self windowNumber])
|
||||
{
|
||||
event = [NSApp nextEventMatchingMask: NSAnyEventMask
|
||||
untilDate: [NSDate distantFuture]
|
||||
inMode: NSDefaultRunLoopMode
|
||||
dequeue: YES];
|
||||
[NSApp sendEvent: event];
|
||||
if ([event type] == NSKeyDown)
|
||||
kDown = YES;
|
||||
}
|
||||
else if ([event type] == NSMouseMoved ||
|
||||
[event type] == NSLeftMouseDragged ||
|
||||
[event type] == NSOtherMouseDragged ||
|
||||
[event type] == NSRightMouseDragged ||
|
||||
[event type] == NSMouseEntered ||
|
||||
[event type] == NSMouseExited ||
|
||||
[event type] == NSCursorUpdate)
|
||||
{
|
||||
event = [NSApp nextEventMatchingMask:NSAnyEventMask
|
||||
untilDate:[NSDate distantFuture]
|
||||
inMode:NSDefaultRunLoopMode
|
||||
dequeue:YES];
|
||||
[NSApp sendEvent:event];
|
||||
}
|
||||
else
|
||||
_stopped = YES;
|
||||
}
|
||||
}
|
||||
if (kDown)
|
||||
while ((event = [NSApp nextEventMatchingMask: NSAnyEventMask
|
||||
untilDate: [NSDate distantFuture]
|
||||
inMode: NSDefaultRunLoopMode
|
||||
dequeue: NO]))
|
||||
{
|
||||
if ([event windowNumber] != [self windowNumber])
|
||||
break;
|
||||
event = [NSApp nextEventMatchingMask:NSAnyEventMask
|
||||
untilDate:[NSDate distantFuture]
|
||||
inMode:NSDefaultRunLoopMode
|
||||
dequeue:YES];
|
||||
[NSApp sendEvent:event];
|
||||
if ([event type] == NSKeyUp)
|
||||
break;
|
||||
}
|
||||
RELEASE(pool);
|
||||
}
|
||||
|
||||
- (BOOL) canBecomeKeyWindow { return YES; }
|
||||
- (BOOL) worksWhenModal { return NO; }
|
||||
|
||||
// Target/Action of Browser
|
||||
- (void) selectItem: (id)sender
|
||||
{
|
||||
if (_cell)
|
||||
{
|
||||
[_cell setStringValue: [[sender selectedCell] stringValue]];
|
||||
_stopped = YES;
|
||||
}
|
||||
}
|
||||
|
||||
// Browser Delegate Methods
|
||||
- (int) browser: (NSBrowser *)sender
|
||||
numberOfRowsInColumn: (int)column
|
||||
{
|
||||
if (!_cell)
|
||||
return 0;
|
||||
|
||||
ASSIGN(list, [_cell objectValues]);
|
||||
return [_cell numberOfItems];
|
||||
}
|
||||
|
||||
- (void)browser: (NSBrowser *)sender
|
||||
willDisplayCell: (id)aCell
|
||||
atRow: (int)row
|
||||
column:(int)column
|
||||
{
|
||||
[aCell setStringValue: [list objectAtIndex:row]];
|
||||
[aCell setLeaf: YES];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@implementation NSComboBoxCell
|
||||
|
||||
//
|
||||
|
|
|
|||
236
Source/NSSound.m
236
Source/NSSound.m
|
|
@ -76,13 +76,9 @@ static NSDictionary *nsmapping = nil;
|
|||
@protocol GSSoundSvr
|
||||
|
||||
- (BOOL) playSound: (id)aSound;
|
||||
|
||||
- (BOOL) stopSoundWithIdentifier: (NSString *)identifier;
|
||||
|
||||
- (BOOL) pauseSoundWithIdentifier: (NSString *)identifier;
|
||||
|
||||
- (BOOL) resumeSoundWithIdentifier: (NSString *)identifier;
|
||||
|
||||
- (BOOL) isPlayingSoundWithIdentifier: (NSString *)identifier;
|
||||
|
||||
@end
|
||||
|
|
@ -92,23 +88,15 @@ static id<GSSoundSvr> the_server = nil;
|
|||
@interface NSSound (PrivateMethods)
|
||||
|
||||
+ (id<GSSoundSvr>) gsnd;
|
||||
|
||||
+ (void) localServer: (id<GSSoundSvr>)s;
|
||||
|
||||
+ (id) lostServer: (NSNotification*)notification;
|
||||
|
||||
- (BOOL) getDataFromFileAtPath: (NSString *)path;
|
||||
|
||||
- (void) setIdentifier: (NSString *)identifier;
|
||||
|
||||
- (NSString *) identifier;
|
||||
|
||||
- (float) samplingRate;
|
||||
|
||||
- (float) frameSize;
|
||||
|
||||
- (long) frameCount;
|
||||
|
||||
- (NSData *) data;
|
||||
|
||||
@end
|
||||
|
|
@ -186,7 +174,8 @@ static id<GSSoundSvr> the_server = nil;
|
|||
{
|
||||
#ifdef GNUSTEP_BASE_LIBRARY
|
||||
cmd = RETAIN([[NSSearchPathForDirectoriesInDomains(
|
||||
GSToolsDirectory, NSSystemDomainMask, YES) objectAtIndex: 0]
|
||||
GSToolsDirectory, NSSystemDomainMask, YES)
|
||||
objectAtIndex: 0]
|
||||
stringByAppendingPathComponent: @"gsnd"]);
|
||||
#else
|
||||
cmd = RETAIN([[@GNUSTEP_INSTALL_PREFIX
|
||||
|
|
@ -200,7 +189,6 @@ static id<GSSoundSvr> the_server = nil;
|
|||
NSLog(@"Unable to contact sound server - "
|
||||
@"please ensure that gsnd is running for %@.", description);
|
||||
return nil;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -222,7 +210,7 @@ static id<GSSoundSvr> the_server = nil;
|
|||
invocation: nil repeats: NO];
|
||||
|
||||
[[NSRunLoop currentRunLoop] runUntilDate:
|
||||
[NSDate dateWithTimeIntervalSinceNow: 5.0]];
|
||||
[NSDate dateWithTimeIntervalSinceNow: 5.0]];
|
||||
|
||||
recursion = YES;
|
||||
[self gsnd];
|
||||
|
|
@ -254,6 +242,7 @@ static id<GSSoundSvr> the_server = nil;
|
|||
|
||||
- (BOOL) getDataFromFileAtPath: (NSString *)path
|
||||
{
|
||||
NSMutableData *d;
|
||||
AFfilehandle file;
|
||||
AFframecount framesRead;
|
||||
void *buffer;
|
||||
|
|
@ -270,28 +259,30 @@ return NO; \
|
|||
return NO;
|
||||
}
|
||||
|
||||
dataFormat = AF_SAMPFMT_TWOSCOMP;
|
||||
CHECK_AF_ERR (afSetVirtualSampleFormat(file, AF_DEFAULT_TRACK, dataFormat, 16));
|
||||
channelCount = DEFAULT_CHANNELS;
|
||||
CHECK_AF_ERR (afSetVirtualChannels(file, AF_DEFAULT_TRACK, channelCount));
|
||||
CHECK_AF_ERR (samplingRate = afGetRate(file, AF_DEFAULT_TRACK));
|
||||
CHECK_AF_ERR (frameCount = afGetFrameCount(file, AF_DEFAULT_TRACK));
|
||||
CHECK_AF_ERR (frameSize = afGetVirtualFrameSize(file, AF_DEFAULT_TRACK, 1));
|
||||
CHECK_AF_ERR (dataLocation = afGetDataOffset(file, AF_DEFAULT_TRACK));
|
||||
_dataFormat = AF_SAMPFMT_TWOSCOMP;
|
||||
CHECK_AF_ERR (afSetVirtualSampleFormat(file, AF_DEFAULT_TRACK, _dataFormat, 16));
|
||||
_channelCount = DEFAULT_CHANNELS;
|
||||
CHECK_AF_ERR (afSetVirtualChannels(file, AF_DEFAULT_TRACK, _channelCount));
|
||||
CHECK_AF_ERR (_samplingRate = afGetRate(file, AF_DEFAULT_TRACK));
|
||||
CHECK_AF_ERR (_frameCount = afGetFrameCount(file, AF_DEFAULT_TRACK));
|
||||
CHECK_AF_ERR (_frameSize = afGetVirtualFrameSize(file, AF_DEFAULT_TRACK, 1));
|
||||
CHECK_AF_ERR (_dataLocation = afGetDataOffset(file, AF_DEFAULT_TRACK));
|
||||
|
||||
buffer = NSZoneMalloc(NSDefaultMallocZone(), BUFFER_SIZE_IN_FRAMES * frameSize);
|
||||
data = [[NSMutableData alloc] initWithCapacity: 1];
|
||||
|
||||
CHECK_AF_ERR (framesRead = afReadFrames(file, AF_DEFAULT_TRACK, buffer, BUFFER_SIZE_IN_FRAMES));
|
||||
buffer = NSZoneMalloc(NSDefaultMallocZone(), BUFFER_SIZE_IN_FRAMES * _frameSize);
|
||||
d = [[NSMutableData alloc] initWithCapacity: 1];
|
||||
|
||||
CHECK_AF_ERR (framesRead = afReadFrames(file, AF_DEFAULT_TRACK, buffer,
|
||||
BUFFER_SIZE_IN_FRAMES));
|
||||
while (framesRead > 0)
|
||||
{
|
||||
[data appendBytes: (const void *)buffer
|
||||
length: framesRead * frameSize];
|
||||
CHECK_AF_ERR (framesRead = afReadFrames(file, AF_DEFAULT_TRACK, buffer, BUFFER_SIZE_IN_FRAMES));
|
||||
[d appendBytes: (const void *)buffer
|
||||
length: framesRead * _frameSize];
|
||||
CHECK_AF_ERR (framesRead = afReadFrames(file, AF_DEFAULT_TRACK, buffer,
|
||||
BUFFER_SIZE_IN_FRAMES));
|
||||
}
|
||||
|
||||
dataSize = [data length];
|
||||
|
||||
_data = d;
|
||||
_dataSize = [_data length];
|
||||
NSZoneFree(NSDefaultMallocZone(), buffer);
|
||||
afCloseFile(file);
|
||||
|
||||
|
|
@ -324,32 +315,32 @@ return NO; \
|
|||
|
||||
- (void) setIdentifier: (NSString *)identifier
|
||||
{
|
||||
ASSIGN (uniqueIdentifier, identifier);
|
||||
ASSIGN (_uniqueIdentifier, identifier);
|
||||
}
|
||||
|
||||
- (NSString *) identifier
|
||||
{
|
||||
return uniqueIdentifier;
|
||||
return _uniqueIdentifier;
|
||||
}
|
||||
|
||||
- (float) samplingRate
|
||||
{
|
||||
return samplingRate;
|
||||
return _samplingRate;
|
||||
}
|
||||
|
||||
- (float) frameSize
|
||||
{
|
||||
return frameSize;
|
||||
return _frameSize;
|
||||
}
|
||||
|
||||
- (long) frameCount
|
||||
{
|
||||
return frameCount;
|
||||
return _frameCount;
|
||||
}
|
||||
|
||||
- (NSData *) data
|
||||
{
|
||||
return data;
|
||||
return _data;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -385,13 +376,13 @@ return NO; \
|
|||
|
||||
- (void) dealloc
|
||||
{
|
||||
TEST_RELEASE (data);
|
||||
if (name && self == [nameDict objectForKey: name])
|
||||
TEST_RELEASE (_data);
|
||||
if ((_name != nil) && self == [nameDict objectForKey: _name])
|
||||
{
|
||||
[nameDict removeObjectForKey: name];
|
||||
[nameDict removeObjectForKey: _name];
|
||||
}
|
||||
TEST_RELEASE (name);
|
||||
TEST_RELEASE (uniqueIdentifier);
|
||||
TEST_RELEASE (_name);
|
||||
TEST_RELEASE (_uniqueIdentifier);
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
|
|
@ -404,9 +395,9 @@ return NO; \
|
|||
|
||||
if (self)
|
||||
{
|
||||
onlyReference = byRef;
|
||||
ASSIGN (name, [path lastPathComponent]);
|
||||
uniqueIdentifier = nil;
|
||||
_onlyReference = byRef;
|
||||
ASSIGN (_name, [path lastPathComponent]);
|
||||
_uniqueIdentifier = nil;
|
||||
if ([self getDataFromFileAtPath: path] == NO)
|
||||
{
|
||||
NSLog(@"Could not get sound data from %@", path);
|
||||
|
|
@ -419,7 +410,7 @@ return NO; \
|
|||
|
||||
- (id) initWithContentsOfURL: (NSURL *)url byReference:(BOOL)byRef
|
||||
{
|
||||
onlyReference = byRef;
|
||||
_onlyReference = byRef;
|
||||
return [self initWithData: [NSData dataWithContentsOfURL: url]];
|
||||
}
|
||||
|
||||
|
|
@ -444,9 +435,9 @@ return NO; \
|
|||
//
|
||||
- (BOOL) pause
|
||||
{
|
||||
if (uniqueIdentifier)
|
||||
if (_uniqueIdentifier)
|
||||
{
|
||||
return [[NSSound gsnd] pauseSoundWithIdentifier: uniqueIdentifier];
|
||||
return [[NSSound gsnd] pauseSoundWithIdentifier: _uniqueIdentifier];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
|
@ -458,27 +449,27 @@ return NO; \
|
|||
|
||||
- (BOOL) resume
|
||||
{
|
||||
if (uniqueIdentifier)
|
||||
if (_uniqueIdentifier)
|
||||
{
|
||||
return [[NSSound gsnd] resumeSoundWithIdentifier: uniqueIdentifier];
|
||||
return [[NSSound gsnd] resumeSoundWithIdentifier: _uniqueIdentifier];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (BOOL) stop
|
||||
{
|
||||
if (uniqueIdentifier)
|
||||
if (_uniqueIdentifier)
|
||||
{
|
||||
return [[NSSound gsnd] stopSoundWithIdentifier: uniqueIdentifier];
|
||||
return [[NSSound gsnd] stopSoundWithIdentifier: _uniqueIdentifier];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (BOOL) isPlaying
|
||||
{
|
||||
if (uniqueIdentifier)
|
||||
if (_uniqueIdentifier)
|
||||
{
|
||||
return [[NSSound gsnd] isPlayingSoundWithIdentifier: uniqueIdentifier];
|
||||
return [[NSSound gsnd] isPlayingSoundWithIdentifier: _uniqueIdentifier];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
|
@ -515,12 +506,12 @@ return NO; \
|
|||
//
|
||||
- (id) delegate
|
||||
{
|
||||
return delegate;
|
||||
return _delegate;
|
||||
}
|
||||
|
||||
- (void) setDelegate: (id)aDelegate
|
||||
{
|
||||
delegate = aDelegate;
|
||||
_delegate = aDelegate;
|
||||
}
|
||||
|
||||
//
|
||||
|
|
@ -566,7 +557,6 @@ return NO; \
|
|||
/* Extension is one of the sound types
|
||||
So remove from the name */
|
||||
the_name = [name stringByDeletingPathExtension];
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -580,7 +570,6 @@ return NO; \
|
|||
if (extension)
|
||||
{
|
||||
path = [main_bundle pathForResource: the_name ofType: extension];
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -657,7 +646,7 @@ return NO; \
|
|||
{
|
||||
[sound setName: name];
|
||||
RELEASE(sound);
|
||||
sound->onlyReference = YES;
|
||||
sound->_onlyReference = YES;
|
||||
}
|
||||
|
||||
return sound;
|
||||
|
|
@ -674,7 +663,7 @@ return NO; \
|
|||
|
||||
- (NSString *) name
|
||||
{
|
||||
return name;
|
||||
return _name;
|
||||
}
|
||||
|
||||
- (BOOL) setName: (NSString *)aName
|
||||
|
|
@ -686,18 +675,18 @@ return NO; \
|
|||
return NO;
|
||||
}
|
||||
|
||||
if (name && self == [nameDict objectForKey: name])
|
||||
if ((_name != nil) && self == [nameDict objectForKey: _name])
|
||||
{
|
||||
/* We retain self in case removing from the dictionary releases
|
||||
us */
|
||||
RETAIN (self);
|
||||
retained = YES;
|
||||
[nameDict removeObjectForKey: name];
|
||||
[nameDict removeObjectForKey: _name];
|
||||
}
|
||||
|
||||
ASSIGN(name, aName);
|
||||
ASSIGN(_name, aName);
|
||||
|
||||
[nameDict setObject: self forKey: name];
|
||||
[nameDict setObject: self forKey: _name];
|
||||
if (retained)
|
||||
{
|
||||
RELEASE (self);
|
||||
|
|
@ -711,86 +700,59 @@ return NO; \
|
|||
//
|
||||
- (void) encodeWithCoder: (NSCoder *)coder
|
||||
{
|
||||
[coder encodeValueOfObjCType: @encode(BOOL) at: &onlyReference];
|
||||
[coder encodeObject: name];
|
||||
[coder encodeValueOfObjCType: @encode(BOOL) at: &_onlyReference];
|
||||
[coder encodeObject: _name];
|
||||
|
||||
if (onlyReference == YES)
|
||||
if (_onlyReference == YES)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (uniqueIdentifier != nil)
|
||||
if (_uniqueIdentifier != nil)
|
||||
{
|
||||
[coder encodeObject: uniqueIdentifier];
|
||||
[coder encodeObject: _uniqueIdentifier];
|
||||
}
|
||||
|
||||
[coder encodeConditionalObject: delegate];
|
||||
[coder encodeValueOfObjCType: @encode(long) at: &dataLocation];
|
||||
[coder encodeValueOfObjCType: @encode(long) at: &dataSize];
|
||||
[coder encodeValueOfObjCType: @encode(int) at: &dataFormat];
|
||||
[coder encodeValueOfObjCType: @encode(float) at: &samplingRate];
|
||||
[coder encodeValueOfObjCType: @encode(float) at: &frameSize];
|
||||
[coder encodeValueOfObjCType: @encode(long) at: &frameCount];
|
||||
[coder encodeValueOfObjCType: @encode(int) at: &channelCount];
|
||||
[coder encodeConditionalObject: _delegate];
|
||||
[coder encodeValueOfObjCType: @encode(long) at: &_dataLocation];
|
||||
[coder encodeValueOfObjCType: @encode(long) at: &_dataSize];
|
||||
[coder encodeValueOfObjCType: @encode(int) at: &_dataFormat];
|
||||
[coder encodeValueOfObjCType: @encode(float) at: &_samplingRate];
|
||||
[coder encodeValueOfObjCType: @encode(float) at: &_frameSize];
|
||||
[coder encodeValueOfObjCType: @encode(long) at: &_frameCount];
|
||||
[coder encodeValueOfObjCType: @encode(int) at: &_channelCount];
|
||||
|
||||
[coder encodeObject: data];
|
||||
[coder encodeObject: _data];
|
||||
}
|
||||
|
||||
- (id) initWithCoder: (NSCoder*)decoder
|
||||
{
|
||||
[decoder decodeValueOfObjCType: @encode(BOOL) at: &onlyReference];
|
||||
[decoder decodeValueOfObjCType: @encode(BOOL) at: &_onlyReference];
|
||||
|
||||
if (onlyReference == YES)
|
||||
if (_onlyReference == YES)
|
||||
{
|
||||
NSString *theName = [decoder decodeObject];
|
||||
|
||||
RELEASE (self);
|
||||
self = RETAIN ([NSSound soundNamed: theName]);
|
||||
[self setName: theName];
|
||||
|
||||
} else
|
||||
{
|
||||
NSData *d;
|
||||
|
||||
name = [decoder decodeObject];
|
||||
TEST_RETAIN (name);
|
||||
|
||||
uniqueIdentifier = [decoder decodeObject];
|
||||
if (uniqueIdentifier != nil) {
|
||||
RETAIN (uniqueIdentifier);
|
||||
}
|
||||
else
|
||||
{
|
||||
uniqueIdentifier = nil;
|
||||
}
|
||||
|
||||
delegate = [decoder decodeObject];
|
||||
if (delegate != nil)
|
||||
{
|
||||
[self setDelegate: delegate];
|
||||
}
|
||||
else
|
||||
{
|
||||
delegate = nil;
|
||||
}
|
||||
|
||||
[decoder decodeValueOfObjCType: @encode(long) at: &dataLocation];
|
||||
[decoder decodeValueOfObjCType: @encode(long) at: &dataSize];
|
||||
[decoder decodeValueOfObjCType: @encode(int) at: &dataFormat];
|
||||
[decoder decodeValueOfObjCType: @encode(float) at: &samplingRate];
|
||||
[decoder decodeValueOfObjCType: @encode(float) at: &frameSize];
|
||||
[decoder decodeValueOfObjCType: @encode(long) at: &frameCount];
|
||||
[decoder decodeValueOfObjCType: @encode(int) at: &channelCount];
|
||||
|
||||
d = [decoder decodeObject];
|
||||
if (d != nil) {
|
||||
data = [d mutableCopy];
|
||||
}
|
||||
else
|
||||
{
|
||||
data = nil;
|
||||
}
|
||||
}
|
||||
[self setName: theName];
|
||||
}
|
||||
else
|
||||
{
|
||||
_name = TEST_RETAIN ([decoder decodeObject]);
|
||||
_uniqueIdentifier = TEST_RETAIN ([decoder decodeObject]);
|
||||
[self setDelegate: [decoder decodeObject]];
|
||||
|
||||
[decoder decodeValueOfObjCType: @encode(long) at: &_dataLocation];
|
||||
[decoder decodeValueOfObjCType: @encode(long) at: &_dataSize];
|
||||
[decoder decodeValueOfObjCType: @encode(int) at: &_dataFormat];
|
||||
[decoder decodeValueOfObjCType: @encode(float) at: &_samplingRate];
|
||||
[decoder decodeValueOfObjCType: @encode(float) at: &_frameSize];
|
||||
[decoder decodeValueOfObjCType: @encode(long) at: &_frameCount];
|
||||
[decoder decodeValueOfObjCType: @encode(int) at: &_channelCount];
|
||||
|
||||
_data = RETAIN([decoder decodeObject]);
|
||||
}
|
||||
|
||||
return self;
|
||||
}
|
||||
|
|
@ -807,25 +769,9 @@ return NO; \
|
|||
{
|
||||
NSSound *newSound = (NSSound *)NSCopyObject(self, 0, zone);
|
||||
|
||||
newSound->dataLocation = dataLocation;
|
||||
newSound->dataSize = dataSize;
|
||||
newSound->dataFormat = dataFormat;
|
||||
newSound->samplingRate = samplingRate;
|
||||
newSound->frameSize = frameSize;
|
||||
newSound->frameCount = frameCount;
|
||||
newSound->channelCount = channelCount;
|
||||
newSound->data = [data mutableCopy];
|
||||
newSound->name = [name copy];
|
||||
if (uniqueIdentifier != nil)
|
||||
{
|
||||
newSound->uniqueIdentifier = [uniqueIdentifier copy];
|
||||
}
|
||||
else
|
||||
{
|
||||
newSound->uniqueIdentifier = nil;
|
||||
}
|
||||
newSound->onlyReference = onlyReference;
|
||||
newSound->delegate = delegate;
|
||||
newSound->_data = [_data copyWithZone: zone];
|
||||
newSound->_name = [_name copyWithZone: zone];
|
||||
newSound->_uniqueIdentifier = [_uniqueIdentifier copyWithZone: zone];
|
||||
|
||||
return newSound;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue