Peter Wu
|
a9db94a598
|
conn_http_progressive: correctly set streamname
|
2012-08-31 13:03:32 +02:00 |
|
Peter Wu
|
11b85b36b1
|
Do not prevent user from overriding CXXFLAGS
make CXXFLAGS=-O0 would not work without this.
|
2012-08-31 13:03:32 +02:00 |
|
Thulinma
|
8ada0103dd
|
Merge branch 'master' into development
Conflicts:
lib/dtsc.cpp
|
2012-08-31 10:44:14 +02:00 |
|
Thulinma
|
442abc67a8
|
Merge branch 'master' into development
|
2012-08-31 10:39:42 +02:00 |
|
Thulinma
|
b8a2993c73
|
Implement decent seeking in DTSC::File.
|
2012-08-31 10:39:24 +02:00 |
|
Thulinma
|
c6407b3aa1
|
Made FLV metadata more like most FLV files.
|
2012-08-31 10:38:53 +02:00 |
|
Peter Wu
|
25300c48cd
|
player: faster seek termination detection
Instead of hanging when the gap between two frames is larger than 100ms,
terminate after 5 times of trying.
|
2012-08-30 16:59:49 +02:00 |
|
Peter Wu
|
25b1d31b00
|
player: add "pause" command, small fixes
- position cannot get negative, so use unsigned
- be sure that the read line is null-terminated (for strlen)
- clear buffers to avoid playing old data
|
2012-08-30 16:59:49 +02:00 |
|
Peter Wu
|
f2d142c9c7
|
player: byteseek support
|
2012-08-30 16:59:49 +02:00 |
|
Peter Wu
|
82b7345944
|
player: do not drop trailing packets
|
2012-08-30 16:59:49 +02:00 |
|
Peter Wu
|
ee46a189a6
|
conn_http_progressive: seek support
|
2012-08-30 16:59:49 +02:00 |
|
Peter Wu
|
b592d39bfd
|
player: require "seek" before outputting
|
2012-08-30 16:59:49 +02:00 |
|
Peter Wu
|
96f0ade4ca
|
player: seek fixes
|
2012-08-30 16:59:49 +02:00 |
|
Lekensteyn
|
923d116afa
|
Seek WIP in player
|
2012-08-30 16:59:49 +02:00 |
|
Peter Wu
|
21f6a1fe9d
|
player: initial implementation
|
2012-08-30 16:59:49 +02:00 |
|
Peter Wu
|
beca2400dd
|
Convert to Util::Stream::*
|
2012-08-30 16:42:09 +02:00 |
|
Peter Wu
|
8543c1a678
|
Remove stale compressed.js dependency
|
2012-08-30 16:10:43 +02:00 |
|
Peter Wu
|
cdfd074a1b
|
Bundle server.html so it does not need to get rebuilt
Also remove CLOSUREJAR dependency. This gives less useful error messages, but
ah well...
|
2012-08-30 16:02:44 +02:00 |
|
Peter Wu
|
86fee22565
|
fix make dist
|
2012-08-30 15:30:07 +02:00 |
|
Peter Wu
|
e8a20c146b
|
stream: fix headers and missing static keyword
|
2012-08-30 12:30:11 +02:00 |
|
Peter Wu
|
740d46d4be
|
Fix compile warnings
Todo: error checking for DTSC::File::getHeader
|
2012-08-30 12:26:05 +02:00 |
|
Peter Wu
|
9c0aa93bfd
|
Move Socket::*Stream > Util::Stream::*
|
2012-08-30 12:23:40 +02:00 |
|
Thulinma
|
f9e700c5e1
|
Get length instead of duration when converting to FLV metadata.
|
2012-08-30 11:50:06 +02:00 |
|
Thulinma
|
a995e7215d
|
Only sockets can be shut down.
|
2012-08-30 11:28:36 +02:00 |
|
Thulinma
|
870f71333b
|
Updated socket library to include socket simulation for filedescriptors.
|
2012-08-30 11:19:46 +02:00 |
|
Peter Wu
|
940fb7eb4c
|
Merge branch 'master' into development
|
2012-08-30 11:17:57 +02:00 |
|
Peter Wu
|
f11ce43887
|
Fix compile warnings
Todo: error checking for DTSC::File::getHeader
|
2012-08-30 11:16:49 +02:00 |
|
Peter Wu
|
8fd383115f
|
Fix building of server.html.h, move embed.js.h
|
2012-08-30 11:05:19 +02:00 |
|
Niels Groot Obbink
|
45d9971aca
|
Fixed embed code width/height problems.
|
2012-08-29 16:51:42 +02:00 |
|
Niels Groot Obbink
|
3acbd7cb36
|
Merge branch 'development' of github.com:DDVTECH/DMS into development
|
2012-08-29 16:27:31 +02:00 |
|
Niels Groot Obbink
|
d357065b92
|
moar fixes... D:
|
2012-08-29 16:27:16 +02:00 |
|
Thulinma
|
ce2d2ca83e
|
Fix parsing of xxd output in conn_http.cpp by removing the trailing ";\n"
|
2012-08-29 16:21:12 +02:00 |
|
Niels Groot Obbink
|
8d5d15669f
|
embed.js error fix
|
2012-08-29 16:19:34 +02:00 |
|
Niels Groot Obbink
|
4257ac6634
|
fixed JS parse error
|
2012-08-29 15:56:11 +02:00 |
|
Niels Groot Obbink
|
8c22dab6fd
|
embed code for inclusion in magical http connector... or something.
|
2012-08-29 15:53:50 +02:00 |
|
Thulinma
|
2e5ae34547
|
Exported embed code to separate file.
|
2012-08-29 15:52:55 +02:00 |
|
Niels Groot Obbink
|
728f852bfb
|
embed code for embed http connector... yeah.
|
2012-08-29 15:26:25 +02:00 |
|
Thulinma
|
b151b13f66
|
Improved embeds, controller now stores metadata.
|
2012-08-29 15:02:17 +02:00 |
|
Niels Groot Obbink
|
a04adbca78
|
css bug margin fix
|
2012-08-29 13:12:31 +02:00 |
|
Niels Groot Obbink
|
b20e97f617
|
placeholder fix in FF
|
2012-08-29 11:52:07 +02:00 |
|
Erik Zandvliet
|
0687a6a971
|
Merge branch 'master' into FTP
|
2012-08-29 11:40:52 +02:00 |
|
Erik Zandvliet
|
dc8e96634b
|
Working FTP
|
2012-08-29 11:20:31 +02:00 |
|
Niels Groot Obbink
|
b58e269b46
|
fixed placeholder login bug
|
2012-08-29 10:08:56 +02:00 |
|
Thulinma
|
5e36048eb2
|
Do not include jscompiler.jar in dist packages - require building from source (or a very creative sysadmin, whichever is easier to find/use) for changes to the LSP.
|
2012-08-28 23:54:31 +02:00 |
|
Thulinma
|
b13697db3a
|
Fix dist packages not including lsp directory. *sigh*
|
2012-08-28 23:47:19 +02:00 |
|
Thulinma
|
a2f37a1bbd
|
Add version number as a static member (libver) of Util::Config.
|
2012-08-28 23:39:42 +02:00 |
|
Thulinma
|
7d32d2458a
|
Fix LSP actually compiling. Oops :-)
|
2012-08-28 23:37:49 +02:00 |
|
Thulinma
|
9c368a5a86
|
Integrated LSP into controller - added library version to HTTP server headers, removed some temporary files from git and added them to .gitignore files.
|
2012-08-28 23:24:09 +02:00 |
|
Peter Wu
|
c404624774
|
flv: add duration metadata
|
2012-08-28 17:08:53 +02:00 |
|
Erik Zandvliet
|
f351ca46d8
|
Merge branch 'master' into FTP
|
2012-08-28 15:22:56 +02:00 |
|