mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 03:26:07 +02:00
update osx ffmpeg
This commit is contained in:
parent
b5842f9f19
commit
4ef688e432
2 changed files with 35 additions and 7 deletions
|
@ -65,6 +65,9 @@ namespace MediaBrowser.Dlna.ContentDirectory
|
|||
if (string.Equals(methodName, "GetSortCapabilities", StringComparison.OrdinalIgnoreCase))
|
||||
return HandleGetSortCapabilities();
|
||||
|
||||
if (string.Equals(methodName, "GetSortExtensionCapabilities", StringComparison.OrdinalIgnoreCase))
|
||||
return HandleGetSortExtensionCapabilities();
|
||||
|
||||
if (string.Equals(methodName, "GetSystemUpdateID", StringComparison.OrdinalIgnoreCase))
|
||||
return HandleGetSystemUpdateID();
|
||||
|
||||
|
@ -74,6 +77,9 @@ namespace MediaBrowser.Dlna.ContentDirectory
|
|||
if (string.Equals(methodName, "X_GetFeatureList", StringComparison.OrdinalIgnoreCase))
|
||||
return HandleXGetFeatureList();
|
||||
|
||||
if (string.Equals(methodName, "GetFeatureList", StringComparison.OrdinalIgnoreCase))
|
||||
return HandleGetFeatureList();
|
||||
|
||||
if (string.Equals(methodName, "X_SetBookmark", StringComparison.OrdinalIgnoreCase))
|
||||
return HandleXSetBookmark(methodParams, user);
|
||||
|
||||
|
@ -110,7 +116,18 @@ namespace MediaBrowser.Dlna.ContentDirectory
|
|||
|
||||
private IEnumerable<KeyValuePair<string, string>> HandleGetSortCapabilities()
|
||||
{
|
||||
return new Headers(true) { { "SortCaps", "res@duration,res@size,res@bitrate,dc:date,dc:title,dc:size,upnp:album,upnp:artist,upnp:albumArtist,upnp:episodeNumber,upnp:genre,upnp:originalTrackNumber,upnp:rating" } };
|
||||
return new Headers(true)
|
||||
{
|
||||
{ "SortCaps", "res@duration,res@size,res@bitrate,dc:date,dc:title,dc:size,upnp:album,upnp:artist,upnp:albumArtist,upnp:episodeNumber,upnp:genre,upnp:originalTrackNumber,upnp:rating" }
|
||||
};
|
||||
}
|
||||
|
||||
private IEnumerable<KeyValuePair<string, string>> HandleGetSortExtensionCapabilities()
|
||||
{
|
||||
return new Headers(true)
|
||||
{
|
||||
{ "SortExtensionCaps", "res@duration,res@size,res@bitrate,dc:date,dc:title,dc:size,upnp:album,upnp:artist,upnp:albumArtist,upnp:episodeNumber,upnp:genre,upnp:originalTrackNumber,upnp:rating" }
|
||||
};
|
||||
}
|
||||
|
||||
private IEnumerable<KeyValuePair<string, string>> HandleGetSystemUpdateID()
|
||||
|
@ -120,9 +137,20 @@ namespace MediaBrowser.Dlna.ContentDirectory
|
|||
return headers;
|
||||
}
|
||||
|
||||
private IEnumerable<KeyValuePair<string, string>> HandleGetFeatureList()
|
||||
{
|
||||
return new Headers(true)
|
||||
{
|
||||
{ "FeatureList", GetFeatureListXml() }
|
||||
};
|
||||
}
|
||||
|
||||
private IEnumerable<KeyValuePair<string, string>> HandleXGetFeatureList()
|
||||
{
|
||||
return new Headers(true) { { "FeatureList", GetFeatureListXml() } };
|
||||
return new Headers(true)
|
||||
{
|
||||
{ "FeatureList", GetFeatureListXml() }
|
||||
};
|
||||
}
|
||||
|
||||
private string GetFeatureListXml()
|
||||
|
|
|
@ -47,7 +47,7 @@ namespace MediaBrowser.ServerApplication.FFMpeg
|
|||
switch (arg)
|
||||
{
|
||||
case "Version":
|
||||
return "20140827";
|
||||
return "20140923";
|
||||
case "FFMpegFilename":
|
||||
return "ffmpeg";
|
||||
case "FFProbeFilename":
|
||||
|
@ -61,13 +61,13 @@ namespace MediaBrowser.ServerApplication.FFMpeg
|
|||
switch (arg)
|
||||
{
|
||||
case "Version":
|
||||
return "20131121";
|
||||
return "20140910";
|
||||
case "FFMpegFilename":
|
||||
return "ffmpeg";
|
||||
case "FFProbeFilename":
|
||||
return "ffprobe";
|
||||
case "ArchiveType":
|
||||
return "gz";
|
||||
return "7z";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -150,7 +150,7 @@ namespace MediaBrowser.ServerApplication.FFMpeg
|
|||
{
|
||||
return new[]
|
||||
{
|
||||
"https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/osx/ffmpeg-osx-20131121.gz"
|
||||
"https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/osx/ffmpeg-x86-2.4.2.7z"
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -158,7 +158,7 @@ namespace MediaBrowser.ServerApplication.FFMpeg
|
|||
{
|
||||
return new[]
|
||||
{
|
||||
"https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/osx/ffmpeg-x64-2.3.3.7z"
|
||||
"https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/osx/ffmpeg-x64-2.4.1.7z"
|
||||
};
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue