Commit Graph

108 Commits

Author SHA1 Message Date
Greenback
6dc2936d9c Merge remote-tracking branch 'upstream/master' into NetworkPR2 2020-10-30 13:54:46 +00:00
Bond-009
9e9431d829
Merge pull request #4384 from nyanmisaka/ios-hls-bitrate
Fix HLS music playback on iOS
2020-10-28 16:29:34 +01:00
nyanmisaka
c91f42c7a0 Default output audio bitrate to 128k 2020-10-28 22:27:08 +08:00
crobibero
4558c192c7 Merge remote-tracking branch 'upstream/master' into query-image-type 2020-10-27 13:25:57 -06:00
BaronGreenback
0b5ddc90ff
Merge branch 'master' into NetworkPR2 2020-10-26 13:21:48 +00:00
Cody Robibero
163d6b0f1d
Update Jellyfin.Api/Helpers/RequestHelpers.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2020-10-11 06:15:55 -06:00
crobibero
2eafbc03e4 fix build 2020-10-09 18:01:12 -06:00
crobibero
27e753ddb4 Convert image type string to enum. 2020-10-09 17:52:39 -06:00
crobibero
549f2284ad Convert filters string to enum. 2020-10-09 17:41:17 -06:00
Greenback
ebe650afa9 Merge remote-tracking branch 'upstream/master' into NetworkPR2 2020-10-09 14:12:41 +01:00
Greenback
deb4d27857 Moved all settings across to network.xml 2020-10-08 19:00:55 +01:00
BaronGreenback
7f1ec1b569
Update MediaInfoHelper.cs 2020-10-04 10:03:34 +01:00
BaronGreenback
eaf684a68c
Update DynamicHlsHelper.cs 2020-10-04 10:02:35 +01:00
KonH
211c9cd608 Remove unnecessary null checks in some places
Related to https://github.com/jellyfin/jellyfin/issues/2149
2020-10-03 22:03:23 +07:00
Jim Cartlidge
5edf24db5c Updated to master 2020-09-24 15:34:30 +01:00
Anthony Lavado
25bfef58fc
Merge pull request #4187 from BaronGreenback/FFMPegErrorMsg
Fix for #4184 when no FFMPEG path set.
2020-09-23 10:05:14 -04:00
BaronGreenback
bbf196c7bd
Update TranscodingJobHelper.cs 2020-09-19 16:44:35 +01:00
BaronGreenback
9fc1a8b619
Inverted if statement 2020-09-17 18:20:27 +01:00
Jim Cartlidge
38b8110a3e Removing blank lines. 2020-09-14 15:55:25 +01:00
Jim Cartlidge
b44455ad0d Update based on PR1 changes. 2020-09-14 15:46:38 +01:00
Jim Cartlidge
9ef79d190b Large number of files 2020-09-12 16:41:37 +01:00
cvium
cb173d79e6 Fix the test 2020-09-10 14:30:33 +02:00
cvium
7576824cee Standardize use of IsLocal and RemoteIp 2020-09-10 14:16:41 +02:00
BaronGreenback
15e064cb73
Update StreamingHelpers.cs 2020-09-05 22:09:21 +01:00
BaronGreenback
f7a56f70c6
Update StreamingHelpers.cs 2020-09-05 21:31:23 +01:00
BaronGreenback
3c13489cb9
Update StreamingHelpers.cs 2020-09-05 21:31:05 +01:00
BaronGreenback
25e965b85c
Update FileStreamResponseHelpers.cs 2020-09-05 20:33:18 +01:00
BaronGreenback
d3e8834e80
Removed memoryStream 2020-09-05 20:03:21 +01:00
BaronGreenback
ac7636ea1e
added dlnaheaders
fix for #4059
2020-09-05 19:54:48 +01:00
David
4836f14aff Enable HTTP Range Processing 2020-09-05 10:38:16 +02:00
crobibero
fb422ff741 Merge remote-tracking branch 'upstream/master' into http-client-migrate 2020-09-03 07:46:52 -06:00
crobibero
dd078e7b82 use named client 2020-08-31 11:05:21 -06:00
Bond-009
32f8b46040 Fix incorrect usage of ArrayPool 2020-08-31 11:09:41 +02:00
crobibero
5f64ab02a0 bump System.Text.Json 2020-08-25 07:33:58 -06:00
Anthony Lavado
634ee2d1e9
Merge pull request #3861 from crobibero/fixes
API Fixes
2020-08-19 08:17:03 -04:00
Cody Robibero
3a722740ce
Update Jellyfin.Api/Helpers/MediaInfoHelper.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2020-08-19 04:53:25 -06:00
crobibero
4ec1341c8f Fix conflicts 2020-08-17 15:54:51 -06:00
crobibero
be67528958 add disposal docs 2020-08-17 15:03:45 -06:00
crobibero
767c73e5c1 fix usings 2020-08-17 13:22:42 -06:00
crobibero
c5e9cf15f6 Use proper IHttpContextAccessor 2020-08-10 07:53:32 -06:00
crobibero
460c3dd351 convert dependent controller functions to di helper class 2020-08-09 17:20:14 -06:00
crobibero
1535f363b2 Fix some request parameters 2020-08-03 13:33:43 -06:00
Patrick Barron
6a42a48c09
Merge pull request #3528 from Ullmie02/api-entrypoint
Make TranscodingJobHelper an IDisposable (api-migration)
2020-08-03 17:11:24 +00:00
David
3f0c0e2d0d Implement IDisposable 2020-08-01 16:21:48 +02:00
David
b717ecd5e0 Move methods to the right class 2020-08-01 16:12:22 +02:00
crobibero
f645e2f884 Move DynamicHlsService to Jellyfin.Api 2020-07-31 15:09:17 -06:00
Patrick Barron
2cb6eb984b
Merge pull request #3764 from Ullmie02/api-videohls
Move VideoHlsService to Jellyfin.Api
2020-07-31 18:25:54 +00:00
crobibero
c97372a133 Add missing docs and remove duplicate function 2020-07-31 09:21:33 -06:00
crobibero
9171e904de Merge remote-tracking branch 'upstream/api-migration' into api-video 2020-07-31 09:19:02 -06:00
David
8a016e31f7 Move VideoHlsService to Jellyfin.Api 2020-07-31 17:09:10 +02:00