Skip to content

VLC-Android
VLC-Android
Commit e4aef375 authored by Alexandre Perraud's avatar Alexandre Perraud
Browse files
Options

Add new passtrough icon

parent 8f40a8df
Hide whitespace changes
Inline Side-by-side
Showing with 387 additions and 1 deletion
assets/images/svg/ic_passthrough_normal.svg 0 → 100644
View file @ e4aef375
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="24"
height="24"
id="svg4682"
version="1.1"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
sodipodi:docname="ic_passthrough_normal.svg"
inkscape:export-filename="/home/corbax/Dev/android/Icons/Test 1/ic_play_normal.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4684" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="15.839192"
inkscape:cx="9.3499037"
inkscape:cy="20.749633"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1920"
inkscape:window-height="1052"
inkscape:window-x="1920"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:snap-bbox="true"
inkscape:bbox-paths="true"
inkscape:bbox-nodes="true"
inkscape:snap-bbox-edge-midpoints="true"
inkscape:snap-bbox-midpoints="true"
inkscape:object-paths="true"
inkscape:snap-intersection-paths="true"
inkscape:object-nodes="true"
inkscape:snap-smooth-nodes="true"
inkscape:snap-midpoints="true"
inkscape:snap-object-midpoints="true"
inkscape:snap-center="true"
inkscape:snap-text-baseline="true"
inkscape:snap-page="true">
<inkscape:grid
type="xygrid"
id="grid3002" />
</sodipodi:namedview>
<metadata
id="metadata4687">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1028.3622)">
<g
id="g5269"
style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Roboto;-inkscape-font-specification:Roboto"
transform="translate(-64,740.00002)" />
<path
inkscape:connector-curvature="0"
style="fill:#212121;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 3.5,1033.3622 c -0.831,0 -1.5,0.669 -1.5,1.5 v 11 c 0,0.831 0.669,1.5 1.5,1.5 h 13 c 0.831,0 1.5,-0.669 1.5,-1.5 v -3 h -1.5 v 3 h -13 v -11 h 13 v 3 H 18 v -3 c 0,-0.831 -0.669,-1.5 -1.5,-1.5 z m 10.03516,3.4668 -0.88477,0.8848 a 3.75,3.75 0 0 1 1.09961,2.6484 3.75,3.75 0 0 1 -1.09961,2.6523 l 0.88281,0.8829 A 5,5 0 0 0 15,1040.3622 5,5 0 0 0 13.53516,1036.829 Z m -7.06836,0 A 5,5 0 0 0 5,1040.3622 a 5,5 0 0 0 1.4668,3.5352 l 0.88476,-0.8848 A 3.75,3.75 0 0 1 6.25,1040.3622 3.75,3.75 0 0 1 7.34961,1037.7138 Z M 19,1037.3642 v 2 h -2.5 v 2 H 19 v 2 l 3,-3 z m -9,0.498 a 2.5,2.5 0 0 0 -2.5,2.5 2.5,2.5 0 0 0 2.5,2.5 2.5,2.5 0 0 0 2.5,-2.5 2.5,2.5 0 0 0 -2.5,-2.5 z m 0,1.25 a 1.25,1.25 0 0 1 1.25,1.25 1.25,1.25 0 0 1 -1.25,1.25 1.25,1.25 0 0 1 -1.25,-1.25 1.25,1.25 0 0 1 1.25,-1.25 z"
id="path4897" />
</g>
</svg>
assets/images/svg/ic_passthrough_normal_o.svg 0 → 100644
View file @ e4aef375
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="24"
height="24"
id="svg4682"
version="1.1"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
sodipodi:docname="ic_passthrough_normal_o.svg"
inkscape:export-filename="/home/corbax/Dev/android/Icons/Test 1/ic_play_normal.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4684" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="15.839192"
inkscape:cx="9.3499037"
inkscape:cy="20.749633"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1920"
inkscape:window-height="1052"
inkscape:window-x="1920"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:snap-bbox="true"
inkscape:bbox-paths="true"
inkscape:bbox-nodes="true"
inkscape:snap-bbox-edge-midpoints="true"
inkscape:snap-bbox-midpoints="true"
inkscape:object-paths="true"
inkscape:snap-intersection-paths="true"
inkscape:object-nodes="true"
inkscape:snap-smooth-nodes="true"
inkscape:snap-midpoints="true"
inkscape:snap-object-midpoints="true"
inkscape:snap-center="true"
inkscape:snap-text-baseline="true"
inkscape:snap-page="true">
<inkscape:grid
type="xygrid"
id="grid3002" />
</sodipodi:namedview>
<metadata
id="metadata4687">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1028.3622)">
<g
id="g5269"
style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Roboto;-inkscape-font-specification:Roboto"
transform="translate(-64,740.00002)" />
<path
inkscape:connector-curvature="0"
style="fill:#ff8800;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 3.5,1033.3622 c -0.831,0 -1.5,0.669 -1.5,1.5 v 11 c 0,0.831 0.669,1.5 1.5,1.5 h 13 c 0.831,0 1.5,-0.669 1.5,-1.5 v -3 h -1.5 v 3 h -13 v -11 h 13 v 3 H 18 v -3 c 0,-0.831 -0.669,-1.5 -1.5,-1.5 z m 10.03516,3.4668 -0.88477,0.8848 a 3.75,3.75 0 0 1 1.09961,2.6484 3.75,3.75 0 0 1 -1.09961,2.6523 l 0.88281,0.8829 A 5,5 0 0 0 15,1040.3622 5,5 0 0 0 13.53516,1036.829 Z m -7.06836,0 A 5,5 0 0 0 5,1040.3622 a 5,5 0 0 0 1.4668,3.5352 l 0.88476,-0.8848 A 3.75,3.75 0 0 1 6.25,1040.3622 3.75,3.75 0 0 1 7.34961,1037.7138 Z M 19,1037.3642 v 2 h -2.5 v 2 H 19 v 2 l 3,-3 z m -9,0.498 a 2.5,2.5 0 0 0 -2.5,2.5 2.5,2.5 0 0 0 2.5,2.5 2.5,2.5 0 0 0 2.5,-2.5 2.5,2.5 0 0 0 -2.5,-2.5 z m 0,1.25 a 1.25,1.25 0 0 1 1.25,1.25 1.25,1.25 0 0 1 -1.25,1.25 1.25,1.25 0 0 1 -1.25,-1.25 1.25,1.25 0 0 1 1.25,-1.25 z"
id="path4897" />
</g>
</svg>
assets/images/svg/ic_passthrough_normal_w.svg 0 → 100644
View file @ e4aef375
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="24"
height="24"
id="svg4682"
version="1.1"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
sodipodi:docname="ic_passthrough_normal_w.svg"
inkscape:export-filename="/home/corbax/Dev/android/Icons/Test 1/ic_play_normal.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4684" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="15.839192"
inkscape:cx="9.3499037"
inkscape:cy="20.749633"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1920"
inkscape:window-height="1052"
inkscape:window-x="1920"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:snap-bbox="true"
inkscape:bbox-paths="true"
inkscape:bbox-nodes="true"
inkscape:snap-bbox-edge-midpoints="true"
inkscape:snap-bbox-midpoints="true"
inkscape:object-paths="true"
inkscape:snap-intersection-paths="true"
inkscape:object-nodes="true"
inkscape:snap-smooth-nodes="true"
inkscape:snap-midpoints="true"
inkscape:snap-object-midpoints="true"
inkscape:snap-center="true"
inkscape:snap-text-baseline="true"
inkscape:snap-page="true">
<inkscape:grid
type="xygrid"
id="grid3002" />
</sodipodi:namedview>
<metadata
id="metadata4687">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1028.3622)">
<g
id="g5269"
style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fafafa;fill-opacity:1;stroke:none;font-family:Roboto;-inkscape-font-specification:Roboto"
transform="translate(-64,740.00002)" />
<path
inkscape:connector-curvature="0"
style="fill:#fafafa;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 3.5,1033.3622 c -0.831,0 -1.5,0.669 -1.5,1.5 v 11 c 0,0.831 0.669,1.5 1.5,1.5 h 13 c 0.831,0 1.5,-0.669 1.5,-1.5 v -3 h -1.5 v 3 h -13 v -11 h 13 v 3 H 18 v -3 c 0,-0.831 -0.669,-1.5 -1.5,-1.5 z m 10.03516,3.4668 -0.88477,0.8848 a 3.75,3.75 0 0 1 1.09961,2.6484 3.75,3.75 0 0 1 -1.09961,2.6523 l 0.88281,0.8829 A 5,5 0 0 0 15,1040.3622 5,5 0 0 0 13.53516,1036.829 Z m -7.06836,0 A 5,5 0 0 0 5,1040.3622 a 5,5 0 0 0 1.4668,3.5352 l 0.88476,-0.8848 A 3.75,3.75 0 0 1 6.25,1040.3622 3.75,3.75 0 0 1 7.34961,1037.7138 Z M 19,1037.3642 v 2 h -2.5 v 2 H 19 v 2 l 3,-3 z m -9,0.498 a 2.5,2.5 0 0 0 -2.5,2.5 2.5,2.5 0 0 0 2.5,2.5 2.5,2.5 0 0 0 2.5,-2.5 2.5,2.5 0 0 0 -2.5,-2.5 z m 0,1.25 a 1.25,1.25 0 0 1 1.25,1.25 1.25,1.25 0 0 1 -1.25,1.25 1.25,1.25 0 0 1 -1.25,-1.25 1.25,1.25 0 0 1 1.25,-1.25 z"
id="path4897" />
</g>
</svg>
assets/images/svg/ic_passthrough_pressed.svg 0 → 100644
View file @ e4aef375
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="24"
height="24"
id="svg4682"
version="1.1"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
sodipodi:docname="ic_passthrough_pressed.svg"
inkscape:export-filename="/home/corbax/Dev/android/Icons/Test 1/ic_play_normal.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4684" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="22.4"
inkscape:cx="9.8468043"
inkscape:cy="10.389602"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1920"
inkscape:window-height="1052"
inkscape:window-x="1920"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:snap-bbox="true"
inkscape:bbox-paths="true"
inkscape:bbox-nodes="true"
inkscape:snap-bbox-edge-midpoints="true"
inkscape:snap-bbox-midpoints="true"
inkscape:object-paths="true"
inkscape:snap-intersection-paths="true"
inkscape:object-nodes="true"
inkscape:snap-smooth-nodes="true"
inkscape:snap-midpoints="true"
inkscape:snap-object-midpoints="true"
inkscape:snap-center="true"
inkscape:snap-text-baseline="true"
inkscape:snap-page="true">
<inkscape:grid
type="xygrid"
id="grid3002" />
</sodipodi:namedview>
<metadata
id="metadata4687">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1028.3622)">
<g
id="g5269"
style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Roboto;-inkscape-font-specification:Roboto"
transform="translate(-64,740.00002)" />
<path
inkscape:connector-curvature="0"
style="fill:#ffb54c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 3.5,1033.3622 c -0.831,0 -1.5,0.669 -1.5,1.5 v 11 c 0,0.831 0.669,1.5 1.5,1.5 h 13 c 0.831,0 1.5,-0.669 1.5,-1.5 v -3 h -1.5 v 3 h -13 v -11 h 13 v 3 H 18 v -3 c 0,-0.831 -0.669,-1.5 -1.5,-1.5 z m 10.03516,3.4668 -0.88477,0.8848 a 3.75,3.75 0 0 1 1.09961,2.6484 3.75,3.75 0 0 1 -1.09961,2.6523 l 0.88281,0.8829 A 5,5 0 0 0 15,1040.3622 5,5 0 0 0 13.53516,1036.829 Z m -7.06836,0 A 5,5 0 0 0 5,1040.3622 a 5,5 0 0 0 1.4668,3.5352 l 0.88476,-0.8848 A 3.75,3.75 0 0 1 6.25,1040.3622 3.75,3.75 0 0 1 7.34961,1037.7138 Z M 19,1037.3642 v 2 h -2.5 v 2 H 19 v 2 l 3,-3 z m -9,0.498 a 2.5,2.5 0 0 0 -2.5,2.5 2.5,2.5 0 0 0 2.5,2.5 2.5,2.5 0 0 0 2.5,-2.5 2.5,2.5 0 0 0 -2.5,-2.5 z m 0,1.25 a 1.25,1.25 0 0 1 1.25,1.25 1.25,1.25 0 0 1 -1.25,1.25 1.25,1.25 0 0 1 -1.25,-1.25 1.25,1.25 0 0 1 1.25,-1.25 z"
id="path4897" />
</g>
</svg>
vlc-android/res/drawable/ic_passthrough.xml 0 → 100644
View file @ e4aef375
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_passthrough_normal" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_passthrough_pressed" android:state_focused="true"/>
<item android:drawable="@drawable/ic_passthrough_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_passthrough_normal"/>
</selector>
\ No newline at end of file
vlc-android/res/drawable/ic_passthrough_on.xml 0 → 100644
View file @ e4aef375
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_passthrough_normal_o" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_passthrough_pressed" android:state_focused="true"/>
<item android:drawable="@drawable/ic_passthrough_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_passthrough_normal_o"/>
</selector>
\ No newline at end of file
vlc-android/res/drawable/ic_passthrough_w.xml 0 → 100644
View file @ e4aef375
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_passthrough_normal_w" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_passthrough_pressed" android:state_focused="true"/>
<item android:drawable="@drawable/ic_passthrough_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_passthrough_normal_w"/>
</selector>
\ No newline at end of file
vlc-android/res/values/attrs.xml
View file @ e4aef375
......@@ -65,6 +65,7 @@
<attr name="ic_playasaudio_on" format="reference" />
<attr name="ic_popup_expand" format="reference" />
<attr name="ic_popup_dim" format="reference" />
<attr name="ic_passthrough" format="reference" />
<attr name="shadow_top_9patch" format="reference"/>
<attr name="shadow_bottom_9patch" format="reference"/>
......
vlc-android/res/values/styles.xml
View file @ e4aef375
......@@ -83,6 +83,7 @@
<item name="ic_equalizer_normal_style">@drawable/ic_equalizer</item>
<item name="ic_audiodelay">@drawable/ic_audiodelay</item>
<item name="ic_subtitledelay">@drawable/ic_subtitledelay</item>
<item name="ic_passthrough">@drawable/ic_passthrough</item>
</style>
<style name="Theme.VLC.PickerDialog" parent="Theme.AppCompat.Light.Dialog">
......@@ -179,6 +180,7 @@
<item name="ic_equalizer_normal_style">@drawable/ic_equalizer_w</item>
<item name="ic_audiodelay">@drawable/ic_audiodelay_w</item>
<item name="ic_subtitledelay">@drawable/ic_subtitledelay_w</item>
<item name="ic_passthrough">@drawable/ic_passthrough_w</item>
</style>
<style name="Theme.VLC.TV" parent="Theme.Leanback">
<item name="colorPrimary">@color/orange800</item>
......@@ -254,6 +256,7 @@
<item name="ic_equalizer_normal_style">@drawable/ic_equalizer_w</item>
<item name="ic_audiodelay">@drawable/ic_audiodelay_w</item>
<item name="ic_subtitledelay">@drawable/ic_subtitledelay_w</item>
<item name="ic_passthrough">@drawable/ic_passthrough_w</item>
<item name="ic_repeat">@drawable/ic_repeat_w</item>
<item name="ic_shuffle">@drawable/ic_shuffle_w</item>
<item name="ic_trash">@drawable/ic_trash_w</item>
......
vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java
View file @ e4aef375
......@@ -362,7 +362,15 @@ public class AdvOptionsDialog extends DialogFragment implements View.OnClickList
? R.drawable.ic_shuffle_on
: UiTools.getResourceFromAttribute(mActivity, R.attr.ic_shuffle),
0, 0);
}
public void initPassthrough(){
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(AdvOptionsDialog.this.getContext());
mPassThrough.setCompoundDrawablesWithIntrinsicBounds(0,
VLCOptions.isAudioDigitalOutputEnabled(prefs)
? R.drawable.ic_passthrough_on
: UiTools.getResourceFromAttribute(mActivity, R.attr.ic_passthrough),
0, 0);
}
private void initChapters() {
......@@ -418,6 +426,10 @@ public class AdvOptionsDialog extends DialogFragment implements View.OnClickList
mShuffle = tv;
initShuffle();
break;
case ID_PASSTHROUGH:
mPassThrough = tv;
initPassthrough();
break;
}
}
......@@ -480,6 +492,10 @@ public class AdvOptionsDialog extends DialogFragment implements View.OnClickList
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(AdvOptionsDialog.this.getContext());
boolean enabled = !VLCOptions.isAudioDigitalOutputEnabled(prefs);
if (mService.setAudioDigitalOutputEnabled(enabled)) {
mPassThrough.setCompoundDrawablesWithIntrinsicBounds(0,
enabled ? R.drawable.ic_passthrough_on
: UiTools.getResourceFromAttribute(mActivity, R.attr.ic_passthrough)
, 0, 0);
VLCOptions.setAudioDigitalOutputEnabled(prefs, enabled);
mToast.setText(enabled ? getString(R.string.audio_digital_output_enabled) : getString(R.string.audio_digital_output_disabled));
} else mToast.setText(R.string.audio_digital_failed);
......@@ -553,7 +569,8 @@ public class AdvOptionsDialog extends DialogFragment implements View.OnClickList
} else {
mAdapter.addOption(new Option(ID_SAVE_PLAYLIST, R.attr.ic_save, getString(R.string.playlist_save)));
}
if ("0".equals(prefs.getString("aout", "0"))) mAdapter.addOption(new Option(ID_PASSTHROUGH, R.attr.ic_popup_dim, getString(R.string.audio_digital_title)));
if ("0".equals(prefs.getString("aout", "0")))
mAdapter.addOption(new Option(ID_PASSTHROUGH, R.attr.ic_passthrough, getString(R.string.audio_digital_title)));
setDialogDimensions(large_items);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment