jellyfin/jellyfin-sdk-kotlin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-sdk-kotlin.git synced 2024-12-04 03:51:09 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

update profile to make ac3 optional

Browse Source
This commit is contained in:
Luke Pulverenti 2015-04-22 18:12:54 -04:00
parent e89e9a24de
commit e7e4ae1c82
14 changed files with 281 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

410
.idea/workspace.xml generated
View File

@ -7,12 +7,17 @@
</component>
<component name="ChangeListManager">
<list default="true" id="5b626835-6518-4586-bf6c-5bbba32974d2" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/classes/Production/android/mediabrowser/apiinteraction/android/sync/data/ItemRepository.class" afterPath="$PROJECT_DIR$/out/classes/Production/android/mediabrowser/apiinteraction/android/sync/data/ItemRepository.class" />
<change type="DELETED" beforePath="C:\Dev\MediaBrowser.ApiClient.Java\out\classes\Production\android\mediabrowser\apiinteraction\android\profiles\ProfileDefaults.class" afterPath="" />
<change type="MOVED" beforePath="C:\Dev\MediaBrowser.ApiClient.Java\android\src\mediabrowser\apiinteraction\android\profiles\ProfileDefaults.java" afterPath="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/AndroidProfileOptions.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/classes/Production/android/mediabrowser/apiinteraction/android/profiles/AndroidProfile.class" afterPath="$PROJECT_DIR$/out/classes/Production/android/mediabrowser/apiinteraction/android/profiles/AndroidProfile.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/classes/Production/android/mediabrowser/apiinteraction/android/profiles/Api16Builder.class" afterPath="$PROJECT_DIR$/out/classes/Production/android/mediabrowser/apiinteraction/android/profiles/Api16Builder.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/classes/Production/android/mediabrowser/apiinteraction/android/profiles/Api21Builder.class" afterPath="$PROJECT_DIR$/out/classes/Production/android/mediabrowser/apiinteraction/android/profiles/Api21Builder.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/artifacts/jar/emby.apiclient.android.jar" afterPath="$PROJECT_DIR$/out/artifacts/jar/emby.apiclient.android.jar" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/artifacts/jar/emby.apiclient.jar" afterPath="$PROJECT_DIR$/out/artifacts/jar/emby.apiclient.jar" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/AndroidProfile.java" afterPath="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/AndroidProfile.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/Api16Builder.java" afterPath="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/Api16Builder.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/Api21Builder.java" afterPath="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/Api21Builder.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/mediabrowser/apiinteraction/connectionmanager/ConnectionManager.java" afterPath="$PROJECT_DIR$/src/mediabrowser/apiinteraction/connectionmanager/ConnectionManager.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/sync/data/ItemRepository.java" afterPath="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/sync/data/ItemRepository.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/sync/PeriodicSync.java" afterPath="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/sync/PeriodicSync.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="MediaBrowser.ApiClient.Java.iws" />
@ -40,42 +45,11 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="Api21Builder.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/Api21Builder.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="1700">
<caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Api16Builder.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/Api16Builder.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1360" max-vertical-offset="6885">
<caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#594#613#0" expanded="false" />
<element signature="e#678#692#0" expanded="false" />
<element signature="e#3008#3026#0" expanded="false" />
<element signature="e#4281#4289#0" expanded="false" />
<element signature="e#11103#11117#0" expanded="false" />
<element signature="e#11341#11359#0" expanded="false" />
<element signature="e#14124#14142#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ProfileDefaults.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/ProfileDefaults.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="85" max-vertical-offset="255">
<caret line="5" column="28" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="28" />
<state vertical-scroll-proportion="-3.137931" vertical-offset="5400" max-vertical-offset="6851">
<caret line="331" column="13" selection-start-line="331" selection-start-column="13" selection-end-line="331" selection-end-column="13" />
<folding />
</state>
</provider>
@ -84,46 +58,21 @@
<file leaf-file-name="AndroidProfile.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/AndroidProfile.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="493" max-vertical-offset="2805">
<caret line="57" column="48" selection-start-line="57" selection-start-column="48" selection-end-line="57" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="LocalAssetManager.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/sync/data/LocalAssetManager.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="3692" max-vertical-offset="11917">
<caret line="264" column="34" selection-start-line="264" selection-start-column="34" selection-end-line="264" selection-end-column="34" />
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3791">
<caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#4435#4436#0" expanded="true" />
<element signature="e#4482#4483#0" expanded="true" />
<element signature="e#8201#8202#0" expanded="true" />
<element signature="e#8255#8256#0" expanded="true" />
<element signature="e#8338#8339#0" expanded="true" />
<element signature="e#8403#8404#0" expanded="true" />
<element signature="e#362#363#0" expanded="true" />
<element signature="e#402#403#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ItemRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/sync/data/ItemRepository.java">
<file leaf-file-name="AndroidProfileOptions.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/AndroidProfileOptions.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="719" max-vertical-offset="5304">
<caret line="89" column="51" selection-start-line="89" selection-start-column="51" selection-end-line="89" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AndroidAssetManager.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/sync/data/AndroidAssetManager.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="425">
<caret line="12" column="24" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="289">
<caret line="7" column="36" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="36" />
<folding />
</state>
</provider>
@ -132,28 +81,8 @@
<file leaf-file-name="MediaSyncAdapter.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/sync/MediaSyncAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1292">
<state vertical-scroll-proportion="0.0" vertical-offset="476" max-vertical-offset="1292">
<caret line="41" column="0" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PeriodicSync.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/sync/PeriodicSync.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.10461538" vertical-offset="0" max-vertical-offset="1300">
<caret line="13" column="5" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="VolleyStringRequest.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/VolleyStringRequest.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1173" max-vertical-offset="2091">
<caret line="78" column="56" selection-start-line="78" selection-start-column="56" selection-end-line="78" selection-end-column="56" />
<folding>
<element signature="imports" expanded="false" />
</folding>
@ -161,6 +90,66 @@
</provider>
</entry>
</file>
<file leaf-file-name="PeriodicSync.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/sync/PeriodicSync.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="714">
<caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ConnectionManager.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/connectionmanager/ConnectionManager.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.94099134" vertical-offset="9004" max-vertical-offset="12631">
<caret line="626" column="0" selection-start-line="626" selection-start-column="0" selection-end-line="626" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="GetAvailableServersResponse.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/connectionmanager/GetAvailableServersResponse.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="493">
<caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="FindServersResponse.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/connectionmanager/FindServersResponse.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="901">
<caret line="37" column="41" selection-start-line="37" selection-start-column="41" selection-end-line="37" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="GetConnectServersResponse.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/connectionmanager/GetConnectServersResponse.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="294" max-vertical-offset="1581">
<caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="FindServersInnerResponse.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/connectionmanager/FindServersInnerResponse.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1292">
<caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="Git.Settings">
@ -169,8 +158,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/mediabrowser/model/dlna/BaseStreamInfoSorter.java" />
<option value="$PROJECT_DIR$/src/mediabrowser/model/dlna/ChainedComparator.java" />
<option value="$PROJECT_DIR$/src/mediabrowser/model/dlna/StreamInfoSorter1.java" />
<option value="$PROJECT_DIR$/src/mediabrowser/model/dlna/StreamInfoSorterComparator.java" />
<option value="$PROJECT_DIR$/src/mediabrowser/apiinteraction/playback/Video.java" />
@ -213,13 +200,15 @@
<option value="$PROJECT_DIR$/src/mediabrowser/apiinteraction/sync/server/mediasync/MediaSync.java" />
<option value="$PROJECT_DIR$/src/mediabrowser/apiinteraction/ApiClient.java" />
<option value="$PROJECT_DIR$/src/mediabrowser/apiinteraction/http/HttpRequest.java" />
<option value="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/ProfileDefaults.java" />
<option value="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/Api16Builder.java" />
<option value="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/Api21Builder.java" />
<option value="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/AndroidProfile.java" />
<option value="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/sync/data/ItemRepository.java" />
<option value="$PROJECT_DIR$/src/mediabrowser/apiinteraction/connectionmanager/ConnectionManager.java" />
<option value="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/sync/PeriodicSync.java" />
<option value="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/ProfileDefaults.java" />
<option value="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/ProfileOptions.java" />
<option value="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/AndroidProfileOptions.java" />
<option value="$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/AndroidProfile.java" />
<option value="$PROJECT_DIR$/src/mediabrowser/apiinteraction/connectionmanager/ConnectionManager.java" />
</list>
</option>
</component>
@ -252,8 +241,6 @@
<sortByType />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@ -672,6 +659,8 @@
</PATH>
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@ -962,38 +951,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/mediabrowser/model/dto/ItemLayout.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.30053803" vertical-offset="0" max-vertical-offset="1309">
<caret line="23" column="29" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/sync/server/mediasync/GetSyncJobItemAdditionalFileResponse.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="276" max-vertical-offset="1564">
<caret line="48" column="29" selection-start-line="48" selection-start-column="29" selection-end-line="48" selection-end-column="29" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/sync/MultiServerSync.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="884">
<caret line="50" column="69" selection-start-line="50" selection-start-column="69" selection-end-line="50" selection-end-column="69" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/IConnectionManager.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="748">
<caret line="19" column="32" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/sync/server/ServerSyncConnectionResponse.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="714">
@ -1054,7 +1011,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1003">
<caret line="13" column="22" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
@ -1062,7 +1018,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.8182711" vertical-offset="408" max-vertical-offset="1564">
<caret line="83" column="32" selection-start-line="83" selection-start-column="32" selection-end-line="83" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
@ -1071,8 +1026,8 @@
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="884">
<caret line="21" column="11" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="11" />
<folding>
<element signature="e#1317#1318#0" expanded="true" />
<element signature="e#1362#1363#0" expanded="true" />
<element signature="e#1317#1318#0" expanded="false" />
<element signature="e#1362#1363#0" expanded="false" />
</folding>
</state>
</provider>
@ -1102,7 +1057,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.5946154" vertical-offset="570" max-vertical-offset="1870">
<caret line="88" column="18" selection-start-line="88" selection-start-column="18" selection-end-line="88" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
@ -1131,7 +1085,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="230" max-vertical-offset="1530">
<caret line="133" column="16" selection-start-line="133" selection-start-column="16" selection-end-line="133" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
@ -1181,7 +1134,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.15692307" vertical-offset="0" max-vertical-offset="1300">
<caret line="17" column="20" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
@ -1196,7 +1148,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="493">
<caret line="16" column="20" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
@ -1204,7 +1155,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="680">
<caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
@ -1219,7 +1169,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1394">
<caret line="63" column="59" selection-start-line="63" selection-start-column="59" selection-end-line="63" selection-end-column="59" />
<folding />
</state>
</provider>
</entry>
@ -1231,20 +1180,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/ApiClient.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="42944" max-vertical-offset="44676">
<caret line="2620" column="44" selection-start-line="2620" selection-start-column="16" selection-end-line="2620" selection-end-column="44" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#3669#3670#0" expanded="false" />
<element signature="e#3702#3703#0" expanded="false" />
<element signature="e#3832#3833#0" expanded="false" />
<element signature="e#3878#3879#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/http/HttpRequest.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.43153846" vertical-offset="0" max-vertical-offset="1300">
@ -1257,67 +1192,45 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2091">
<caret line="78" column="56" selection-start-line="78" selection-start-column="56" selection-end-line="78" selection-end-column="56" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/ProfileDefaults.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
<caret line="5" column="28" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/Api16Builder.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1360" max-vertical-offset="6885">
<caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#594#613#0" expanded="false" />
<element signature="e#678#692#0" expanded="false" />
<element signature="e#3008#3026#0" expanded="false" />
<element signature="e#4281#4289#0" expanded="false" />
<element signature="e#11103#11117#0" expanded="false" />
<element signature="e#11341#11359#0" expanded="false" />
<element signature="e#14124#14142#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/Api21Builder.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="1700">
<caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#339#340#0" expanded="false" />
<element signature="e#370#371#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/AndroidProfile.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="493" max-vertical-offset="2805">
<caret line="57" column="48" selection-start-line="57" selection-start-column="48" selection-end-line="57" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/sync/data/LocalAssetManager.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="3692" max-vertical-offset="11917">
<caret line="264" column="34" selection-start-line="264" selection-start-column="34" selection-end-line="264" selection-end-column="34" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#4435#4436#0" expanded="true" />
<element signature="e#4482#4483#0" expanded="true" />
<element signature="e#8201#8202#0" expanded="true" />
<element signature="e#8255#8256#0" expanded="true" />
<element signature="e#8338#8339#0" expanded="true" />
<element signature="e#8403#8404#0" expanded="true" />
<element signature="e#2014#2015#0" expanded="false" />
<element signature="e#2075#2076#0" expanded="false" />
<element signature="e#2131#2132#0" expanded="false" />
<element signature="e#2186#2187#0" expanded="false" />
<element signature="e#2397#2398#0" expanded="false" />
<element signature="e#2449#2450#0" expanded="false" />
<element signature="e#8463#8464#0" expanded="false" />
<element signature="e#8517#8518#0" expanded="false" />
<element signature="e#8597#8598#0" expanded="false" />
<element signature="e#8661#8662#0" expanded="false" />
<element signature="e#8724#8725#0" expanded="false" />
<element signature="e#8790#8791#0" expanded="false" />
<element signature="e#8852#8853#0" expanded="false" />
<element signature="e#8897#8898#0" expanded="false" />
<element signature="e#22295#22296#0" expanded="false" />
<element signature="e#22344#22345#0" expanded="false" />
<element signature="e#22423#22424#0" expanded="false" />
<element signature="e#22474#22475#0" expanded="false" />
</folding>
</state>
</provider>
@ -1326,7 +1239,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3330059" vertical-offset="22118" max-vertical-offset="36244">
<caret line="1384" column="16" selection-start-line="1384" selection-start-column="16" selection-end-line="1384" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
@ -1334,7 +1246,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.066797644" vertical-offset="0" max-vertical-offset="1018">
<caret line="8" column="17" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
@ -1342,7 +1253,9 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="425">
<caret line="12" column="24" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
<folding />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
@ -1350,15 +1263,15 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="719" max-vertical-offset="5304">
<caret line="89" column="51" selection-start-line="89" selection-start-column="51" selection-end-line="89" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/connectionmanager/ConnectionManager.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.5735641" vertical-offset="3096" max-vertical-offset="12631">
<caret line="251" column="24" selection-start-line="251" selection-start-column="24" selection-end-line="251" selection-end-column="24" />
<folding />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#4820#4828#0" expanded="false" />
<element signature="e#5461#5469#0" expanded="false" />
<element signature="e#6135#6146#0" expanded="false" />
<element signature="e#8516#8531#0" expanded="false" />
<element signature="e#9286#9301#0" expanded="false" />
<element signature="e#10046#10061#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@ -1366,14 +1279,91 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1292">
<caret line="41" column="0" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
<folding />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/sync/PeriodicSync.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.10461538" vertical-offset="0" max-vertical-offset="1300">
<caret line="13" column="5" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" />
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="714">
<caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/Api16Builder.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-3.137931" vertical-offset="5400" max-vertical-offset="6851">
<caret line="331" column="13" selection-start-line="331" selection-start-column="13" selection-end-line="331" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/ApiClient.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.38645834" vertical-offset="43251" max-vertical-offset="44676">
<caret line="2637" column="9" selection-start-line="2634" selection-start-column="8" selection-end-line="2637" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/AndroidProfileOptions.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="289">
<caret line="7" column="36" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android/src/mediabrowser/apiinteraction/android/profiles/AndroidProfile.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3791">
<caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
<folding>
<element signature="e#362#363#0" expanded="true" />
<element signature="e#402#403#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/connectionmanager/GetAvailableServersResponse.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="493">
<caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/connectionmanager/GetConnectServersResponse.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="1581">
<caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/connectionmanager/FindServersResponse.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="901">
<caret line="37" column="41" selection-start-line="37" selection-start-column="41" selection-end-line="37" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/connectionmanager/FindServersInnerResponse.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1292">
<caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/mediabrowser/apiinteraction/connectionmanager/ConnectionManager.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.94099134" vertical-offset="9004" max-vertical-offset="12631">
<caret line="626" column="0" selection-start-line="626" selection-start-column="0" selection-end-line="626" selection-end-column="0" />
<folding />
</state>
</provider>

