Commit graph

32 commits

Author SHA1 Message Date
Pierre Rudloff
f7577b9825 Merge branch 'develop' into feature/stream
Conflicts:
	composer.json
	composer.lock
2016-04-13 10:33:51 +02:00
Pierre Rudloff
57a1674f4b Use local rtmpdump 2016-04-12 21:13:43 +02:00
Pierre Rudloff
ac16e68389 Merge branch 'develop' into feature/stream
Conflicts:
	composer.json
	composer.lock
2016-04-12 15:13:50 +02:00
Pierre Rudloff
00dd04e60b Remove quiet flag for rtmpdump 2016-04-12 15:00:27 +02:00
Pierre Rudloff
b787b6d3a2 Use ProcessBuilder to create commands
Fix rtmp audio
2016-04-12 11:49:50 +02:00
Pierre Rudloff
c29285aaf1 Merge branch 'develop' into feature/stream
Conflicts:
	controllers/FrontController.php
2016-04-11 01:22:01 +02:00
Pierre Rudloff
7d548c06b6 More info about formats
Only HTTP formats
2016-04-11 01:21:01 +02:00
Pierre Rudloff
ed7018c957 Use <select> for format list 2016-04-10 21:42:38 +02:00
Pierre Rudloff
91a2f93e5a Merge branch 'develop' into feature/stream 2016-04-10 19:49:57 +02:00
Pierre Rudloff
0ab0819abc Get only scheme part of URL 2016-04-10 19:49:44 +02:00
Pierre Rudloff
8f14843bb4 Merge branch 'develop' into feature/stream
Conflicts:
	controllers/FrontController.php
2016-04-10 19:47:52 +02:00
Pierre Rudloff
20ad5559be Better way to get filename 2016-04-10 19:43:33 +02:00
Pierre Rudloff
442e2ec87c Use bestaudio if available 2016-04-10 19:41:25 +02:00
Pierre Rudloff
39205ebe45 Don't use echo 2016-04-10 19:28:59 +02:00
Pierre Rudloff
c92ea929a4 Better way to get user agent string 2016-04-10 19:02:50 +02:00
Pierre Rudloff
e07474a3dc Don't use $_GET directly 2016-04-09 00:47:51 +02:00
Pierre Rudloff
61a55720a4 Don't include Content-Length for now 2016-04-09 00:12:57 +02:00
Pierre Rudloff
9354174b77 Use bestaudio format if available 2016-04-08 23:01:07 +02:00
Pierre Rudloff
07b0ec9a99 Merge branch 'develop' into feature/stream
Conflicts:
	controllers/FrontController.php
	index.php
2016-04-08 21:11:43 +02:00
Pierre Rudloff
f14bec35ea getURL() should not return an array 2016-04-08 20:08:04 +02:00
Pierre Rudloff
11e8243443 Don't use static functions 2016-04-08 19:06:41 +02:00
Pierre Rudloff
df9f60339d WIP stream 2016-04-07 02:48:36 +02:00
Pierre Rudloff
46032e1ee1 Use PSR-2 2016-03-30 01:49:08 +02:00
Pierre Rudloff
81f32c3e61 Use Slim 3.3 (fixes #49) 2016-03-30 01:39:47 +02:00
Pierre Rudloff
cf9e90ce0d Lint 2016-02-28 23:04:53 +01:00
Pierre Rudloff
c73be59a52 Always use custom arguments (fixes #45)
Custom arguments for curl
2016-02-28 23:00:33 +01:00
Pierre Rudloff
2289de7418 Add line break after redirect error 2015-11-22 19:31:38 +01:00
Pierre Rudloff
0974bf360c Lint 2015-10-31 15:50:32 +01:00
Pierre Rudloff
5249df52e6 YAML config file 2015-10-31 15:42:36 +01:00
Pierre Rudloff
51432dc53e Use Slim for everything 2015-10-31 11:48:14 +01:00
Pierre Rudloff
22cffe4a90 Clean output buffer before using passthru (fixes #37) 2015-10-29 22:56:04 +01:00
Pierre Rudloff
9ffd1d2769 Controllers 2015-10-29 22:32:36 +01:00