Skip to content

Commit

Permalink
moved Pd clases to src/pd/cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
@danomatika
danomatika committed Oct 30, 2011
1 parent 239b021 commit d03dd16
Show file tree
Hide file tree
Showing 9 changed files with 51 additions and 27 deletions.
32 changes: 24 additions & 8 deletions example/ofxPdExample-ios.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; };
3000D900145D10F8009FC3EC /* PdBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3000D8FA145D10F8009FC3EC /* PdBase.cpp */; };
3000D901145D10F8009FC3EC /* PdTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3000D8FE145D10F8009FC3EC /* PdTypes.cpp */; };
30B2D285142B3530000AB5E1 /* AppCore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D280142B3530000AB5E1 /* AppCore.cpp */; };
30B2D286142B3530000AB5E1 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D282142B3530000AB5E1 /* main.mm */; };
30B2D287142B3530000AB5E1 /* testApp.mm in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D284142B3530000AB5E1 /* testApp.mm */; };
Expand Down Expand Up @@ -106,7 +108,6 @@
30B2D358142B3567000AB5E1 /* x_qlist.c in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D2FB142B3566000AB5E1 /* x_qlist.c */; };
30B2D359142B3567000AB5E1 /* x_time.c in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D2FC142B3566000AB5E1 /* x_time.c */; };
30B2D35D142B36EA000AB5E1 /* Project-ios.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 30B2D35C142B36EA000AB5E1 /* Project-ios.xcconfig */; };
30D3EFFC14573FAB00D55978 /* PdTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 30D3EFFA14573FAB00D55978 /* PdTypes.cpp */; };
5326AEA810A23A0500278DE6 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5326AEA710A23A0500278DE6 /* CoreLocation.framework */; };
53F323EB10A20EDB00E0DAE4 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53F323EA10A20EDB00E0DAE4 /* OpenAL.framework */; };
BB16EBD20F2B2A9500518274 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BB16EBD10F2B2A9500518274 /* OpenGLES.framework */; };
Expand Down Expand Up @@ -145,6 +146,12 @@
1D6058910D05DD3D006BFB54 /* ofxPdExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ofxPdExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
3000D8FA145D10F8009FC3EC /* PdBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PdBase.cpp; sourceTree = "<group>"; };
3000D8FB145D10F8009FC3EC /* PdBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PdBase.h; sourceTree = "<group>"; };
3000D8FC145D10F8009FC3EC /* PdMidiReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PdMidiReceiver.h; sourceTree = "<group>"; };
3000D8FD145D10F8009FC3EC /* PdReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PdReceiver.h; sourceTree = "<group>"; };
3000D8FE145D10F8009FC3EC /* PdTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PdTypes.cpp; sourceTree = "<group>"; };
3000D8FF145D10F8009FC3EC /* PdTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PdTypes.h; sourceTree = "<group>"; };
30B2D280142B3530000AB5E1 /* AppCore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppCore.cpp; sourceTree = "<group>"; };
30B2D281142B3530000AB5E1 /* AppCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppCore.h; sourceTree = "<group>"; };
30B2D282142B3530000AB5E1 /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = main.mm; path = ios/main.mm; sourceTree = "<group>"; };
Expand Down Expand Up @@ -253,9 +260,6 @@
30B2D2FB142B3566000AB5E1 /* x_qlist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x_qlist.c; sourceTree = "<group>"; };
30B2D2FC142B3566000AB5E1 /* x_time.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x_time.c; sourceTree = "<group>"; };
30B2D35C142B36EA000AB5E1 /* Project-ios.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Project-ios.xcconfig"; sourceTree = "<group>"; };
30D3EFF914573FAB00D55978 /* PdReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PdReceiver.h; sourceTree = "<group>"; };
30D3EFFA14573FAB00D55978 /* PdTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PdTypes.cpp; sourceTree = "<group>"; };
30D3EFFB14573FAB00D55978 /* PdTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PdTypes.h; sourceTree = "<group>"; };
32CA4F630368D1EE00C91783 /* iPhone_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iPhone_Prefix.pch; sourceTree = "<group>"; };
5326AEA710A23A0500278DE6 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
53F323EA10A20EDB00E0DAE4 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -340,6 +344,19 @@
name = "core frameworks";
sourceTree = "<group>";
};
3000D8F9145D10F8009FC3EC /* cpp */ = {
isa = PBXGroup;
children = (
3000D8FA145D10F8009FC3EC /* PdBase.cpp */,
3000D8FB145D10F8009FC3EC /* PdBase.h */,
3000D8FC145D10F8009FC3EC /* PdMidiReceiver.h */,
3000D8FD145D10F8009FC3EC /* PdReceiver.h */,
3000D8FE145D10F8009FC3EC /* PdTypes.cpp */,
3000D8FF145D10F8009FC3EC /* PdTypes.h */,
);
path = cpp;
sourceTree = "<group>";
};
30B2D28A142B3553000AB5E1 /* ofxPd */ = {
isa = PBXGroup;
children = (
Expand All @@ -354,9 +371,6 @@
30B2D28C142B3566000AB5E1 /* ofxPd.cpp */,
30B2D28D142B3566000AB5E1 /* ofxPd.h */,
30B2D291142B3566000AB5E1 /* pd */,
30D3EFF914573FAB00D55978 /* PdReceiver.h */,
30D3EFFA14573FAB00D55978 /* PdTypes.cpp */,
30D3EFFB14573FAB00D55978 /* PdTypes.h */,
);
name = src;
path = ../../../addons/ofxPd/src;
Expand All @@ -365,6 +379,7 @@
30B2D291142B3566000AB5E1 /* pd */ = {
isa = PBXGroup;
children = (
3000D8F9145D10F8009FC3EC /* cpp */,
30B2D292142B3566000AB5E1 /* libpd_wrapper */,
30B2D298142B3566000AB5E1 /* LICENSE.txt */,
30B2D299142B3566000AB5E1 /* pure-data */,
Expand Down Expand Up @@ -786,7 +801,8 @@
30B2D357142B3567000AB5E1 /* x_net.c in Sources */,
30B2D358142B3567000AB5E1 /* x_qlist.c in Sources */,
30B2D359142B3567000AB5E1 /* x_time.c in Sources */,
30D3EFFC14573FAB00D55978 /* PdTypes.cpp in Sources */,
3000D900145D10F8009FC3EC /* PdBase.cpp in Sources */,
3000D901145D10F8009FC3EC /* PdTypes.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
40 changes: 24 additions & 16 deletions example/ofxPdExample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
3000D8EE145D1029009FC3EC /* PdBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3000D8E8145D1029009FC3EC /* PdBase.cpp */; };
3000D8EF145D1029009FC3EC /* PdTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3000D8EC145D1029009FC3EC /* PdTypes.cpp */; };
30B2D0C1142B2C7A000AB5E1 /* AppCore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D0BF142B2C7A000AB5E1 /* AppCore.cpp */; };
30B2D135142B2CA5000AB5E1 /* ofxPd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D0C4142B2CA5000AB5E1 /* ofxPd.cpp */; };
30B2D137142B2CA5000AB5E1 /* s_libpdmidi.c in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D0CB142B2CA5000AB5E1 /* s_libpdmidi.c */; };
Expand Down Expand Up @@ -82,8 +84,6 @@
30B2D17D142B2CA5000AB5E1 /* x_net.c in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D132142B2CA5000AB5E1 /* x_net.c */; };
30B2D17E142B2CA5000AB5E1 /* x_qlist.c in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D133142B2CA5000AB5E1 /* x_qlist.c */; };
30B2D17F142B2CA5000AB5E1 /* x_time.c in Sources */ = {isa = PBXBuildFile; fileRef = 30B2D134142B2CA5000AB5E1 /* x_time.c */; };
30D3EFEF14573E7900D55978 /* PdTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 30D3EFED14573E7900D55978 /* PdTypes.cpp */; };
30D3F0121457BEDA00D55978 /* PdBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 30D3F0101457BEDA00D55978 /* PdBase.cpp */; };
BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; };
E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4328148138ABC890047C5CB /* openFrameworksDebug.a */; };
E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9710E8CC7DD009D7055 /* AGL.framework */; };
Expand Down Expand Up @@ -134,6 +134,12 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
3000D8E8145D1029009FC3EC /* PdBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PdBase.cpp; sourceTree = "<group>"; };
3000D8E9145D1029009FC3EC /* PdBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PdBase.h; sourceTree = "<group>"; };
3000D8EA145D1029009FC3EC /* PdMidiReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PdMidiReceiver.h; sourceTree = "<group>"; };
3000D8EB145D1029009FC3EC /* PdReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PdReceiver.h; sourceTree = "<group>"; };
3000D8EC145D1029009FC3EC /* PdTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PdTypes.cpp; sourceTree = "<group>"; };
3000D8ED145D1029009FC3EC /* PdTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PdTypes.h; sourceTree = "<group>"; };
30B2D0BF142B2C7A000AB5E1 /* AppCore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppCore.cpp; sourceTree = "<group>"; };
30B2D0C0142B2C7A000AB5E1 /* AppCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppCore.h; sourceTree = "<group>"; };
30B2D0C4142B2CA5000AB5E1 /* ofxPd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxPd.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -238,12 +244,6 @@
30B2D132142B2CA5000AB5E1 /* x_net.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x_net.c; sourceTree = "<group>"; };
30B2D133142B2CA5000AB5E1 /* x_qlist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x_qlist.c; sourceTree = "<group>"; };
30B2D134142B2CA5000AB5E1 /* x_time.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x_time.c; sourceTree = "<group>"; };
30D3EFEC14573E7900D55978 /* PdReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PdReceiver.h; sourceTree = "<group>"; };
30D3EFED14573E7900D55978 /* PdTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PdTypes.cpp; sourceTree = "<group>"; };
30D3EFEE14573E7900D55978 /* PdTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PdTypes.h; sourceTree = "<group>"; };
30D3F00F1457A40100D55978 /* PdMidiReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PdMidiReceiver.h; sourceTree = "<group>"; };
30D3F0101457BEDA00D55978 /* PdBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PdBase.cpp; sourceTree = "<group>"; };
30D3F0111457BEDA00D55978 /* PdBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PdBase.h; sourceTree = "<group>"; };
BBAB23BE13894E4700AA2426 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = ../../../libs/glut/lib/osx/GLUT.framework; sourceTree = "<group>"; };
E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = openFrameworksLib.xcodeproj; path = ../../../libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj; sourceTree = SOURCE_ROOT; };
E45BE9710E8CC7DD009D7055 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; };
Expand Down Expand Up @@ -292,6 +292,19 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
3000D8E7145D1029009FC3EC /* cpp */ = {
isa = PBXGroup;
children = (
3000D8E8145D1029009FC3EC /* PdBase.cpp */,
3000D8E9145D1029009FC3EC /* PdBase.h */,
3000D8EA145D1029009FC3EC /* PdMidiReceiver.h */,
3000D8EB145D1029009FC3EC /* PdReceiver.h */,
3000D8EC145D1029009FC3EC /* PdTypes.cpp */,
3000D8ED145D1029009FC3EC /* PdTypes.h */,
);
path = cpp;
sourceTree = "<group>";
};
30B2D0C2142B2C8B000AB5E1 /* ofxPd */ = {
isa = PBXGroup;
children = (
Expand All @@ -305,13 +318,7 @@
children = (
30B2D0C4142B2CA5000AB5E1 /* ofxPd.cpp */,
30B2D0C5142B2CA5000AB5E1 /* ofxPd.h */,
30D3F0101457BEDA00D55978 /* PdBase.cpp */,
30D3F0111457BEDA00D55978 /* PdBase.h */,
30B2D0C9142B2CA5000AB5E1 /* pd */,
30D3EFEC14573E7900D55978 /* PdReceiver.h */,
30D3F00F1457A40100D55978 /* PdMidiReceiver.h */,
30D3EFED14573E7900D55978 /* PdTypes.cpp */,
30D3EFEE14573E7900D55978 /* PdTypes.h */,
);
name = src;
path = ../../../addons/ofxPd/src;
Expand All @@ -320,6 +327,7 @@
30B2D0C9142B2CA5000AB5E1 /* pd */ = {
isa = PBXGroup;
children = (
3000D8E7145D1029009FC3EC /* cpp */,
30B2D0CA142B2CA5000AB5E1 /* libpd_wrapper */,
30B2D0D0142B2CA5000AB5E1 /* LICENSE.txt */,
30B2D0D1142B2CA5000AB5E1 /* pure-data */,
Expand Down Expand Up @@ -730,8 +738,8 @@
30B2D17D142B2CA5000AB5E1 /* x_net.c in Sources */,
30B2D17E142B2CA5000AB5E1 /* x_qlist.c in Sources */,
30B2D17F142B2CA5000AB5E1 /* x_time.c in Sources */,
30D3EFEF14573E7900D55978 /* PdTypes.cpp in Sources */,
30D3F0121457BEDA00D55978 /* PdBase.cpp in Sources */,
3000D8EE145D1029009FC3EC /* PdBase.cpp in Sources */,
3000D8EF145D1029009FC3EC /* PdTypes.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
4 changes: 2 additions & 2 deletions src/ofxPd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
/// note: libpd currently does not support multiple states and it is
/// suggested that you use only one ofxPd object at a time
///
/// also: see PdBase.h for some functions which are not wrapped by ofxPd
///
/// also: see PdBase.h in src/pd/cpp for some functions which are not wrapped by
/// ofxPd and PdTypes.h for small Pd C++ Objects
///
/// differences from libpd C api and/or C++ wrapper:
/// - the ofxPd object is thread safe
Expand Down
2 changes: 1 addition & 1 deletion src/PdBase.cpp → src/pd/cpp/PdBase.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* For information on usage and redistribution, and for a DISCLAIMER OF ALL
* WARRANTIES, see the file, "LICENSE.txt," in this distribution.
*
* See https://github.com/danomatika/PdBase for documentation
* See https://github.com/danomatika/ofxPd for documentation
*
* This project uses libpd, copyrighted by Miller Puckette and others using the
* "Standard Improved BSD License". See the file "LICENSE.txt" in src/pd.
Expand Down
0 src/PdBase.h → src/pd/cpp/PdBase.h
View file
File renamed without changes.
0 src/PdMidiReceiver.h → src/pd/cpp/PdMidiReceiver.h
View file
File renamed without changes.
0 src/PdReceiver.h → src/pd/cpp/PdReceiver.h
View file
File renamed without changes.
0 src/PdTypes.cpp → src/pd/cpp/PdTypes.cpp
View file
File renamed without changes.
0 src/PdTypes.h → src/pd/cpp/PdTypes.h
View file
File renamed without changes.

0 comments on commit d03dd16

Please sign in to comment.