Skip to content

Commit b51f66a

Browse files
mrRaymrRay
committed
renamed a class, minor cleanup
1 parent bb2861d commit b51f66a

File tree

5 files changed

+29
-26
lines changed

5 files changed

+29
-26
lines changed

‎HapInAVF Test App/Base.lproj/MainMenu.xib‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="14B25" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" customObjectInstantitationMethod="direct">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" customObjectInstantitationMethod="direct">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6250"/>
4+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/>
55
</dependencies>
66
<objects>
77
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -11,7 +11,7 @@
1111
</customObject>
1212
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
1313
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
14-
<customObject id="Voe-Tx-rLC" customClass="AppDelegate">
14+
<customObject id="Voe-Tx-rLC" customClass="HapInAVFTestAppDelegate">
1515
<connections>
1616
<outlet property="glView" destination="31I-59-1lg" id="vVW-AH-0vN"/>
1717
<outlet property="imgView" destination="0yA-2Z-CCI" id="8hU-jI-25O"/>
@@ -677,7 +677,7 @@
677677
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1177"/>
678678
<value key="minSize" type="size" width="360" height="305"/>
679679
<view key="contentView" id="EiT-Mj-1SZ">
680-
<rect key="frame" x="0.0" y="-7" width="400" height="380"/>
680+
<rect key="frame" x="0.0" y="0.0" width="400" height="380"/>
681681
<autoresizingMask key="autoresizingMask"/>
682682
<subviews>
683683
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="T5q-xd-X6Q">

‎HapInAVF Test App/AppDelegate.h‎ renamed to ‎HapInAVF Test App/HapInAVFTestAppDelegate.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010

