Skip to content

Commit cd58ce7

Browse files
LukePulverentiLukePulverenti
authored
Merge pull request #3328 from MediaBrowser/dev
rework width/height properties
2 parents 6c1b3d7 + 08eba08 commit cd58ce7

File tree

88 files changed

+380
-326
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+380
-326
lines changed

‎BDInfo/BDInfo.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
</PropertyGroup>
3535
<ItemGroup>
3636
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
37+
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
3838
</Reference>
3939
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
40+
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
4141
</Reference>
4242
<Reference Include="System" />
4343
<Reference Include="System.Configuration" />

‎BDInfo/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
44
</packages>

‎DvdLib/DvdLib.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
<Compile Include="Ifo\VideoAttributes.cs" />
5050
<Compile Include="Properties\AssemblyInfo.cs" />
5151
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
52+
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
5353
</Reference>
5454
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
55-
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
55+
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
5656
</Reference>
5757
<Reference Include="System" />
5858
<Reference Include="System.Configuration" />

‎DvdLib/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
44
</packages>

‎Emby.Dlna/Didl/DidlBuilder.cs

+1-7
Original file line numberDiff line numberDiff line change
@@ -205,19 +205,13 @@ private void AddVideoResource(DlnaOptions options, XmlWriter writer, BaseItem vi
205205
streamInfo = new StreamBuilder(_mediaEncoder, GetStreamBuilderLogger(options)).BuildVideoItem(new VideoOptions
206206
{
207207
ItemId = video.Id,
208-
MediaSources = sources.ToArray(sources.Count),
208+
MediaSources = sources.ToArray(),
209209
Profile = _profile,
210210
DeviceId = deviceId,
211211
MaxBitrate = _profile.MaxStreamingBitrate
212212
});
213213
}
214214

215-
if (string.Equals(Path.GetExtension(video.Path), ".m2ts", StringComparison.OrdinalIgnoreCase))
216-
{
217-
var a = 1;
218-
var b = a;
219-
}
220-
221215
var targetWidth = streamInfo.TargetWidth;
222216
var targetHeight = streamInfo.TargetHeight;
223217

‎Emby.Dlna/DlnaManager.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public DeviceProfile GetProfile(IDictionary<string, string> headers)
220220
}
221221
else
222222
{
223-
var headerString = string.Join(", ", headers.Select(i => string.Format("{0}={1}", i.Key, i.Value)).ToArray(headers.Count));
223+
var headerString = string.Join(", ", headers.Select(i => string.Format("{0}={1}", i.Key, i.Value)).ToArray());
224224
_logger.Debug("No matching device profile found. {0}", headerString);
225225
}
226226

‎Emby.Dlna/Emby.Dlna.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,13 @@
174174
</ItemGroup>
175175
<ItemGroup>
176176
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
177-
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
177+
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
178178
</Reference>
179179
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
180-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
180+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
181181
</Reference>
182182
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
183-
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
183+
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
184184
</Reference>
185185
<Reference Include="System" />
186186
<Reference Include="System.Configuration" />

‎Emby.Dlna/PlayTo/PlayToController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ private PlaylistItem GetPlaylistItem(BaseItem item, List<MediaSourceInfo> mediaS
551551
StreamInfo = new StreamBuilder(_mediaEncoder, GetStreamBuilderLogger()).BuildVideoItem(new VideoOptions
552552
{
553553
ItemId = item.Id,
554-
MediaSources = mediaSources.ToArray(mediaSources.Count),
554+
MediaSources = mediaSources.ToArray(),
555555
Profile = profile,
556556
DeviceId = deviceId,
557557
MaxBitrate = profile.MaxStreamingBitrate,

‎Emby.Dlna/Server/DescriptionXmlBuilder.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ private string GetFriendlyName()
230230
}
231231
}
232232

233-
var characters = characterList.ToArray(characterList.Count);
233+
var characters = characterList.ToArray();
234234

235235
var serverName = new string(characters);
236236

‎Emby.Dlna/Service/BaseControlHandler.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ private void LogResponse(ControlResponse response)
255255
}
256256

257257
var originalHeaders = response.Headers;
258-
var headers = string.Join(", ", originalHeaders.Select(i => string.Format("{0}={1}", i.Key, i.Value)).ToArray(originalHeaders.Count));
258+
var headers = string.Join(", ", originalHeaders.Select(i => string.Format("{0}={1}", i.Key, i.Value)).ToArray());
259259
//builder.Append(response.Xml);
260260

261261
Logger.Debug("Control response. Headers: {0}", headers);

‎Emby.Dlna/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.49-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.50-beta" targetFramework="net47" />
55
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net47" />
66
</packages>

