alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-26 17:40:30 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

updated nuget

Browse Source
This commit is contained in:
Luke Pulverenti
2014-07-27 18:01:29 -04:00
parent 37c27a26e9
commit 063675bb07
58 changed files with 404 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
MediaBrowser.Model/ApiClient/IApiClient.cs
View File

@@ -226,7 +226,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="userId">The user identifier.</param>
/// <returns>Task{BaseItemDto[]}.</returns>
Task<ItemsResult> GetAdditionalParts(string itemId, string userId);
/// <summary>
/// Gets the users async.
/// </summary>
@@ -253,7 +253,7 @@ namespace MediaBrowser.Model.ApiClient
/// </summary>
/// <returns>Task{SessionInfoDto}.</returns>
Task<SessionInfoDto> GetCurrentSessionAsync(CancellationToken cancellationToken);
/// <summary>
/// Gets the item counts async.
/// </summary>
@@ -368,7 +368,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="query">The query.</param>
/// <returns>Task{ItemsResult}.</returns>
Task<ItemsResult> GetAlbumArtistsAsync(ArtistsQuery query);
/// <summary>
/// Gets a studio
/// </summary>
@@ -467,6 +467,13 @@ namespace MediaBrowser.Model.ApiClient
/// <returns>Task{SystemInfo}.</returns>
Task<SystemInfo> GetSystemInfoAsync(CancellationToken cancellationToken);
/// <summary>
/// Gets the public system information asynchronous.
/// </summary>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task&lt;PublicSystemInfo&gt;.</returns>
Task<PublicSystemInfo> GetPublicSystemInfoAsync(CancellationToken cancellationToken);
/// <summary>
/// Gets a person
/// </summary>
@@ -672,7 +679,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="index">The index.</param>
/// <returns>Task.</returns>
Task SetSubtitleStreamIndex(string sessionId, int? index);
/// <summary>
/// Instructs the client to display a message to the user
/// </summary>
@@ -772,23 +779,16 @@ namespace MediaBrowser.Model.ApiClient
IJsonSerializer JsonSerializer { get; set; }
/// <summary>
/// Gets or sets the server host name (myserver or 192.168.x.x)
/// Gets or sets the server address
/// </summary>
/// <value>The name of the server host.</value>
string ServerHostName { get; }
/// <summary>
/// Gets or sets the port number used by the API
/// </summary>
/// <value>The server API port.</value>
int ServerApiPort { get; }
/// <value>The server address.</value>
string ServerAddress { get; }
/// <summary>
/// Changes the server location.
/// </summary>
/// <param name="hostName">Name of the host.</param>
/// <param name="apiPort">The API port.</param>
void ChangeServerLocation(string hostName, int apiPort);
/// <param name="address">The address.</param>
void ChangeServerLocation(string address);
/// <summary>
/// Gets or sets the type of the client.
@@ -812,7 +812,31 @@ namespace MediaBrowser.Model.ApiClient
/// Gets or sets the current user id.
/// </summary>
/// <value>The current user id.</value>
string CurrentUserId { get; set; }
string CurrentUserId { get; }
/// <summary>
/// Gets the access token.
/// </summary>
/// <value>The access token.</value>
string AccessToken { get; }
/// <summary>
/// Sets the authentication information.
/// </summary>
/// <param name="accessToken">The access token.</param>
/// <param name="userId">The user identifier.</param>
void SetAuthenticationInfo(string accessToken, string userId);
/// <summary>
/// Sets the authentication information.
/// </summary>
/// <param name="accessToken">The access token.</param>
void SetAuthenticationInfo(string accessToken);
/// <summary>
/// Clears the authentication information.
/// </summary>
void ClearAuthenticationInfo();
/// <summary>
/// Gets the image URL.
@@ -853,7 +877,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="options">The options.</param>
/// <returns>System.String.</returns>
string GetSubtitleUrl(SubtitleDownloadOptions options);
/// <summary>
/// Gets an image url that can be used to download an image from the api
/// </summary>

22
MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs Normal file
View File

@@ -0,0 +1,22 @@

namespace MediaBrowser.Model.ApiClient
{
public class ServerDiscoveryInfo
{
/// <summary>
/// Gets or sets the address.
/// </summary>
/// <value>The address.</value>
public string Address { get; set; }
/// <summary>
/// Gets or sets the server identifier.
/// </summary>
/// <value>The server identifier.</value>
public string Id { get; set; }
/// <summary>
/// Gets or sets the name.
/// </summary>
/// <value>The name.</value>
public string Name { get; set; }
}
}

1
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@@ -304,7 +304,6 @@ namespace MediaBrowser.Model.Configuration
};
SubtitleOptions = new SubtitleOptions();
LiveTvOptions = new LiveTvOptions();
TvFileOrganizationOptions = new TvFileOrganizationOptions();
}
}

24
MediaBrowser.Model/Dlna/AudioOptions.cs
View File