11-
@interface AppDelegate : NSObject <NSApplicationDelegate,NSTabViewDelegate> {
11+
@interface HapInAVFTestAppDelegate : NSObject <NSApplicationDelegate,NSTabViewDelegate> {
1212
CVDisplayLinkRef displayLink; // this "drives" rendering
1313
NSOpenGLContext *sharedContext; // all GL contexts share this, so textures from one contact can be used in others
1414
IBOutlet NSWindow *window;

‎HapInAVF Test App/AppDelegate.m‎ renamed to ‎HapInAVF Test App/HapInAVFTestAppDelegate.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
#import "AppDelegate.h"
1+
#import "HapInAVFTestAppDelegate.h"
22
#import <OpenGL/CGLMacro.h>
33

44

55

66

7-
@implementation AppDelegate
7+
@implementation HapInAVFTestAppDelegate
88

99

1010
- (id) init {
@@ -423,7 +423,7 @@ CVReturn displayLinkCallback(CVDisplayLinkRef displayLink,
423423
void *displayLinkContext)
424424
{
425425
NSAutoreleasePool *pool =[[NSAutoreleasePool alloc] init];
426-
[(AppDelegate *)displayLinkContext renderCallback];
426+
[(HapInAVFTestAppDelegate *)displayLinkContext renderCallback];
427427
[pool release];
428428
return kCVReturnSuccess;
429429
}

‎HapInAVF Test App/HapPixelBufferTexture.m‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,13 @@ - (void) setDecodedFrame:(HapDecoderFrame *)newFrame {
198198
// NOTE: NEEDS TESTING. this used to be the case- but this API is only available on 10.10+, so this may have been fixed.
199199
backingWidths[texIndex] = 1;
200200
while (backingWidths[texIndex] < roundedWidth) backingWidths[texIndex] <<= 1;
201-
202201
backingHeights[texIndex] = 1;
203202
while (backingHeights[texIndex] < roundedHeight) backingHeights[texIndex] <<= 1;
204-
203+
204+
// ...if we aren't doing POT dimensions, then we need to do this!
205+
//backingWidths[texIndex] = roundedWidth;
206+
//backingHeights[texIndex] = roundedHeight;
207+
205208
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
206209
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
207210
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ -223,18 +226,18 @@ - (void) setDecodedFrame:(HapDecoderFrame *)newFrame {
223226
glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE);
224227

225228
glCompressedTexSubImage2D(GL_TEXTURE_2D,
226-
0,
227-
0,
228-
0,
229-
roundedWidth,
230-
roundedHeight,
231-
newInternalFormat,
232-
newDataLength,
233-
baseAddress);
234-
229+
0,
230+
0,
231+
0,
232+
roundedWidth,
233+
roundedHeight,
234+
newInternalFormat,
235+
newDataLength,
236+
baseAddress);
237+
235238
glPopClientAttrib();
236239
glPopAttrib();
237-
240+
238241
glFlush();
239242
}
240243
}

‎HapInAVFoundation.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
1A0536231A38CA5D005B47BD /* YCoCg.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A05361F1A38CA5D005B47BD /* YCoCg.c */; };
3636
1A0536241A38CA5D005B47BD /* YCoCg.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0536201A38CA5D005B47BD /* YCoCg.h */; };
3737
1A0E542D1C85F809003EAED8 /* Utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A0E542C1C85F809003EAED8 /* Utility.m */; };
38-
1A32301A1A3BA14000DDB2E0 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A3230191A3BA14000DDB2E0 /* AppDelegate.m */; };
38+
1A32301A1A3BA14000DDB2E0 /* HapInAVFTestAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A3230191A3BA14000DDB2E0 /* HapInAVFTestAppDelegate.m */; };
3939
1A32301C1A3BA14000DDB2E0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A32301B1A3BA14000DDB2E0 /* main.m */; };
4040
1A32301E1A3BA14000DDB2E0 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1A32301D1A3BA14000DDB2E0 /* Images.xcassets */; };
4141
1A3230211A3BA14000DDB2E0 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1A32301F1A3BA14000DDB2E0 /* MainMenu.xib */; };
@@ -210,8 +210,8 @@
210210
1A0E542C1C85F809003EAED8 /* Utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utility.m; path = source/Utility.m; sourceTree = SOURCE_ROOT; };
211211
1A3230141A3BA14000DDB2E0 /* HapInAVF Test App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HapInAVF Test App.app"; sourceTree = BUILT_PRODUCTS_DIR; };
212212
1A3230171A3BA14000DDB2E0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
213-
1A3230181A3BA14000DDB2E0 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
214-
1A3230191A3BA14000DDB2E0 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
213+
1A3230181A3BA14000DDB2E0 /* HapInAVFTestAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HapInAVFTestAppDelegate.h; sourceTree = "<group>"; };
214+
1A3230191A3BA14000DDB2E0 /* HapInAVFTestAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HapInAVFTestAppDelegate.m; sourceTree = "<group>"; };
215215
1A32301B1A3BA14000DDB2E0 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
216216
1A32301D1A3BA14000DDB2E0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
217217
1A3230201A3BA14000DDB2E0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -376,8 +376,8 @@
376376
1A3230151A3BA14000DDB2E0 /* HapInAVF Test App */ = {
377377
isa = PBXGroup;
378378
children = (
379-
1A3230181A3BA14000DDB2E0 /* AppDelegate.h */,
380-
1A3230191A3BA14000DDB2E0 /* AppDelegate.m */,
379+
1A3230181A3BA14000DDB2E0 /* HapInAVFTestAppDelegate.h */,
380+
1A3230191A3BA14000DDB2E0 /* HapInAVFTestAppDelegate.m */,
381381
1A05185A1A3E17CF00FC80D2 /* GLView.h */,
382382
1A05185B1A3E17CF00FC80D2 /* GLView.m */,
383383
1A05185C1A3E17CF00FC80D2 /* HapPixelBufferTexture.h */,
@@ -761,7 +761,7 @@
761761
files = (
762762
1A05185F1A3E17CF00FC80D2 /* HapPixelBufferTexture.m in Sources */,
763763
1A32301C1A3BA14000DDB2E0 /* main.m in Sources */,
764-
1A32301A1A3BA14000DDB2E0 /* AppDelegate.m in Sources */,
764+
1A32301A1A3BA14000DDB2E0 /* HapInAVFTestAppDelegate.m in Sources */,
765765
1A05185E1A3E17CF00FC80D2 /* GLView.m in Sources */,
766766
);
767767
runOnlyForDeploymentPostprocessing = 0;

0 commit comments

Comments
 (0)