michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

add mic to header

Browse Source
This commit is contained in:
Luke Pulverenti 2015-06-02 01:46:06 -04:00
parent 2786716f81
commit 56b82414de
12 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs
View File

@ -54,7 +54,7 @@ namespace MediaBrowser.Dlna.Profiles
{
Container = "ts",
VideoCodec = "h264",
AudioCodec = "ac3,aac",
AudioCodec = "aac",
Type = DlnaProfileType.Video,
EnableMpegtsM2TsMode = true
},

2
MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs
View File

@ -51,7 +51,7 @@ namespace MediaBrowser.Dlna.Profiles
{
Container = "ts",
VideoCodec = "h264",
AudioCodec = "ac3,aac",
AudioCodec = "aac",
Type = DlnaProfileType.Video,
EnableMpegtsM2TsMode = true
},

2
MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs
View File

@ -51,7 +51,7 @@ namespace MediaBrowser.Dlna.Profiles
{
Container = "ts",
VideoCodec = "h264",
AudioCodec = "ac3,aac",
AudioCodec = "aac",
Type = DlnaProfileType.Video,
EnableMpegtsM2TsMode = true
},

2
MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs
View File

@ -50,7 +50,7 @@ namespace MediaBrowser.Dlna.Profiles
{
Container = "ts",
VideoCodec = "h264",
AudioCodec = "ac3,aac",
AudioCodec = "aac",
Type = DlnaProfileType.Video,
EnableMpegtsM2TsMode = true
},

2
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml
View File

@ -47,7 +47,7 @@
</DirectPlayProfiles>
<TranscodingProfiles>
<TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" context="Streaming" />
<TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" context="Streaming" />
<TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" context="Streaming" />
<TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" context="Streaming" />
</TranscodingProfiles>
<ContainerProfiles>

2
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml
View File

@ -50,7 +50,7 @@
</DirectPlayProfiles>
<TranscodingProfiles>
<TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" context="Streaming" />
<TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" context="Streaming" />
<TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" context="Streaming" />
<TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" context="Streaming" />
</TranscodingProfiles>
<ContainerProfiles>

2
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml
View File

@ -52,7 +52,7 @@
</DirectPlayProfiles>
<TranscodingProfiles>
<TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" context="Streaming" />
<TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" context="Streaming" />
<TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" context="Streaming" />
<TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" context="Streaming" />
</TranscodingProfiles>
<ContainerProfiles>

2
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml
View File

@ -57,7 +57,7 @@
</DirectPlayProfiles>
<TranscodingProfiles>
<TranscodingProfile container="mp3" type="Audio" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" context="Streaming" />
<TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" context="Streaming" />
<TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" context="Streaming" />
<TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" context="Streaming" />
</TranscodingProfiles>
<ContainerProfiles>

6
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -1153,7 +1153,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv
if (item != null)
{
await _libraryManager.DeleteItem(item).ConfigureAwait(false);
await _libraryManager.DeleteItem(item, new DeleteOptions
{
DeleteFileLocation = false
}).ConfigureAwait(false);
}
}

8
MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
View File

@ -793,5 +793,11 @@
"HeaderLibrary": "Library",
"HeaderMedia": "Media",
"ButtonInbox": "Inbox",
"HeaderAdvanced": "Advanced"
"HeaderAdvanced": "Advanced",
"HeaderSaySomethingLike": "Say Something Like...",
"ButtonTryAgain": "Try Again",
"HeaderYouSaid": "You Said...",
"MessageWeDidntRecognizeCommand": "We're sorry, we didn't recognize that command.",
"MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
"MessageNoItemsFound": "No items found."
}

3
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View File

@ -585,14 +585,12 @@ namespace MediaBrowser.WebDashboard.Api
"indexpage.js",
"itembynamedetailpage.js",
"itemdetailpage.js",
"kids.js",
"librarypathmapping.js",
"librarysettings.js",
"livetvrecording.js",
"livetvtimer.js",
"livetvseriestimer.js",
"livetvsettings.js",
"livetvstatus.js",
"medialibrarypage.js",
"metadataconfigurationpage.js",
@ -614,7 +612,6 @@ namespace MediaBrowser.WebDashboard.Api
"scheduledtaskspage.js",
"search.js",
"syncactivity.js",
"syncsettings.js",
"thememediaplayer.js",
"useredit.js",
"userpassword.js",

6
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -117,6 +117,9 @@
<Content Include="dashboard-ui\css\materialize.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\css\voice.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\dashboardhosting.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@ -198,6 +201,9 @@
<Content Include="dashboard-ui\scripts\userpassword.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\voice.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\wizardagreement.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>