Commit graph

151 commits

Author SHA1 Message Date
Pierre Rudloff
29cf3160a0 Merge branch 'develop' into feature/stream
Conflicts:
	composer.lock
2016-07-27 13:21:18 +02:00
Pierre Rudloff
a57a493742 Make curl follow redirects 2016-07-27 03:06:06 +02:00
Pierre Rudloff
aba3d0c9f5 Merge branch 'develop' into feature/stream
Conflicts:
	composer.json
	composer.lock
	controllers/FrontController.php
2016-07-27 02:31:47 +02:00
Pierre Rudloff
3074595b51 Don't use global variables 2016-07-22 14:43:50 +02:00
Pierre Rudloff
cf805740fe Type function arguments 2016-07-22 13:58:33 +02:00
Pierre Rudloff
c92573e3dc Throw exception if required binary is not available 2016-06-15 19:32:53 +02:00
Pierre Rudloff
06282c1aa4 Redirect empty video page to index 2016-06-09 21:15:44 +02:00
Pierre Rudloff
3370695e9e Use https://github.com/slimphp/Slim/pull/1872 in order to support popen streams in Slim 2016-05-25 18:39:48 +02:00
Pierre Rudloff
59291b4b8c Use bestaudio (if available) to speedup conversions 2016-05-04 16:26:47 +02:00
Pierre Rudloff
c3237251da Use only MP3 for audio 2016-05-04 16:13:32 +02:00
Pierre Rudloff
56a94903f5 Don't use the same metadata on every page 2016-05-01 20:29:53 +02:00
Pierre Rudloff
94722841c9 Merge branch 'develop' into feature/stream
Conflicts:
	controllers/FrontController.php
2016-05-01 13:52:45 +02:00
Pierre Rudloff
aba0243fd2 Cleaner error handling 2016-05-01 01:25:08 +02:00
Pierre Rudloff
6ef3105f89 Merge branch 'develop' into feature/stream 2016-04-30 03:23:17 +02:00
Pierre Rudloff
0da1d053d3 Don't convert audio on HEAD requests 2016-04-30 03:22:46 +02:00
Pierre Rudloff
14116168af Merge branch 'develop' into feature/stream
Conflicts:
	composer.json
	composer.lock
2016-04-30 02:36:04 +02:00
Pierre Rudloff
ecba860c5a Use curl in silent mode
Always append curl custom parameters at the end
2016-04-14 12:48:32 +02:00
Pierre Rudloff
d00c1dc91c Use PSR-7 streams for conversion 2016-04-14 12:42:13 +02:00
Pierre Rudloff
63ec60b4ad Slim now handles Content-Length correctly with HTTP streams 2016-04-13 10:44:30 +02:00
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