Commit Graph

621 Commits

Author SHA1 Message Date
Patrick Barron
be88efce3c Merge branch 'master' into authenticationdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
#	Emby.Server.Implementations/Security/AuthenticationRepository.cs
#	Emby.Server.Implementations/Session/SessionManager.cs
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
#	MediaBrowser.Controller/Net/ISessionContext.cs
2021-06-18 18:56:10 -04:00
Claus Vium
75704effae
Merge pull request #5659 from ssenart/feature/5644-dlna_next_track 2021-05-24 20:35:07 +02:00
Claus Vium
2f9034c94b
Update Emby.Dlna/PlayTo/Device.cs 2021-05-24 19:37:23 +02:00
Claus Vium
e134a3677c
Apply suggestions from code review
Co-authored-by: Cody Robibero <cody@robibe.ro>
2021-05-24 19:29:29 +02:00
Patrick Barron
a225f34796 Merge branch 'master' into authenticationdb-efcore
# Conflicts:
#	Jellyfin.Api/Helpers/RequestHelpers.cs
2021-05-18 18:09:46 -04:00
Bond_009
06caee28b7 Enable nullable reference types for Emby.Dlna 2021-05-07 14:43:50 +02:00
Maxr1998
70771fdcd6
Nullability handling for device profile classes 2021-05-01 13:06:10 +02:00
Bond-009
f4a59c92e6
Merge pull request #5826 from BaronGreenback/ssdpFix
PlayTo Fix: Use external ip not internal interface
2021-04-25 18:51:11 +02:00
Claus Vium
12496677bd
Merge pull request #5861 from BaronGreenback/ProfileMatch
Change profile matching to match what the web interface says.
2021-04-25 17:27:32 +02:00
Bond-009
184e05aeb6
Merge pull request #5681 from BaronGreenback/ContentFeatureOptimization
Various DLNA Optimizations
2021-04-22 16:45:36 +02:00
BaronGreenback
53e1b302cc Changes as requested 2021-04-21 10:18:29 +01:00
BaronGreenback
522d5a7158 Fixed indent 2021-04-20 18:17:48 +01:00
BaronGreenback
41246909dc fixed merge 2021-04-20 18:14:50 +01:00
BaronGreenback
f8b717e7c5
Merge branch 'master' into ProfileMatch 2021-04-20 18:10:38 +01:00
BaronGreenback
7848ea1484 missed one. 2021-04-20 18:08:19 +01:00
BaronGreenback
a99caa0daa Changed testing 2021-04-20 18:05:38 +01:00
BaronGreenback
092c610fbf
Update Emby.Dlna/DlnaManager.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2021-04-20 08:26:41 +01:00
BaronGreenback
4449217f8f simplified isMatch 2021-04-19 14:24:58 +01:00
BaronGreenback
95b733ad4c reworked code 2021-04-19 14:07:14 +01:00
BaronGreenback
c68f616377 Flip fields 2021-04-19 12:36:30 +01:00
BaronGreenback
bc1cc2d04a Remove unused using directives 2021-04-17 11:37:55 +01:00
BaronGreenback
3199d1c902 Fix: PlayTo using external ip not internal 2021-04-15 18:36:47 +01:00
Patrick Barron
8607b52541 Make device/session code async 2021-04-10 16:57:25 -04:00
Bond_009
117736aac9 Fix LogUnmatchedProfile formatting 2021-04-10 17:09:45 +02:00
Bond-009
4f387dca6e
Merge pull request #5598 from cvium/fix_hls_default_values 2021-04-03 19:36:41 +02:00
BaronGreenback
d9a50cb510 Various DLNA Optimizations 2021-04-02 19:06:38 +01:00
Bond_009
aa76957338 Remove useless code 2021-04-01 19:16:00 +02:00
Stéphane Senart
3164781ce0 [5644] [DLNA] [Music] Next track command from any DLNA device does not do anything. 2021-03-30 22:18:32 +02:00
Stéphane Senart
ec113816aa [5644] [DLNA] [Music] Next track command from any DLNA device does not do anything. 2021-03-29 23:43:02 +02:00
Stéphane Senart
a7c82b2681 [5644] [DLNA] [Music] Next track command from any DLNA device does not do anything. 2021-03-29 12:11:38 +02:00
cvium
74e14b4ca5 fix isdirectstream default 2021-03-22 22:34:47 +01:00
cvium
7dedeb6c79 change HLS endpoint defaults to false 2021-03-22 20:53:55 +01:00
BaronGreenback
4bd345fbab DLNA Exception catching 2021-03-22 17:21:12 +00:00
Claus Vium
baa43c6b41
Merge pull request #5475 from BaronGreenback/SSDPFix 2021-03-15 09:06:15 +01:00
Claus Vium
109f24514f
Merge pull request #5510 from BaronGreenback/DlnaFirstFix
Fix: Streaming crashing due to no deviceProfileId match.
2021-03-14 15:07:31 +01:00
Bond_009
a8ed753f6c FxCop -> Net Analyzers (part 2) 2021-03-13 22:33:28 +01:00
BaronGreenback
1d5b7b61fb Change First to FirstOrDefault 2021-03-12 22:20:13 +00:00
BaronGreenback
1dd6036765 Fixed false starts 2021-03-10 19:56:33 +00:00
BaronGreenback
2f843b3b48 Hide msg if dlna disabled 2021-03-10 19:32:13 +00:00
Claus Vium
5592967497
Merge pull request #5403 from BaronGreenback/DLNAProfileFix 2021-03-10 11:50:08 +01:00
Bond_009
9ed7f429c0 FxCop -> Net Analyzers (part 1) 2021-03-09 03:04:47 +01:00
Joshua M. Boniface
3c46f10e3d
Merge pull request #5315 from BaronGreenback/FixFor5280Part2 2021-03-08 18:06:40 -05:00
Joshua M. Boniface
480dd66428
Merge pull request #5402 from Ullmie02/fix-null-size
Use FileShare.None when creating files
2021-03-07 19:37:21 -05:00
BaronGreenback
75c9659e05 Fix unreachable code & assign id to each profile. 2021-03-07 14:17:32 +00:00
David
60ffa6f514 Use FileShare.None when creating files 2021-03-07 14:43:28 +01:00
Bond_009
e8413ed8c0 Use XDocument.LoadAsync instead of XDocument.Parse 2021-03-06 03:33:52 +01:00
BaronGreenback
d819a1d928
Remove Content-Length header from DLNA HEAD request (#5335) 2021-03-03 15:41:18 +01:00
BaronGreenback
caa8e7cdf3 fixed build 2021-02-28 10:16:28 +00:00
Claus Vium
9e77fdc70d
Merge pull request #5312 from BaronGreenback/FixFor5280 2021-02-27 20:01:51 +01:00
BaronGreenback
d95ca20fc7 removed bad merge code 2021-02-27 14:05:13 +00:00
BaronGreenback
a25e3c0256 fix for override ports contained in PublishedServerUrl 2021-02-27 13:56:21 +00:00
Joshua M. Boniface
7ece3c5523
Merge pull request #5273 from Bond-009/warn31 2021-02-22 21:00:46 -05:00
Bond-009
0beda0e32c
Merge pull request #5275 from BaronGreenback/upnpStartupFix
Fixes #5148
2021-02-21 19:59:15 +01:00
BaronGreenback
c50d0dbc72 Fixed startup racing issue 2021-02-20 23:06:48 +00:00
Bond_009
40b9e7592f Fix build 2021-02-20 23:34:15 +01:00
Bond_009
141efafd3d Enable TreatWarningsAsErrors for MediaBrowser.Model 2021-02-20 23:29:33 +01:00
dkanada
13d65318eb
Merge pull request #5223 from Bond-009/minor10
Minor improvements
2021-02-20 10:56:55 +09:00
Bond_009
e9f22303a4 Properly forward cancellationTokens 2021-02-15 14:19:17 +01:00
Bond_009
65bab55ca0 Minor improvements 2021-02-13 00:39:18 +01:00
Troy
8c640a1492 Replaced /d with [0-9], see issue #2923 2021-02-01 02:49:23 +00:00
Claus Vium
b9691e8712
Merge pull request #5025 from BaronGreenback/DlnaFix 2021-01-18 14:24:35 +01:00
BaronGreenback
e81b7c8f4f reverted 2021-01-18 12:17:18 +00:00
BaronGreenback
828a9b7c75 rollback 2021-01-17 23:30:56 +00:00
BaronGreenback
13012bfa27 Fix bug in GetItemId 2021-01-17 22:43:05 +00:00
BaronGreenback
620648fe81 Fixed for no data. 2021-01-15 18:55:52 +00:00
BaronGreenback
16d092a8a7 Fixed encoding issue 2021-01-15 12:17:50 +00:00
Bond-009
a554423163
Merge pull request #4976 from BaronGreenback/dlnaPortFix
Fixed DLNA Server on RC2
2021-01-08 21:06:14 +01:00
BaronGreenback
192efff791
Update DlnaEntryPoint.cs 2021-01-07 17:17:22 +00:00
Bill Thornton
cfca27e99a Fix capitalization of Playstate message 2021-01-05 10:06:55 -05:00
Joshua M. Boniface
ccc1b8bf92
Merge pull request #4729 from BaronGreenback/19.0RC---Fix-networkInterfaceFix 2020-12-30 19:57:53 -05:00
BaronGreenback
4c291da45c
Encoding fix for System Logs. (#4564) 2020-12-30 18:31:26 +01:00
Bond-009
054adf6379
Merge pull request #4853 from Ullmie02/servicestack-json 2020-12-30 10:33:32 +01:00
David
043d045448 Put json serializer options in private field 2020-12-24 11:22:34 +01:00
David
bc0976ceac Remove custom Json serializer from Dlna 2020-12-23 13:14:40 +01:00
Bond-009
3a452463fc
Merge pull request #4849 from crobibero/clean-deps
Remove unused dependencies
2020-12-23 11:51:41 +01:00
crobibero
1dac2226c4 Remove unused deps 2020-12-22 08:57:51 -07:00
BaronGreenback
f06d52c475 Disable API if dlna is disabled. 2020-12-18 23:29:21 +00:00
nyanmisaka
7c3f2e7c59 Correct DLNA audio codecs for PS3 and PS4
* https://manuals.playstation.net/document/en/ps3/current/video/filetypes.html
* https://manuals.playstation.net/document/en/ps4/music/mp_format_m.html
2020-12-16 21:20:29 +08:00
Greenback
d69f2d7d7f DNLA over HTTP only 2020-12-07 22:06:28 +00:00
Greenback
8999871b68 cleaned change 2020-12-07 18:31:45 +00:00
Greenback
d14d8145d5 Fixed createPlayList 2020-12-07 18:27:22 +00:00
Bond_009
e530401462
Remove spammy debug line 2020-12-04 22:15:00 +01:00
Bond_009
e4fd61411f Minor improvements 2020-12-02 15:38:52 +01:00
Bond_009
f6a38e6340 Add tests for GetUuid 2020-12-01 15:12:55 +01:00
BaronGreenback
a8ceb7e20b
Update DlnaEventManager.cs 2020-11-28 23:45:26 +00:00
BaronGreenback
4a67267e1e
Update DlnaEventManager.cs
Set notificationType
2020-11-28 23:44:19 +00:00
Greenback
5224200e8c Fixed baseurl in dlna. 2020-11-21 19:50:40 +00:00
BaronGreenback
7a6063ed41
Merge branch 'master' into NetworkPR2 2020-11-21 00:35:53 +00:00
Greenback
a3e47f3e4e Updated to latest Unstable. 2020-11-19 18:27:18 +00:00
Joshua M. Boniface
212c5318ae
Merge pull request #4507 from BaronGreenback/Spelling
Corrects spelling in comments
2020-11-19 13:08:28 -05:00
Joshua M. Boniface
75d4a573a3
Merge pull request #4137 from BaronGreenback/Comment2
DLNA ConnectionManager - static and commented.
2020-11-19 13:03:37 -05:00
BaronGreenback
7a26f64c7b
Update Device.cs 2020-11-18 13:48:31 +00:00
Greenback
e51ddd326c Fixes spelling. 2020-11-18 13:23:45 +00:00
Bond_009
4b1c9dc9ea Pass cancellation where possible 2020-11-17 19:43:00 +01:00
Joshua M. Boniface
e0f60847c0
Merge pull request #4361 from ssenart/feature/4360-transcoding_flac_downsampling
Add FLAC and define the corresponding target sample rate
2020-11-17 10:29:29 -05:00
Joshua M. Boniface
e86db484ef
Merge pull request #4136 from BaronGreenback/Comment1
DLNA Classes - No code change, just added commenting to classes.
2020-11-16 17:11:20 -05:00
Joshua M. Boniface
355c0c802f
Merge pull request #4138 from BaronGreenback/Comment3
DLNA ContentManager - static and commented.
2020-11-16 17:09:22 -05:00
Greenback
979de240cb Updated tests to .Net5 2020-11-16 17:30:27 +00:00
BaronGreenback
d66f88672c
Merge branch 'master' into NetworkPR2 2020-11-16 16:27:37 +00:00
crobibero
dae4541bad Merge remote-tracking branch 'upstream/master' into dotnet-5 2020-11-15 11:56:35 -07:00
Bond_009
c4bb32f259
Access last element by index where possible 2020-11-14 20:28:14 +01:00
Bond_009
bc7359f87d
Use string.Split(char) where possible instead of string.Split(char[]) 2020-11-14 20:27:48 +01:00
BaronGreenback
27bb17ef9d
Merge branch 'master' into Comment1 2020-11-12 09:18:49 +00:00
crobibero
83629ab6f2 Update packages to net5 2020-11-10 09:52:34 -07:00
Claus Vium
4bccff26f2
Merge pull request #4434 from BaronGreenback/4423
Fixes #4423 - Fixes DLNA in unstable;
2020-11-07 22:13:26 +01:00
BaronGreenback
c6ff56a230
Update BaseControlHandler.cs 2020-11-07 18:59:32 +00:00
Bond_009
b21919c7f4 Minor perf improvements 2020-11-06 16:15:30 +01:00
BaronGreenback
ec245dce90
Merge branch 'master' into NetworkPR2 2020-11-04 20:17:41 +00:00
Anthony Lavado
6205fb4b6a
Merge pull request #4341 from Bond-009/minor6
Minor improvements
2020-11-02 11:10:39 -05:00
Greenback
83af636c61 Updated with new NetManager 2020-10-31 18:21:46 +00:00
Greenback
ec57eeff2b Updated to latest version of code. 2020-10-30 14:06:11 +00:00
BaronGreenback
0b5ddc90ff
Merge branch 'master' into NetworkPR2 2020-10-26 13:21:48 +00:00
Stéphane Senart
5979151f11 [AudioTranscoding] Add FLAC as supported target audio format and be able to define the corresponding target sample rate 2020-10-22 12:22:31 +02:00
Bond_009
5a9c218324 Fix build 2020-10-17 16:27:31 +02:00
Bond_009
49569ca0a0 Use nameof where possible 2020-10-17 16:19:57 +02:00
BaronGreenback
63be65dd91
Merge branch 'master' into Comment1 2020-10-17 15:00:43 +01:00
BaronGreenback
0f47b3ec2d
Merge branch 'master' into Comment4 2020-10-11 21:30:57 +01:00
dkanada
d9e7f1f75f
Merge pull request #4212 from BaronGreenback/BaseControlHandlerFix
Null Pointer fix: BaseControlHandler.cs
2020-10-10 15:52:48 +09:00
Greenback
ebe650afa9 Merge remote-tracking branch 'upstream/master' into NetworkPR2 2020-10-09 14:12:41 +01:00
Bond-009
e011659186
Merge pull request #4210 from nielsvanvelzen/typed-websocket-message
Use enum for WebSocket message types
2020-10-05 10:40:52 +02:00
Jim Cartlidge
53af1e3455 Updatig netcollection & re-inserting BOM 2020-10-04 09:56:33 +01:00
github@esslinger.dev
dd4f3a7c51 feat: convert supportedCommands strings to enums 2020-10-01 18:43:44 +02:00
Jim Cartlidge
fcd1b2f0e4 Merged with latest master 2020-09-30 17:52:33 +01:00
dkanada
206c382b92
Merge pull request #4211 from BaronGreenback/NullPointerFix
Null Pointer Fix : PlayToController.cs
2020-09-28 23:51:24 +09:00
BaronGreenback
ef737a4e8e
Update Emby.Dlna/Configuration/DlnaOptions.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-09-28 07:49:36 +01:00
BaronGreenback
bdfe7554e9
Update Emby.Dlna/Configuration/DlnaOptions.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-09-28 07:49:08 +01:00
Bond-009
43add833cc
Merge pull request #4162 from BaronGreenback/DlnaServerBaseUrlFix
Fix for #4161: BaseUrl in DLNA
2020-09-27 20:01:32 +02:00
Niels van Velzen
72534f9d66 Use SessionMessageType for WebSocket messages 2020-09-27 10:00:20 +02:00
BaronGreenback
7567779127
Update BaseControlHandler.cs 2020-09-25 19:51:37 +01:00
BaronGreenback
63571578ae
Update BaseControlHandler.cs 2020-09-25 19:44:16 +01:00
BaronGreenback
a52ab69e13
Update DescriptionXmlBuilder.cs 2020-09-25 18:47:24 +01:00
BaronGreenback
f3a90bab47
Update DescriptionXmlBuilder.cs 2020-09-25 18:46:52 +01:00
BaronGreenback
12b5f1127e
Update DescriptionXmlBuilder.cs 2020-09-25 18:46:20 +01:00
BaronGreenback
293237b714
Update BaseControlHandler.cs 2020-09-25 18:40:10 +01:00
BaronGreenback
a9864368c4
Update PlayToController.cs 2020-09-25 17:25:50 +01:00
Jim Cartlidge
8c85cfd01d Fixed build 2020-09-24 16:02:29 +01:00
BaronGreenback
28634d3b36
Update DlnaEntryPoint.cs 2020-09-24 15:43:06 +01:00
Jim Cartlidge
5edf24db5c Updated to master 2020-09-24 15:34:30 +01:00
Anthony Lavado
5aa743a6a2
Merge pull request #4163 from Bond-009/minor4
Minor improvements
2020-09-23 10:30:13 -04:00
Anthony Lavado
af24c43118
Merge pull request #4192 from nielsvanvelzen/generalcommand-sucks
Use GeneralCommandType enum in GeneralCommand
2020-09-23 09:57:45 -04:00
Andrew Rabert
5a74710df3 Optimize images
Used:
- `oxipng --zopfli --opt max --strip all`
- `jpegoptim --all-progressive --strip-all`
2020-09-21 17:01:50 -04:00
Niels van Velzen
3459655bb4 Use GeneralCommandType enum in GeneralCommand name 2020-09-21 16:56:22 +02:00
Bond_009
2dbf73b989 Minor improvements 2020-09-16 14:16:44 +02:00
BaronGreenback
d99db543da
Update DescriptionXmlBuilder.cs 2020-09-16 12:08:37 +01:00
BaronGreenback
a6400d12c9
Update DescriptionXmlBuilder.cs 2020-09-16 12:08:23 +01:00
BaronGreenback
c2e2e5ac0c
Update DescriptionXmlBuilder.cs 2020-09-16 12:03:17 +01:00
BaronGreenback
86ad04b657
Update DescriptionXmlBuilder.cs 2020-09-16 12:02:00 +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
c41ed13b3d Commenting. 2020-09-13 14:36:10 +01:00