72
android/src/mediabrowser/apiinteraction/android/profiles/AndroidProfile.java
View File

@ -3,21 +3,23 @@ package mediabrowser.apiinteraction.android.profiles;
import android.os.Build;
import mediabrowser.model.dlna.*;
import mediabrowser.model.dlna.profiles.DefaultProfile;
import mediabrowser.model.extensions.StringHelper;
import java.util.ArrayList;
public class AndroidProfile extends DefaultProfile
{
protected int DefaultH264Level;
public AndroidProfile()
{
this(true, 40);
public AndroidProfile(){
this(new AndroidProfileOptions());
}
public AndroidProfile(boolean supportsHls, int defaultH264Level)
public AndroidProfile(AndroidProfileOptions profileOptions)
{
setName("Android");
DefaultH264Level = defaultH264Level;
DefaultH264Level = profileOptions.DefaultH264Level;
setMaxStaticBitrate(20000000);
setMaxStreamingBitrate(20000000);
@ -40,7 +42,7 @@ public class AndroidProfile extends DefaultProfile
tempVar0.setContext(EncodingContext.Static);
transcodingProfiles.add(tempVar0);
if (supportsHls)
if (profileOptions.SupportsHls)
{
TranscodingProfile tempVar2 = new TranscodingProfile();
tempVar2.setProtocol("hls");
@ -136,12 +138,68 @@ public class AndroidProfile extends DefaultProfile
setCodecProfiles(new CodecProfile[] {tempVar10, tempVar11, tempVar12, tempVar13, tempVar14});
buildDynamicProfiles();
addM4v();
if (profileOptions.SupportsAc3){
addAc3();
}
buildSubtitleProfiles();
}
private void addAc3() {
for(DirectPlayProfile profile : getDirectPlayProfiles()){
if (profile.getType() == DlnaProfileType.Video){
String container = profile.getContainer();
if (container != null && (StringHelper.IndexOfIgnoreCase(container, "mp4") != -1 || StringHelper.IndexOfIgnoreCase(container, "mkv") != -1 || StringHelper.IndexOfIgnoreCase(container, "m4v") != -1)){
String audioCodec = profile.getAudioCodec();
if (tangible.DotNetToJavaStringHelper.isNullOrEmpty(audioCodec))
{
profile.setAudioCodec("ac3");
}
else{
profile.setAudioCodec(audioCodec + ",ac3");
}
}
}
}
}
private void addM4v() {
for(DirectPlayProfile profile : getDirectPlayProfiles()){
if (profile.getType() == DlnaProfileType.Video){
String container = profile.getContainer();
if (container != null && StringHelper.IndexOfIgnoreCase(container, "mp4") != -1){
profile.setContainer(container + ",m4v");
}
}
}
ArrayList<ResponseProfile> responseProfiles = new ArrayList<>();
for (ResponseProfile profile : getResponseProfiles()){
responseProfiles.add(profile);
}
ResponseProfile m4vProfile = new ResponseProfile();
m4vProfile.setContainer("m4v");
m4vProfile.setType(DlnaProfileType.Video);
m4vProfile.setMimeType("video/mp4");
responseProfiles.add(m4vProfile);
setResponseProfiles(responseProfiles.toArray(new ResponseProfile[responseProfiles.size()]));
}
private void buildDynamicProfiles(){
ProfileDefaults defaults = new ProfileDefaults();
AndroidProfileOptions defaults = new AndroidProfileOptions();
defaults.DefaultH264Level = DefaultH264Level;
if (Build.VERSION.SDK_INT >= 21){

11
android/src/mediabrowser/apiinteraction/android/profiles/AndroidProfileOptions.java Normal file
View File

@ -0,0 +1,11 @@
package mediabrowser.apiinteraction.android.profiles;
/**
* Created by Luke on 4/21/2015.
*/
public class AndroidProfileOptions {
public int DefaultH264Level = 40;
public boolean SupportsAc3 = false;
public boolean SupportsHls = true;
}

5
android/src/mediabrowser/apiinteraction/android/profiles/Api16Builder.java
View File

@ -4,16 +4,15 @@ import android.media.MediaCodecInfo;
import android.media.MediaCodecList;
import mediabrowser.model.dlna.*;
import mediabrowser.model.extensions.StringHelper;
import mediabrowser.model.logging.ILogger;
import java.util.ArrayList;
import java.util.List;
public class Api16Builder {
protected ProfileDefaults Defaults;
protected AndroidProfileOptions Defaults;
public Api16Builder(ProfileDefaults defaults) {
public Api16Builder(AndroidProfileOptions defaults) {
Defaults = defaults;
}

3
android/src/mediabrowser/apiinteraction/android/profiles/Api21Builder.java
View File

@ -4,13 +4,12 @@ import android.media.MediaCodecInfo;
import android.util.Range;
import mediabrowser.model.dlna.*;
import mediabrowser.model.extensions.StringHelper;
import mediabrowser.model.logging.ILogger;
import java.util.ArrayList;
public class Api21Builder extends Api16Builder{
public Api21Builder(ProfileDefaults defaults) {
public Api21Builder(AndroidProfileOptions defaults) {
super(defaults);
}

9
android/src/mediabrowser/apiinteraction/android/profiles/ProfileDefaults.java
View File

@ -1,9 +0,0 @@
package mediabrowser.apiinteraction.android.profiles;
/**
* Created by Luke on 4/21/2015.
*/
public class ProfileDefaults {
public int DefaultH264Level;
}

BIN
out/artifacts/jar/emby.apiclient.android.jar
View File

Binary file not shown.

BIN
out/artifacts/jar/emby.apiclient.jar
View File

Binary file not shown.

BIN
out/classes/Production/android/mediabrowser/apiinteraction/android/profiles/AndroidProfile.class
View File

Binary file not shown.

BIN
out/classes/Production/android/mediabrowser/apiinteraction/android/profiles/AndroidProfileOptions.class Normal file
View File

Binary file not shown.

BIN
out/classes/Production/android/mediabrowser/apiinteraction/android/profiles/Api16Builder.class
View File

Binary file not shown.

BIN
out/classes/Production/android/mediabrowser/apiinteraction/android/profiles/Api21Builder.class
View File

Binary file not shown.

BIN
out/classes/Production/android/mediabrowser/apiinteraction/android/profiles/ProfileDefaults.class
View File

Binary file not shown.

4
src/mediabrowser/apiinteraction/connectionmanager/ConnectionManager.java
View File

@ -588,11 +588,11 @@ public class ConnectionManager implements IConnectionManager {
credentials.AddOrUpdateServer(newServer);
}
for(ServerInfo newServer : foundServers){
/*for(ServerInfo newServer : foundServers){
ServerInfo existing = credentials.GetServer(newServer.getId());
existing.setLastConnectionMode(ConnectionMode.Local);
}
}*/
ArrayList<ServerInfo> cleanList = new ArrayList<ServerInfo>();
ArrayList<ServerInfo> existing = credentials.getServers();