@@ -35,5 +35,29 @@ namespace MediaBrowser.Model.Dlna
/// </summary>
/// <value>The context.</value>
public EncodingContext Context { get; set; }
/// <summary>
/// Gets the maximum bitrate.
/// </summary>
/// <returns>System.Nullable&lt;System.Int32&gt;.</returns>
public int? GetMaxBitrate()
{
if (MaxBitrate.HasValue)
{
return MaxBitrate;
}
if (Profile != null)
{
if (Context == EncodingContext.Static)
{
return Profile.MaxStaticBitrate;
}
return Profile.MaxStreamingBitrate;
}
return null;
}
}
}

5
MediaBrowser.Model/Dlna/DeviceProfile.cs
View File

@@ -49,8 +49,9 @@ namespace MediaBrowser.Model.Dlna
public int? MaxIconWidth { get; set; }
public int? MaxIconHeight { get; set; }
public int? MaxBitrate { get; set; }
public int? MaxStreamingBitrate { get; set; }
public int? MaxStaticBitrate { get; set; }
/// <summary>
/// Controls the content of the X_DLNADOC element in the urn:schemas-dlna-org:device-1-0 namespace.
/// </summary>

4
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@@ -105,7 +105,7 @@ namespace MediaBrowser.Model.Dlna
RunTimeTicks = item.RunTimeTicks
};
int? maxBitrateSetting = options.MaxBitrate ?? options.Profile.MaxBitrate;
int? maxBitrateSetting = options.GetMaxBitrate();
MediaStream audioStream = item.DefaultAudioStream;
@@ -243,7 +243,7 @@ namespace MediaBrowser.Model.Dlna
MediaStream videoStream = item.VideoStream;
int? maxBitrateSetting = options.MaxBitrate ?? options.Profile.MaxBitrate;
int? maxBitrateSetting = options.GetMaxBitrate();
if (IsEligibleForDirectPlay(item, maxBitrateSetting, subtitleStream, options))
{

1
MediaBrowser.Model/MediaBrowser.Model.csproj
View File

@@ -64,6 +64,7 @@
<Compile Include="ApiClient\ApiClientExtensions.cs" />
<Compile Include="ApiClient\IServerEvents.cs" />
<Compile Include="ApiClient\GeneralCommandEventArgs.cs" />
<Compile Include="ApiClient\ServerDiscoveryInfo.cs" />
<Compile Include="ApiClient\SessionUpdatesEventArgs.cs" />
<Compile Include="Branding\BrandingOptions.cs" />
<Compile Include="Channels\ChannelFeatures.cs" />

2
MediaBrowser.Model/Sync/SyncJobStatus.cs
View File

@@ -6,7 +6,7 @@ namespace MediaBrowser.Model.Sync
Queued = 0,
Transcoding = 1,
TranscodingFailed = 2,
Transfering = 3,
Transferring = 3,
Completed = 4,
Cancelled = 5
}

41
MediaBrowser.Model/System/SystemInfo.cs
View File

@@ -6,14 +6,8 @@ namespace MediaBrowser.Model.System
/// <summary>
/// Class SystemInfo
/// </summary>
public class SystemInfo
public class SystemInfo : PublicSystemInfo
{
/// <summary>
/// Gets or sets the version.
/// </summary>
/// <value>The version.</value>
public string Version { get; set; }
/// <summary>
/// Gets or sets the operating sytem.
/// </summary>
@@ -86,12 +80,6 @@ namespace MediaBrowser.Model.System
/// <value>The failed assembly loads.</value>
public List<string> FailedPluginAssemblies { get; set; }
/// <summary>
/// Gets or sets the id.
/// </summary>
/// <value>The id.</value>
public string Id { get; set; }
/// <summary>
/// Gets or sets the program data path.
/// </summary>
@@ -152,12 +140,6 @@ namespace MediaBrowser.Model.System
/// <value><c>true</c> if [supports automatic run at startup]; otherwise, <c>false</c>.</value>
public bool SupportsAutoRunAtStartup { get; set; }
/// <summary>
/// Gets or sets the name of the server.
/// </summary>
/// <value>The name of the server.</value>
public string ServerName { get; set; }
/// <summary>
/// Initializes a new instance of the <see cref="SystemInfo" /> class.
/// </summary>
@@ -170,4 +152,25 @@ namespace MediaBrowser.Model.System
FailedPluginAssemblies = new List<string>();
}
}
public class PublicSystemInfo
{
/// <summary>
/// Gets or sets the name of the server.
/// </summary>
/// <value>The name of the server.</value>
public string ServerName { get; set; }
/// <summary>
/// Gets or sets the version.
/// </summary>
/// <value>The version.</value>
public string Version { get; set; }
/// <summary>
/// Gets or sets the id.
/// </summary>
/// <value>The id.</value>
public string Id { get; set; }
}
}

6
MediaBrowser.Model/Users/AuthenticationResult.cs
View File

@@ -22,5 +22,11 @@ namespace MediaBrowser.Model.Users
/// </summary>
/// <value>The authentication token.</value>
public string AccessToken { get; set; }
/// <summary>
/// Gets or sets the server identifier.
/// </summary>
/// <value>The server identifier.</value>
public string ServerId { get; set; }
}
}