‎Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
<HintPath>..\packages\ImageMagickSharp.1.0.0.19\lib\net45\ImageMagickSharp.dll</HintPath>
3636
</Reference>
3737
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
38+
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
3939
</Reference>
4040
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
41+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
4242
</Reference>
4343
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
44+
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
4545
</Reference>
4646
<Reference Include="System" />
4747
<Reference Include="System.Core" />

‎Emby.Drawing.ImageMagick/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="ImageMagickSharp" version="1.0.0.19" targetFramework="net452" />
4-
<package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
5-
<package id="MediaBrowser.Server.Core" version="3.3.49-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
5+
<package id="MediaBrowser.Server.Core" version="3.3.50-beta" targetFramework="net47" />
66
</packages>

‎Emby.Drawing.Skia/Emby.Drawing.Skia.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
<Compile Include="StripCollageBuilder.cs" />
4444
<Compile Include="UnplayedCountIndicator.cs" />
4545
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
46+
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
4747
</Reference>
4848
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
49+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
5050
</Reference>
5151
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
52+
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
5353
</Reference>
5454
<Reference Include="System" />
5555
<Reference Include="System.Configuration" />

‎Emby.Drawing.Skia/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.49-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.50-beta" targetFramework="net47" />
55
<package id="SkiaSharp" version="1.58.1" targetFramework="portable45-net45+win8" requireReinstallation="true" />
66
</packages>

‎Emby.Drawing/Emby.Drawing.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
4141
</ItemGroup>
4242
<ItemGroup>
4343
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
44+
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
4545
</Reference>
4646
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
47+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
4848
</Reference>
4949
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
50+
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
5151
</Reference>
5252
<Reference Include="System" />
5353
<Reference Include="System.Configuration" />

‎Emby.Drawing/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.49-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.50-beta" targetFramework="net47" />
55
</packages>

‎Emby.Photos/Emby.Photos.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
</PropertyGroup>
3333
<ItemGroup>
3434
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
35-
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
35+
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
3636
</Reference>
3737
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
38+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
3939
</Reference>
4040
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
41+
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
4242
</Reference>
4343
<Reference Include="TagLib.Portable">
4444
<HintPath>..\ThirdParty\taglib\TagLib.Portable.dll</HintPath>

‎Emby.Photos/PhotoProvider.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public Task<ItemUpdateType> FetchAsync(Photo item, MetadataRefreshOptions option
179179
}
180180
}
181181

182-
if (!item.Width.HasValue || !item.Height.HasValue)
182+
if (item.Width <= 0 || item.Height <= 0)
183183
{
184184
var img = item.GetImageInfo(ImageType.Primary, 0);
185185

‎Emby.Photos/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.49-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.50-beta" targetFramework="net47" />
55
</packages>

‎Emby.Server.Implementations/Browser/BrowserLauncher.cs

+6-19
Original file line numberDiff line numberDiff line change
@@ -13,42 +13,29 @@ public static class BrowserLauncher
1313
/// </summary>
1414
/// <param name="page">The page.</param>
1515
/// <param name="appHost">The app host.</param>
16-
public static void OpenDashboardPage(string page, IServerApplicationHost appHost)
16+
private static void OpenDashboardPage(string page, IServerApplicationHost appHost)
1717
{
1818
var url = appHost.GetLocalApiUrl("localhost") + "/web/" + page;
1919

2020
OpenUrl(appHost, url);
2121
}
2222

23-
/// <summary>
24-
/// Opens the community.
25-
/// </summary>
26-
public static void OpenCommunity(IServerApplicationHost appHost)
27-
{
28-
OpenUrl(appHost, "https://emby.media/community");
29-
}
30-
31-
public static void OpenEmbyPremiere(IServerApplicationHost appHost)
32-
{
33-
OpenDashboardPage("supporterkey.html", appHost);
34-
}
35-
3623
/// <summary>
3724
/// Opens the web client.
3825
/// </summary>
3926
/// <param name="appHost">The app host.</param>
40-
public static void OpenWebClient(IServerApplicationHost appHost)
27+
public static void OpenWizard(IServerApplicationHost appHost)
4128
{
42-
OpenDashboardPage("index.html", appHost);
29+
OpenDashboardPage("index.html?start=wizard", appHost);
4330
}
4431

4532
/// <summary>
46-
/// Opens the dashboard.
33+
/// Opens the web client.
4734
/// </summary>
4835
/// <param name="appHost">The app host.</param>
49-
public static void OpenDashboard(IServerApplicationHost appHost)
36+
public static void OpenWebApp(IServerApplicationHost appHost)
5037
{
51-
OpenDashboardPage("dashboard.html", appHost);
38+
OpenDashboardPage("index.html", appHost);
5239
}
5340

5441
/// <summary>

0 commit comments

Comments
 (0)