Skip to content

Commit 7ac4d2f

Browse files
robotconsciencerobotconscience
committed
Merge remote-tracking branch 'origin/0.8.4' into 0.8.4
Conflicts: example_server_echo/example_server_echo.vcxproj example_server_echo/example_server_echo.vcxproj.filters
2 parents 2f2bbaa + c9e1521 commit 7ac4d2f

File tree

54 files changed

+1666
-3149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1666
-3149
lines changed

‎example_client_blob/example_client_blob.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/* Begin PBXBuildFile section */
1010
013561D418D66C41000826E8 /* libturbojpeg.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 013561D318D66C3D000826E8 /* libturbojpeg.dylib */; };
11+
015E6BB719DB18610059D08F /* ofApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 015E6BB519DB18610059D08F /* ofApp.cpp */; };
1112
34A1CD0B670B0A4266464779 /* ofxTurboJpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CC7594CA5E21F32F237CA87E /* ofxTurboJpeg.cpp */; };
1213
6D73A566CFEC0B462FE6E43C /* Reactor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2232A9453E355593EF36ADA7 /* Reactor.cpp */; };
1314
86135253DC7909CA8590E157 /* Protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EEFEC8B85F7C3B15DD45A4 /* Protocol.cpp */; };
@@ -26,7 +27,6 @@
2627
E45BE9830E8CC7DD009D7055 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9790E8CC7DD009D7055 /* OpenGL.framework */; };
2728
E45BE9840E8CC7DD009D7055 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */; };
2829
E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; };
29-
E4B69E210A3A1BDC003C02F2 /* testApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; };
3030
E4C2424710CC5A17004149E2 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424410CC5A17004149E2 /* AppKit.framework */; };
3131
E4C2424810CC5A17004149E2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424510CC5A17004149E2 /* Cocoa.framework */; };
3232
E4C2424910CC5A17004149E2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424610CC5A17004149E2 /* IOKit.framework */; };
@@ -80,6 +80,8 @@
8080

