diff options
Diffstat (limited to 'chipmachine-1.3c-fixed-against-latest-apone.patch')
-rw-r--r-- | chipmachine-1.3c-fixed-against-latest-apone.patch | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/chipmachine-1.3c-fixed-against-latest-apone.patch b/chipmachine-1.3c-fixed-against-latest-apone.patch deleted file mode 100644 index a6e7f42f83d5..000000000000 --- a/chipmachine-1.3c-fixed-against-latest-apone.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 44ed091a4305b2231595bd7f62c11803eb66aeb7 Mon Sep 17 00:00:00 2001 -From: Jonas Minnberg <sasq64@gmail.com> -Date: Sat, 11 Jun 2016 17:10:30 +0200 -Subject: [PATCH] Fixed against latest apone - ---- - CMakeLists.txt | 4 ++-- - src/RemoteLoader.cpp | 6 +++--- - src/RemoteLoader.h | 4 ++-- - 3 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 75de5dd..7d201d1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,8 +6,8 @@ include(${AP1_ROOT}/cmake/Utils.cmake) - - add_definitions(-DAPP_NAME=chipmachine) - --set(CMAKE_OSX_SYSROOT /Users/jonasm/MacOSX10.9.sdk) --set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9") -+# set(CMAKE_OSX_SYSROOT /Users/jonasm/MacOSX10.9.sdk) -+# set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9") - - if(RASPBERRYPI) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv6 -mfpu=vfp -mfloat-abi=hard") -diff --git a/src/RemoteLoader.cpp b/src/RemoteLoader.cpp -index 80a9a2c..0aca3ab 100644 ---- a/src/RemoteLoader.cpp -+++ b/src/RemoteLoader.cpp -@@ -81,7 +81,7 @@ bool RemoteLoader::load(const std::string &p, function<void(File f)> done_cb) { - url = url.substr(0, url.length() - 4); - } - -- lastSession = webgetter.getFile(url, [=](webutils::Web::Job job) { -+ lastSession = webgetter.getFile(url, [=](webutils::WebJob job) { - LOGD("CODE %d", job.code()); - auto f = job.file(); - string fileName = f.getName(); -@@ -97,7 +97,7 @@ bool RemoteLoader::load(const std::string &p, function<void(File f)> done_cb) { - - void RemoteLoader::preCache(const std::string &path) {} - --std::shared_ptr<webutils::Web::Job> -+std::shared_ptr<webutils::WebJob> - RemoteLoader::stream(const std::string &p, - std::function<bool(int what, const uint8_t *data, int size)> data_cb) { - -@@ -119,7 +119,7 @@ RemoteLoader::stream(const std::string &p, - string url = source.url + path; - bool headers = false; - lastSession = webgetter.streamData( -- url, [=](webutils::Web::Job &job, uint8_t *data, int size) mutable -> bool { -+ url, [=](webutils::WebJob &job, uint8_t *data, int size) mutable -> bool { - if(!headers) { - string s = job.getHeader("icy-metaint"); - if(s != "") { -diff --git a/src/RemoteLoader.h b/src/RemoteLoader.h -index 05d9086..eb46da3 100644 ---- a/src/RemoteLoader.h -+++ b/src/RemoteLoader.h -@@ -17,7 +17,7 @@ class RemoteLoader { - - bool load(const std::string &path, std::function<void(utils::File)> done_cb); - -- std::shared_ptr<webutils::Web::Job> -+ std::shared_ptr<webutils::WebJob> - stream(const std::string &path, - std::function<bool(int what, const uint8_t *data, int size)> data_cb); - -@@ -55,7 +55,7 @@ class RemoteLoader { - std::unordered_map<std::string, Source> sources; - - webutils::Web webgetter; -- std::shared_ptr<webutils::Web::Job> lastSession; -+ std::shared_ptr<webutils::WebJob> lastSession; - }; - - #endif // REMOTE_LOADER_H |