Compiles and runs against njoubert website, but crashed

ptierney · Aug 24, 2011 · d0126a1 · d0126a1
1 parent 01abb1e
commit d0126a1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/src/AdjApp.cpp b/src/AdjApp.cpp
@@ -13,8 +13,11 @@ AdjApp::AdjApp() {
 void AdjApp::prepareSettings(Settings* settings) {
 	//settings->setWindowSize(1024, 768);
 	settings->setFrameRate(60.0f);
-	settings->setResizable(false);
-	settings->setFullScreen(true);
+//	settings->setResizable(false);
+//	settings->setFullScreen(true);
+	settings->setResizable(true);
+	settings->setFullScreen(false);
+
     settings->setTitle("Auto DJ");
 }
 

diff --git a/src/adj/adj_NowPlayingHeadline.cpp b/src/adj/adj_NowPlayingHeadline.cpp
@@ -140,7 +140,7 @@ void NowPlayingHeadline::create_cairo_surface() {
 
     context_->moveTo(ci::Vec2f(side_offset_, top_offset_ + font_size_));
 
-    context_->showText("Vote at dj.ctap.it");
+    context_->showText("Vote at vmworldparty.com");
 
     texture_ = ci::gl::Texture(surface_->getSurface());
 }

diff --git a/src/adj/adj_Song.cpp b/src/adj/adj_Song.cpp
@@ -103,10 +103,10 @@ void SongFactory::parse_song_database_file() {
 
     ci::IStreamUrlRef urlRef;
 
-    std::string url_string = "http://ptierney.com/~patrick/crowdtap.json";
+    std::string url_string = "http://djdp.njoubert.com/songs.json";
 
     try {
-        urlRef = ci::IStreamUrl::createRef(ci::Url(url_string));
+        urlRef = ci::IStreamUrl::createRef(url_string);
     } catch (...) { // it can't connect to the servre
         assert(0); // ffffffffff!
     }

diff --git a/src/adj/adj_VoteManager.cpp b/src/adj/adj_VoteManager.cpp
@@ -49,7 +49,7 @@ void VoteServerQuery::query_vote_server() {
     }
 
     try {
-        urlRef = ci::IStreamUrl::createRef(ci::Url(url_string));
+        urlRef = ci::IStreamUrl::createRef(url_string);
     } catch (...) { // it can't connect to the server
         return;
     }
@@ -82,7 +82,7 @@ void VoteServerQuery::parse_votes(Json::Value& val) {
 VoteManager::VoteManager() {
     query_time_ = 5; // in seconds
     //vote_server_ = "http://ptierney.com/~patrick/votes/votes.cgi";
-    vote_server_ = "http://dj.ctap.it/get_votes.php";
+    vote_server_ = "http://djdp.njoubert.com/get_votes.php";
     thread_finished_ = true;
 	// last_id_ should remain empty on init
 }

diff --git a/xcode/adj.xcodeproj/project.pbxproj b/xcode/adj.xcodeproj/project.pbxproj
@@ -396,7 +396,6 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "adj" */;
 			compatibilityVersion = "Xcode 3.1";
-			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
@@ -530,7 +529,7 @@
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CINDER_PATH = ../../Cinder;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -539,11 +538,14 @@
 					"$(CINDER_PATH)/boost",
 					../include,
 					"$(CINDER_PATH)/include",
+					/opt/local/include,
 				);
+				LIBRARY_SEARCH_PATHS = /opt/local/lib;
 				OTHER_LDFLAGS = "$(CINDER_PATH)/lib/libcinder.a";
 				PREBINDING = NO;
 				SDKROOT = macosx10.6;
 				USER_HEADER_SEARCH_PATHS = "$(CINDER_PATH)/include";
+				VALID_ARCHS = "i386 x86_64";
 			};
 			name = Release;
 		};