8181
/* Begin PBXFileReference section */
8282
013561D318D66C3D000826E8 /* libturbojpeg.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libturbojpeg.dylib; sourceTree = "<group>"; };
83+
015E6BB519DB18610059D08F /* ofApp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofApp.cpp; sourceTree = "<group>"; };
84+
015E6BB619DB18610059D08F /* ofApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofApp.h; sourceTree = "<group>"; };
8385
2232A9453E355593EF36ADA7 /* Reactor.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = Reactor.cpp; path = ../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/src/Reactor.cpp; sourceTree = SOURCE_ROOT; };
8486
34A70E2C091020EE93F6B1CE /* Events.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = Events.cpp; path = ../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/src/Events.cpp; sourceTree = SOURCE_ROOT; };
8587
57EEFEC8B85F7C3B15DD45A4 /* Protocol.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = Protocol.cpp; path = ../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/src/Protocol.cpp; sourceTree = SOURCE_ROOT; };
@@ -101,8 +103,6 @@
101103
E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
102104
E4B69B5B0A3A1756003C02F2 /* example_client_blobDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example_client_blobDebug.app; sourceTree = BUILT_PRODUCTS_DIR; };
103105
E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = src/main.cpp; sourceTree = SOURCE_ROOT; };
104-
E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = testApp.cpp; path = src/testApp.cpp; sourceTree = SOURCE_ROOT; };
105-
E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = testApp.h; path = src/testApp.h; sourceTree = SOURCE_ROOT; };
106106
E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = "openFrameworks-Info.plist"; sourceTree = "<group>"; };
107107
E4C2424410CC5A17004149E2 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
108108
E4C2424510CC5A17004149E2 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
@@ -306,8 +306,8 @@
306306
isa = PBXGroup;
307307
children = (
308308
E4B69E1D0A3A1BDC003C02F2 /* main.cpp */,
309-
E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */,
310-
E4B69E1F0A3A1BDC003C02F2 /* testApp.h */,
309+
015E6BB519DB18610059D08F /* ofApp.cpp */,
310+
015E6BB619DB18610059D08F /* ofApp.h */,
311311
);
312312
path = src;
313313
sourceTree = SOURCE_ROOT;
@@ -427,12 +427,12 @@
427427
buildActionMask = 2147483647;
428428
files = (
429429
E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */,
430-
E4B69E210A3A1BDC003C02F2 /* testApp.cpp in Sources */,
431430
9EF1133BC23669A5C94FE30F /* jsoncpp.cpp in Sources */,
432431
F3AD9E2A2E56B6AF32A0BDAF /* Server.cpp in Sources */,
433432
6D73A566CFEC0B462FE6E43C /* Reactor.cpp in Sources */,
434433
86135253DC7909CA8590E157 /* Protocol.cpp in Sources */,
435434
F1AC6AEFB9B93C6AC45C9CA8 /* Events.cpp in Sources */,
435+
015E6BB719DB18610059D08F /* ofApp.cpp in Sources */,
436436
A78C77753D562AE8F0E928ED /* Connection.cpp in Sources */,
437437
C6C3882A0B0872D1485F3874 /* Client.cpp in Sources */,
438438
34A1CD0B670B0A4266464779 /* ofxTurboJpeg.cpp in Sources */,

‎example_client_blob/src/main.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "ofMain.h"
2-
#include "testApp.h"
2+
#include "ofApp.h"
33
#include "ofAppGlutWindow.h"
44

55
//========================================================================
@@ -11,6 +11,6 @@ int main( ){
1111
// this kicks off the running of my app
1212
// can be OF_WINDOW or OF_FULLSCREEN
1313
// pass in width and height too:
14-
ofRunApp( new testApp());
14+
ofRunApp( new ofApp());
1515

1616
}

example_client_blob/src/testApp.cpp renamed to example_client_blob/src/ofApp.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#include "testApp.h"
1+
#include "ofApp.h"
22

33
//--------------------------------------------------------------
4-
void testApp::setup(){
4+
void ofApp::setup(){
55
client.connect("localhost", 9093);
66

77
client.addListener(this);
@@ -12,7 +12,7 @@ void testApp::setup(){
1212
}
1313

1414
//--------------------------------------------------------------
15-
void testApp::update(){
15+
void ofApp::update(){
1616
if ( needToLoad ){
1717
// you can write this directly to a file!
1818
// ofFile test;
@@ -27,34 +27,34 @@ void testApp::update(){
2727
}
2828

2929
//--------------------------------------------------------------
30-
void testApp::draw(){
30+
void ofApp::draw(){
3131
if ( incoming.isAllocated() ){
3232
incoming.draw(0,0);
3333
}
3434
}
3535

3636
//--------------------------------------------------------------
37-
void testApp::onConnect( ofxLibwebsockets::Event& args ){
37+
void ofApp::onConnect( ofxLibwebsockets::Event& args ){
3838
ofLogVerbose()<<"on connected";
3939
}
4040

4141
//--------------------------------------------------------------
42-
void testApp::onOpen( ofxLibwebsockets::Event& args ){
42+
void ofApp::onOpen( ofxLibwebsockets::Event& args ){
4343
ofLogVerbose()<<"on open";
4444
}
4545

4646
//--------------------------------------------------------------
47-
void testApp::onClose( ofxLibwebsockets::Event& args ){
47+
void ofApp::onClose( ofxLibwebsockets::Event& args ){
4848
ofLogVerbose()<<"on close";
4949
}
5050

5151
//--------------------------------------------------------------
52-
void testApp::onIdle( ofxLibwebsockets::Event& args ){
52+
void ofApp::onIdle( ofxLibwebsockets::Event& args ){
5353
ofLogVerbose()<<"on idle";
5454
}
5555

5656
//--------------------------------------------------------------
57-
void testApp::onMessage( ofxLibwebsockets::Event& args ){
57+
void ofApp::onMessage( ofxLibwebsockets::Event& args ){
5858
if ( locked ) return;
5959
// need to load this next frame!
6060
//cout << args.isBinary << ":" << args.size << endl;
@@ -65,52 +65,52 @@ void testApp::onMessage( ofxLibwebsockets::Event& args ){
6565
}
6666

6767
//--------------------------------------------------------------
68-
void testApp::onBroadcast( ofxLibwebsockets::Event& args ){
68+
void ofApp::onBroadcast( ofxLibwebsockets::Event& args ){
6969
cout<<"got broadcast "<<args.message<<endl;
7070
}
7171

7272
//--------------------------------------------------------------
73-
void testApp::keyPressed(int key){
73+
void ofApp::keyPressed(int key){
7474

7575
client.send("Hello");
7676
cout << "sending hello" <<endl;
7777
}
7878

7979
//--------------------------------------------------------------
80-
void testApp::keyReleased(int key){
80+
void ofApp::keyReleased(int key){
8181

8282
}
8383

8484
//--------------------------------------------------------------
85-
void testApp::mouseMoved(int x, int y ){
85+
void ofApp::mouseMoved(int x, int y ){
8686

8787
}
8888

8989
//--------------------------------------------------------------
90-
void testApp::mouseDragged(int x, int y, int button){
90+
void ofApp::mouseDragged(int x, int y, int button){
9191

9292
}
9393

9494
//--------------------------------------------------------------
95-
void testApp::mousePressed(int x, int y, int button){
95+
void ofApp::mousePressed(int x, int y, int button){
9696
}
9797

9898
//--------------------------------------------------------------
99-
void testApp::mouseReleased(int x, int y, int button){
99+
void ofApp::mouseReleased(int x, int y, int button){
100100

101101
}
102102

103103
//--------------------------------------------------------------
104-
void testApp::windowResized(int w, int h){
104+
void ofApp::windowResized(int w, int h){
105105

106106
}
107107

108108
//--------------------------------------------------------------
109-
void testApp::gotMessage(ofMessage msg){
109+
void ofApp::gotMessage(ofMessage msg){
110110

111111
}
112112

113113
//--------------------------------------------------------------
114-
void testApp::dragEvent(ofDragInfo dragInfo){
114+
void ofApp::dragEvent(ofDragInfo dragInfo){
115115

116116
}

example_client_blob/src/testApp.h renamed to example_client_blob/src/ofApp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// 4 - Make sure the dylib is copied to the "executables" directory!
1212
#include "ofxTurboJpeg.h"
1313

14-
class testApp : public ofBaseApp{
14+
class ofApp : public ofBaseApp{
1515

1616
public:
1717
void setup();

0 commit comments

Comments
 (0)