OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
  • HTTPS

switch: Commit


Commit MetaInfo

Revision915 (tree)
Time2015-01-07 22:58:48
Authorloopsketch

Log Message

(empty log message)

Change Summary

Incremental Difference

--- switch/trunk/src/svvitch/HTTPServerBase.cpp (revision 914)
+++ switch/trunk/src/svvitch/HTTPServerBase.cpp (revision 915)
@@ -122,46 +122,48 @@
122122 if (is.good()) {
123123 string ext = path.getExtension();
124124 File f(path);
125- File::FileSize length = f.getSize();
126- response().setContentLength(static_cast<int>(length));
127- if (ext == "png") {
128- response().setContentType("image/png");
129- } else if (ext == "jpg" || ext == "jpeg") {
130- response().setContentType("image/jpeg");
131- } else if (ext == "bmp") {
132- response().setContentType("image/bmp");
133- } else if (ext == "gif") {
134- response().setContentType("image/gif");
135- } else if (ext == "mpg" || ext == "mpeg") {
136- response().setContentType("video/mpeg");
137- } else if (ext == "mp4" || ext == "f4v" || ext == "264") {
138- response().setContentType("video/mp4");
139- } else if (ext == "wmv") {
140- response().setContentType("video/x-ms-wmv");
141- } else if (ext == "mov") {
142- response().setContentType("video/quicktime");
143- } else if (ext == "flv") {
144- response().setContentType("video/x-flv");
145- } else if (ext == "swf") {
146- response().setContentType("application/x-shockwave-flash");
147- } else if (ext == "pdf") {
148- response().setContentType("application/pdf");
149- } else if (ext == "txt") {
150- response().setContentType("text/plain");
151- } else if (ext == "htm" || ext == "html") {
152- response().setContentType("text/html");
153- } else if (ext == "xml") {
154- response().setContentType("text/xml");
155- } else {
156- response().setContentType("application/octet-stream");
125+ if (f.exists()) {
126+ File::FileSize length = f.getSize();
127+ response().setContentLength(static_cast<int>(length));
128+ if (ext == "png") {
129+ response().setContentType("image/png");
130+ } else if (ext == "jpg" || ext == "jpeg") {
131+ response().setContentType("image/jpeg");
132+ } else if (ext == "bmp") {
133+ response().setContentType("image/bmp");
134+ } else if (ext == "gif") {
135+ response().setContentType("image/gif");
136+ } else if (ext == "mpg" || ext == "mpeg") {
137+ response().setContentType("video/mpeg");
138+ } else if (ext == "mp4" || ext == "f4v" || ext == "264") {
139+ response().setContentType("video/mp4");
140+ } else if (ext == "wmv") {
141+ response().setContentType("video/x-ms-wmv");
142+ } else if (ext == "mov") {
143+ response().setContentType("video/quicktime");
144+ } else if (ext == "flv") {
145+ response().setContentType("video/x-flv");
146+ } else if (ext == "swf") {
147+ response().setContentType("application/x-shockwave-flash");
148+ } else if (ext == "pdf") {
149+ response().setContentType("application/pdf");
150+ } else if (ext == "txt") {
151+ response().setContentType("text/plain");
152+ } else if (ext == "htm" || ext == "html") {
153+ response().setContentType("text/html");
154+ } else if (ext == "xml") {
155+ response().setContentType("text/xml");
156+ } else {
157+ response().setContentType("application/octet-stream");
158+ }
159+ response().setChunkedTransferEncoding(false);
160+ response().add("Access-Control-Allow-Origin", "*"); // for chrome xhr
161+ response().add("Access-Control-Allow-Headers", "X-Requested-With"); // chrome xhr
162+
163+ Poco::StreamCopier::copyStream(is, response().send(), 512 * 1024);
164+ is.close();
165+ return true;
157166 }
158- response().setChunkedTransferEncoding(false);
159- response().add("Access-Control-Allow-Origin", "*"); // for chrome xhr
160- response().add("Access-Control-Allow-Headers", "X-Requested-With"); // chrome xhr
161-
162- Poco::StreamCopier::copyStream(is, response().send(), 512 * 1024);
163- is.close();
164- return true;
165167 } else {
166168 throw Poco::OpenFileException(path.toString());
167169 }
@@ -224,7 +226,7 @@
224226 }
225227 } else {
226228 response().setContentType("text/html; charset=UTF-8");
227- response().send() << message;
229+ response().send() << message << std::endl;
228230 }
229231 response().send().flush();
230232 }
--- switch/trunk/src/svvitch/flash.h (revision 914)
+++ switch/trunk/src/svvitch/flash.h (revision 915)
@@ -1,7 +1,7 @@
11 #pragma once
22
33 /**
4- * Flashのコンポーネントを利用するためのヘッダ集
4+ * Flash?ｽﾌコ?ｽ?ｽ?ｽ|?ｽ[?ｽl?ｽ?ｽ?ｽg?ｽ??p?ｽ?ｽ?ｽ驍ｽ?ｽﾟのヘ?ｽb?ｽ_?ｽW
55 */
66 #ifdef UNICODE
77 #define FormatMessage FormatMessageW
@@ -23,7 +23,8 @@
2323 #include <atlbase.h>
2424
2525 #pragma warning(disable: 4192)
26-#import <C:\\Windows\\SysWOW64\\Macromed\\Flash\\Flash32_11_6_602_180.ocx> named_guids
26+#import <C:\\Windows\\SysWOW64\\Macromed\\Flash\\Flash32_15_0_0_246.ocx> named_guids
27+//#import <C:\\Windows\\SysWOW64\\Macromed\\Flash\\Flash32_11_7_700_224.ocx> named_guids
2728 //#import <C:\\WINDOWS\\system32\\Macromed\\Flash\\Flash64_11_1_102.ocx> named_guids
2829 #pragma warning(default: 4192)
2930
--- switch/trunk/src/svvitch/FFMovieContent.cpp (revision 914)
+++ switch/trunk/src/svvitch/FFMovieContent.cpp (revision 915)
@@ -223,6 +223,7 @@
223223 _current = media->start() * 60 / 1000;
224224 if (media->duration() > 0) _duration = media->duration() * 60 / 1000;
225225 set("alpha", 1.0f);
226+ set("aspect-mode", media->getProperty("aspect-mode", ""));
226227 _starting = false;
227228 _finished = false;
228229 return true;
--- switch/trunk/src/svvitch/Utils.cpp (revision 914)
+++ switch/trunk/src/svvitch/Utils.cpp (revision 915)
@@ -30,7 +30,7 @@
3030
3131
3232 const string svvitch::version() {
33- return "1.10";
33+ return "1.11";
3434 }
3535
3636 bool svvitch::readFile(const string& fileName, LPVOID* ref) {
Show on old repository browser