Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: OpenELEC/OpenELEC.tv
...
head fork: OpenELEC/OpenELEC.tv
Checking mergeability… Don't worry, you can still create the pull request.
  • 4 commits
  • 6 files changed
  • 0 commit comments
  • 2 contributors
Commits on Apr 02, 2012
@chewitt chewitt reinstate 'Settings' under SETTINGS menu and add new tab for 'OpenELEC' 7db4049
@sraue sraue xbmc-pvr-theme-Confluence: use colored branding
Signed-off-by: Stephan Raue <stephan@openelec.tv>
9e5b10d
@sraue sraue xbmc-theme-Confluence: sync settings patch
Signed-off-by: Stephan Raue <stephan@openelec.tv>
52f2f87
@sraue sraue projects/Ultra/filesystem: add soundcard detection and autoconfig for…
… Ultra1 & Ultra2

Signed-off-by: Stephan Raue <stephan@openelec.tv>
7a88aad
View
28 ...mc-pvr-theme-Confluence/patches/xbmc-pvr-theme-Confluence-11.0.1-001-add_oe_settings_to_homescreen.patch
@@ -1,24 +1,14 @@
---- xbmc-theme-Confluence-f38655f/720p/IncludesHomeMenuItems.xml 2012-03-19 00:18:09.884593147 +0400
-+++ xbmc-theme-Confluence-f38655f/720p/IncludesHomeMenuItems.patch.xml 2012-03-19 11:28:54.813438169 +0400
-@@ -178,16 +178,16 @@
- <height>35</height>
- <texture border="0,0,0,3" flipx="true">HomeSubEnd.png</texture>
+--- xbmc-theme-Confluence-11.0.1/720p/IncludesHomeMenuItems.xml 2012-03-31 08:37:23.304505434 +0400
++++ xbmc-theme-Confluence-11.0.1/720p/IncludesHomeMenuItems.patch.xml 2012-03-31 08:39:57.894660377 +0400
+@@ -183,6 +183,11 @@
+ <label>5</label>
+ <onclick>ActivateWindow(Settings)</onclick>
</control>
-- <control type="button" id="90122">
-- <include>ButtonHomeSubCommonValues</include>
-- <label>5</label>
-- <onclick>ActivateWindow(Settings)</onclick>
-- </control>
- <control type="button" id="90123">
- <include>ButtonHomeSubCommonValues</include>
- <label>7</label>
- <onclick>ActivateWindow(FileManager)</onclick>
- </control>
-+ <control type="button" id="90122">
++ <control type="button" id="90120">
+ <include>ButtonHomeSubCommonValues</include>
-+ <label>OpenELEC</label>
++ <label>[COLOR FF757677]Open[/COLOR][COLOR FF8ABEE2]ELEC[/COLOR]</label>
+ <onclick>RunAddon(os.openelec.settings)</onclick>
+ </control>
- <control type="button" id="90124">
+ <control type="button" id="90123">
<include>ButtonHomeSubCommonValues</include>
- <label>13200</label>
+ <label>7</label>
View
28 ...enter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-11.0.1-001-add_oe_settings_to_homescreen.patch
@@ -1,24 +1,14 @@
---- xbmc-theme-Confluence-f38655f/720p/IncludesHomeMenuItems.xml 2012-03-19 00:18:09.884593147 +0400
-+++ xbmc-theme-Confluence-f38655f/720p/IncludesHomeMenuItems.patch.xml 2012-03-19 11:28:54.813438169 +0400
-@@ -178,16 +178,16 @@
- <height>35</height>
- <texture border="0,0,0,3" flipx="true">HomeSubEnd.png</texture>
+--- xbmc-theme-Confluence-11.0.1/720p/IncludesHomeMenuItems.xml 2012-03-31 08:37:23.304505434 +0400
++++ xbmc-theme-Confluence-11.0.1/720p/IncludesHomeMenuItems.patch.xml 2012-03-31 08:39:57.894660377 +0400
+@@ -183,6 +183,11 @@
+ <label>5</label>
+ <onclick>ActivateWindow(Settings)</onclick>
</control>
-- <control type="button" id="90122">
-- <include>ButtonHomeSubCommonValues</include>
-- <label>5</label>
-- <onclick>ActivateWindow(Settings)</onclick>
-- </control>
- <control type="button" id="90123">
- <include>ButtonHomeSubCommonValues</include>
- <label>7</label>
- <onclick>ActivateWindow(FileManager)</onclick>
- </control>
-+ <control type="button" id="90122">
++ <control type="button" id="90120">
+ <include>ButtonHomeSubCommonValues</include>
-+ <label>OpenELEC</label>
++ <label>[COLOR FF757677]Open[/COLOR][COLOR FF8ABEE2]ELEC[/COLOR]</label>
+ <onclick>RunAddon(os.openelec.settings)</onclick>
+ </control>
- <control type="button" id="90124">
+ <control type="button" id="90123">
<include>ButtonHomeSubCommonValues</include>
- <label>13200</label>
+ <label>7</label>
View
58 projects/Ultra/filesystem/etc/asound.conf
@@ -1,58 +0,0 @@
-# asound.conf for Shuttle XS35GT
-# http://forum.xbmc.org/showpost.php?p=635394&postcount=330
-# in XBMC, set "audio output device" to custom
-# insert "pcm.both" into the text box
-
-pcm.!default {
- type plug
- slave {
- pcm both
- }
-}
-
-pcm.both {
- type route
- slave {
- pcm multi
- channels 4
- }
- ttable.0.0 1.0
- ttable.1.1 1.0
- ttable.0.2 1.0
- ttable.1.3 1.0
-}
-
-pcm.multi {
- type multi
- slaves.a {
- pcm tv
- channels 2
- }
- slaves.b {
- pcm receiver
- channels 2
- }
- bindings.0.slave a
- bindings.0.channel 0
- bindings.1.slave a
- bindings.1.channel 1
- bindings.2.slave b
- bindings.2.channel 0
- bindings.3.slave b
- bindings.3.channel 1
-}
-
-pcm.receiver {
- type hw
- card 0
- device 0
- channels 2
-}
-
-pcm.tv {
- type hw
- card 1
- device 7
- channels 2
-}
-
View
44 projects/Ultra/filesystem/etc/init.d/03_oemscript
@@ -0,0 +1,44 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+# This Program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This Program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC.tv; see the file COPYING. If not, write to
+# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+# http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+#
+# OEM scripts
+#
+# runlevels: openelec, installer, textmode
+
+if [ ! -f /etc/asound.conf -a ! -f $HOME/.config/asound.conf ]; then
+
+ DMI_BOARD_VENDOR=`cat /sys/class/dmi/id/board_vendor`
+ DMI_BOARD_VERSION=`cat /sys/class/dmi/id/board_version`
+
+ if [ "$DMI_BOARD_VENDOR" = "XtReAmEr" ]; then
+ if [ "$DMI_BOARD_VERSION" = "To be filled by O.E.M." ]; then
+
+ # Xtreamer Ultra 1
+ cp /usr/share/xtreamer/asound.conf.ultra1 /run/asound.conf
+
+ elif [ "$DMI_BOARD_VERSION" = "Xtreamer" ]; then
+
+ # Xtreamer Ultra 2
+ cp /usr/share/xtreamer/asound.conf.ultra2 /run/asound.conf
+
+ fi
+ fi
+fi
View
85 projects/Ultra/filesystem/usr/share/xtreamer/asound.conf.ultra1
@@ -0,0 +1,85 @@
+pcm.!default {
+ type plug
+ slave {
+ pcm "both"
+ }
+}
+
+pcm.both {
+ type route
+ slave {
+ pcm multi
+ channels 6
+ }
+ ttable.0.0 1.0
+ ttable.1.1 1.0
+ ttable.0.2 1.0
+ ttable.1.3 1.0
+ ttable.0.4 1.0
+ ttable.1.5 1.0
+}
+
+pcm.multi {
+ type multi
+ slaves.a {
+ pcm "hdmi_hw"
+ channels 2
+ }
+ slaves.b {
+ pcm "digital_hw"
+ channels 2
+ }
+ slaves.c {
+ pcm "analog_hw"
+ channels 2
+ }
+ bindings.0.slave a
+ bindings.0.channel 0
+ bindings.1.slave a
+ bindings.1.channel 1
+ bindings.2.slave b
+ bindings.2.channel 0
+ bindings.3.slave b
+ bindings.3.channel 1
+ bindings.4.slave c
+ bindings.4.channel 0
+ bindings.5.slave c
+ bindings.5.channel 1
+}
+
+pcm.hdmi_hw {
+ type hw
+ card 1
+ device 7
+ channels 2
+}
+
+pcm.hdmi_formatted {
+ type plug
+ slave {
+ pcm hdmi_hw
+ rate 48000
+ channels 2
+ }
+}
+
+pcm.hdmi_complete {
+ type softvol
+ slave.pcm hdmi_formatted
+ control.name hdmi_volume
+ control.card 1
+}
+
+pcm.digital_hw {
+ type hw
+ card 0
+ device 1
+ channels 2
+}
+
+pcm.analog_hw {
+ type hw
+ card 0
+ device 0
+ channels 2
+}
View
85 projects/Ultra/filesystem/usr/share/xtreamer/asound.conf.ultra2
@@ -0,0 +1,85 @@
+pcm.!default {
+ type plug
+ slave {
+ pcm "both"
+ }
+}
+
+pcm.both {
+ type route
+ slave {
+ pcm multi
+ channels 6
+ }
+ ttable.0.0 1.0
+ ttable.1.1 1.0
+ ttable.0.2 1.0
+ ttable.1.3 1.0
+ ttable.0.4 1.0
+ ttable.1.5 1.0
+}
+
+pcm.multi {
+ type multi
+ slaves.a {
+ pcm "hdmi_hw"
+ channels 2
+ }
+ slaves.b {
+ pcm "digital_hw"
+ channels 2
+ }
+ slaves.c {
+ pcm "analog_hw"
+ channels 2
+ }
+ bindings.0.slave a
+ bindings.0.channel 0
+ bindings.1.slave a
+ bindings.1.channel 1
+ bindings.2.slave b
+ bindings.2.channel 0
+ bindings.3.slave b
+ bindings.3.channel 1
+ bindings.4.slave c
+ bindings.4.channel 0
+ bindings.5.slave c
+ bindings.5.channel 1
+}
+
+pcm.hdmi_hw {
+ type hw
+ card 1
+ device 3
+ channels 2
+}
+
+pcm.hdmi_formatted {
+ type plug
+ slave {
+ pcm hdmi_hw
+ rate 48000
+ channels 2
+ }
+}
+
+pcm.hdmi_complete {
+ type softvol
+ slave.pcm hdmi_formatted
+ control.name hdmi_volume
+ control.card 1
+}
+
+pcm.digital_hw {
+ type hw
+ card 0
+ device 1
+ channels 2
+}
+
+pcm.analog_hw {
+ type hw
+ card 0
+ device 0
+ channels 2
+}

No commit comments for this range

Something went wrong with that request. Please try again.