diff --git a/projects/Ultra/splash/ultra1/images/splash-1920x1080.png b/projects/Ultra/splash/original/ultra1/splash-1920x1080.png similarity index 100% rename from projects/Ultra/splash/ultra1/images/splash-1920x1080.png rename to projects/Ultra/splash/original/ultra1/splash-1920x1080.png diff --git a/projects/Ultra/splash/ultra2/images/splash-1920x1080.png b/projects/Ultra/splash/original/ultra2/splash-1920x1080.png similarity index 100% rename from projects/Ultra/splash/ultra2/images/splash-1920x1080.png rename to projects/Ultra/splash/original/ultra2/splash-1920x1080.png diff --git a/projects/Ultra/splash/splash.conf b/projects/Ultra/splash/splash.conf new file mode 100644 index 0000000000..c38aff89a5 --- /dev/null +++ b/projects/Ultra/splash/splash.conf @@ -0,0 +1,40 @@ +################################################################################ +# 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 +################################################################################ + +# +# splash.conf +# + +DMI_BOARD_VENDOR=`cat /sys/class/dmi/id/board_vendor` +SYSTEM_CPU=`grep -m1 model /proc/cpuinfo | awk '{print $3}'` + +if [ "$DMI_BOARD_VENDOR" = "XtReAmEr" ]; then + if [ "$SYSTEM_CPU" = "28" ]; then + + # Xtreamer Ultra 1 + SPLASHIMAGE="/splash/splash_ultra1.png" + + elif [ "$SYSTEM_CPU" = "54" ]; then + + # Xtreamer Ultra 2 + SPLASHIMAGE="/splash/splash_ultra2.png" + + fi +fi diff --git a/projects/Ultra/splash/ultra1/images/splash-1024x768.png b/projects/Ultra/splash/splash_ultra1.png similarity index 100% rename from projects/Ultra/splash/ultra1/images/splash-1024x768.png rename to projects/Ultra/splash/splash_ultra1.png diff --git a/projects/Ultra/splash/ultra2/images/splash-1024x768.png b/projects/Ultra/splash/splash_ultra2.png similarity index 100% rename from projects/Ultra/splash/ultra2/images/splash-1024x768.png rename to projects/Ultra/splash/splash_ultra2.png diff --git a/projects/Ultra/splash/ultra1/1024x768.cfg b/projects/Ultra/splash/ultra1/1024x768.cfg deleted file mode 100644 index e1a6ebfdf9..0000000000 --- a/projects/Ultra/splash/ultra1/1024x768.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# This is a gensplash configuration file for -# theme OpenELEC, resolution 1024x768. - -# bgcolor is the text background (i.e. transparent) color. -bgcolor=0 - -# ttf message output parameters -text_x=10 -text_y=10 -text_size=18 -text_color=#83b9dd -text_font=/usr/share/fonts/liberation/LiberationSans-Regular.ttf - -# name of the picture file (full path recommended) -pic=/etc/splash/ultra1/images/splash-1024x768.png -silentpic=/etc/splash/ultra1/images/splash-1024x768.png diff --git a/projects/Ultra/splash/ultra1/1280x1024.cfg b/projects/Ultra/splash/ultra1/1280x1024.cfg deleted file mode 100644 index 6d8cd0bae3..0000000000 --- a/projects/Ultra/splash/ultra1/1280x1024.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# This is a gensplash configuration file for -# theme OpenELEC, resolution 1280x1024. - -# bgcolor is the text background (i.e. transparent) color. -bgcolor=0 - -# ttf message output parameters -text_x=10 -text_y=10 -text_size=18 -text_color=#83b9dd -text_font=/usr/share/fonts/liberation/LiberationSans-Regular.ttf - -# name of the picture file (full path recommended) -pic=/etc/splash/ultra1/images/splash-1280x1024.png -silentpic=/etc/splash/ultra1/images/splash-1280x1024.png diff --git a/projects/Ultra/splash/ultra1/1280x720.cfg b/projects/Ultra/splash/ultra1/1280x720.cfg deleted file mode 100644 index 5d4cef51af..0000000000 --- a/projects/Ultra/splash/ultra1/1280x720.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# This is a gensplash configuration file for -# theme OpenELEC, resolution 1280x720. - -# bgcolor is the text background (i.e. transparent) color. -bgcolor=0 - -# ttf message output parameters -text_x=10 -text_y=10 -text_size=18 -text_color=#83b9dd -text_font=/usr/share/fonts/liberation/LiberationSans-Regular.ttf - -# name of the picture file (full path recommended) -pic=/etc/splash/ultra1/images/splash-1280x720.png -silentpic=/etc/splash/ultra1/images/splash-1280x720.png diff --git a/projects/Ultra/splash/ultra1/1280x800.cfg b/projects/Ultra/splash/ultra1/1280x800.cfg deleted file mode 100644 index 3ec112fa09..0000000000 --- a/projects/Ultra/splash/ultra1/1280x800.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# This is a gensplash configuration file for -# theme OpenELEC, resolution 1280x800. - -# bgcolor is the text background (i.e. transparent) color. -bgcolor=0 - -# ttf message output parameters -text_x=10 -text_y=10 -text_size=18 -text_color=#83b9dd -text_font=/usr/share/fonts/liberation/LiberationSans-Regular.ttf - -# name of the picture file (full path recommended) -pic=/etc/splash/ultra1/images/splash-1280x800.png -silentpic=/etc/splash/ultra1/images/splash-1280x800.png diff --git a/projects/Ultra/splash/ultra1/1400x1050.cfg b/projects/Ultra/splash/ultra1/1400x1050.cfg deleted file mode 100644 index e82dd83137..0000000000 --- a/projects/Ultra/splash/ultra1/1400x1050.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# This is a gensplash configuration file for -# theme OpenELEC, resolution 1400x1050. - -# bgcolor is the text background (i.e. transparent) color. -bgcolor=0 - -# ttf message output parameters -text_x=10 -text_y=10 -text_size=18 -text_color=#83b9dd -text_font=/usr/share/fonts/liberation/LiberationSans-Regular.ttf - -# name of the picture file (full path recommended) -pic=/etc/splash/ultra1/images/splash-1400x1050.png -silentpic=/etc/splash/ultra1/images/splash-1400x1050.png diff --git a/projects/Ultra/splash/ultra1/1600x1200.cfg b/projects/Ultra/splash/ultra1/1600x1200.cfg deleted file mode 100644 index 33a3bce3a5..0000000000 --- a/projects/Ultra/splash/ultra1/1600x1200.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# This is a gensplash configuration file for -# theme OpenELEC, resolution 1600x1200. - -# bgcolor is the text background (i.e. transparent) color. -bgcolor=0 - -# ttf message output parameters -text_x=10 -text_y=10 -text_size=18 -text_color=#83b9dd -text_font=/usr/share/fonts/liberation/LiberationSans-Regular.ttf - -# name of the picture file (full path recommended) -pic=/etc/splash/ultra1/images/splash-1600x1200.png -silentpic=/etc/splash/ultra1/images/splash-1600x1200.png diff --git a/projects/Ultra/splash/ultra1/1600x900.cfg b/projects/Ultra/splash/ultra1/1600x900.cfg deleted file mode 100644 index ab8b6773b7..0000000000 --- a/projects/Ultra/splash/ultra1/1600x900.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# This is a gensplash configuration file for -# theme OpenELEC, resolution 1600x900. - -# bgcolor is the text background (i.e. transparent) color. -bgcolor=0 - -# ttf message output parameters -text_x=10 -text_y=10 -text_size=18 -text_color=#83b9dd -text_font=/usr/share/fonts/liberation/LiberationSans-Regular.ttf - -# name of the picture file (full path recommended) -pic=/etc/splash/ultra1/images/splash-1600x900.png -silentpic=/etc/splash/ultra1/images/splash-1600x900.png diff --git a/projects/Ultra/splash/ultra1/1920x1080.cfg b/projects/Ultra/splash/ultra1/1920x1080.cfg deleted file mode 100644 index e91695ce31..0000000000 --- a/projects/Ultra/splash/ultra1/1920x1080.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# This is a gensplash configuration file for -# theme OpenELEC, resolution 1920x1080. - -# bgcolor is the text background (i.e. transparent) color. -bgcolor=0 - -# ttf message output parameters -text_x=10 -text_y=10 -text_size=18 -text_color=#83b9dd -text_font=/usr/share/fonts/liberation/LiberationSans-Regular.ttf - -# name of the picture file (full path recommended) -pic=/etc/splash/ultra1/images/splash-1920x1080.png -silentpic=/etc/splash/ultra1/images/splash-1920x1080.png diff --git a/projects/Ultra/splash/ultra1/800x600.cfg b/projects/Ultra/splash/ultra1/800x600.cfg deleted file mode 100644 index c48fa533da..0000000000 --- a/projects/Ultra/splash/ultra1/800x600.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# This is a gensplash configuration file for -# theme OpenELEC, resolution 800x600. - -# bgcolor is the text background (i.e. transparent) color. -bgcolor=0 - -# ttf message output parameters -text_x=10 -text_y=10 -text_size=18 -text_color=#83b9dd -text_font=/usr/share/fonts/liberation/LiberationSans-Regular.ttf - -# name of the picture file (full path recommended) -pic=/etc/splash/ultra1/images/splash-800x600.png -silentpic=/etc/splash/ultra1/images/splash-800x600.png diff --git a/projects/Ultra/splash/ultra1/images/splash-1280x1024.png b/projects/Ultra/splash/ultra1/images/splash-1280x1024.png deleted file mode 100644 index b7434b778f..0000000000 Binary files a/projects/Ultra/splash/ultra1/images/splash-1280x1024.png and /dev/null differ diff --git a/projects/Ultra/splash/ultra1/images/splash-1280x720.png b/projects/Ultra/splash/ultra1/images/splash-1280x720.png deleted file mode 100644 index e4df0de2b6..0000000000 Binary files a/projects/Ultra/splash/ultra1/images/splash-1280x720.png and /dev/null differ diff --git a/projects/Ultra/splash/ultra1/images/splash-1280x800.png b/projects/Ultra/splash/ultra1/images/splash-1280x800.png deleted file mode 100644 index 19115d959b..0000000000 Binary files a/projects/Ultra/splash/ultra1/images/splash-1280x800.png and /dev/null differ diff --git a/projects/Ultra/splash/ultra1/images/splash-1400x1050.png b/projects/Ultra/splash/ultra1/images/splash-1400x1050.png deleted file mode 100644 index 2cd4144eba..0000000000 Binary files a/projects/Ultra/splash/ultra1/images/splash-1400x1050.png and /dev/null differ diff --git a/projects/Ultra/splash/ultra1/images/splash-1600x1200.png b/projects/Ultra/splash/ultra1/images/splash-1600x1200.png deleted file mode 100644 index c9b20ff568..0000000000 Binary files a/projects/Ultra/splash/ultra1/images/splash-1600x1200.png and /dev/null differ diff --git a/projects/Ultra/splash/ultra1/images/splash-1600x900.png b/projects/Ultra/splash/ultra1/images/splash-1600x900.png deleted file mode 100644 index 25cba55cc1..0000000000 Binary files a/projects/Ultra/splash/ultra1/images/splash-1600x900.png and /dev/null differ diff --git a/projects/Ultra/splash/ultra1/images/splash-800x600.png b/projects/Ultra/splash/ultra1/images/splash-800x600.png deleted file mode 100644 index 8dc643ef94..0000000000 Binary files a/projects/Ultra/splash/ultra1/images/splash-800x600.png and /dev/null differ diff --git a/projects/Ultra/splash/ultra2/1024x768.cfg b/projects/Ultra/splash/ultra2/1024x768.cfg deleted file mode 100644 index 265c7cbcd9..0000000000 --- a/projects/Ultra/splash/ultra2/1024x768.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# This is a gensplash configuration file for -# theme OpenELEC, resolution 1024x768. - -# bgcolor is the text background (i.e. transparent) color. -bgcolor=0 - -# ttf message output parameters -text_x=10 -text_y=10 -text_size=18 -text_color=#83b9dd -text_font=/usr/share/fonts/liberation/LiberationSans-Regular.ttf - -# name of the picture file (full path recommended) -pic=/etc/splash/ultra2/images/splash-1024x768.png -silentpic=/etc/splash/ultra2/images/splash-1024x768.png diff --git a/projects/Ultra/splash/ultra2/1280x1024.cfg b/projects/Ultra/splash/ultra2/1280x1024.cfg deleted file mode 100644 index f48dab8512..0000000000 --- a/projects/Ultra/splash/ultra2/1280x1024.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# This is a gensplash configuration file for -# theme OpenELEC, resolution 1280x1024. - -# bgcolor is the text background (i.e. transparent) color. -bgcolor=0 - -# ttf message output parameters -text_x=10 -text_y=10 -text_size=18 -text_color=#83b9dd -text_font=/usr/share/fonts/liberation/LiberationSans-Regular.ttf - -# name of the picture file (full path recommended) -pic=/etc/splash/ultra2/images/splash-1280x1024.png -silentpic=/etc/splash/ultra2/images/splash-1280x1024.png diff --git a/projects/Ultra/splash/ultra2/1280x720.cfg b/projects/Ultra/splash/ultra2/1280x720.cfg deleted file mode 100644 index 541fbf873c..0000000000 --- a/projects/Ultra/splash/ultra2/1280x720.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# This is a gensplash configuration file for -# theme OpenELEC, resolution 1280x720. - -# bgcolor is the text background (i.e. transparent) color. -bgcolor=0 - -# ttf message output parameters -text_x=10 -text_y=10 -text_size=18 -text_color=#83b9dd -text_font=/usr/share/fonts/liberation/LiberationSans-Regular.ttf - -# name of the picture file (full path recommended) -pic=/etc/splash/ultra2/images/splash-1280x720.png -silentpic=/etc/splash/ultra2/images/splash-1280x720.png diff --git a/projects/Ultra/splash/ultra2/1280x800.cfg b/projects/Ultra/splash/ultra2/1280x800.cfg deleted file mode 100644 index 065be7140d..0000000000 --- a/projects/Ultra/splash/ultra2/1280x800.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# This is a gensplash configuration file for -# theme OpenELEC, resolution 1280x800. - -# bgcolor is the text background (i.e. transparent) color. -bgcolor=0 - -# ttf message output parameters -text_x=10 -text_y=10 -text_size=18 -text_color=#83b9dd -text_font=/usr/share/fonts/liberation/LiberationSans-Regular.ttf - -# name of the picture file (full path recommended) -pic=/etc/splash/ultra2/images/splash-1280x800.png -silentpic=/etc/splash/ultra2/images/splash-1280x800.png diff --git a/projects/Ultra/splash/ultra2/1400x1050.cfg b/projects/Ultra/splash/ultra2/1400x1050.cfg deleted file mode 100644 index 00f9730d31..0000000000 --- a/projects/Ultra/splash/ultra2/1400x1050.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# This is a gensplash configuration file for -# theme OpenELEC, resolution 1400x1050. - -# bgcolor is the text background (i.e. transparent) color. -bgcolor=0 - -# ttf message output parameters -text_x=10 -text_y=10 -text_size=18 -text_color=#83b9dd -text_font=/usr/share/fonts/liberation/LiberationSans-Regular.ttf - -# name of the picture file (full path recommended) -pic=/etc/splash/ultra2/images/splash-1400x1050.png -silentpic=/etc/splash/ultra2/images/splash-1400x1050.png diff --git a/projects/Ultra/splash/ultra2/1600x1200.cfg b/projects/Ultra/splash/ultra2/1600x1200.cfg deleted file mode 100644 index bb410bf28e..0000000000 --- a/projects/Ultra/splash/ultra2/1600x1200.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# This is a gensplash configuration file for -# theme OpenELEC, resolution 1600x1200. - -# bgcolor is the text background (i.e. transparent) color. -bgcolor=0 - -# ttf message output parameters -text_x=10 -text_y=10 -text_size=18 -text_color=#83b9dd -text_font=/usr/share/fonts/liberation/LiberationSans-Regular.ttf - -# name of the picture file (full path recommended) -pic=/etc/splash/ultra2/images/splash-1600x1200.png -silentpic=/etc/splash/ultra2/images/splash-1600x1200.png diff --git a/projects/Ultra/splash/ultra2/1600x900.cfg b/projects/Ultra/splash/ultra2/1600x900.cfg deleted file mode 100644 index 4c5c109849..0000000000 --- a/projects/Ultra/splash/ultra2/1600x900.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# This is a gensplash configuration file for -# theme OpenELEC, resolution 1600x900. - -# bgcolor is the text background (i.e. transparent) color. -bgcolor=0 - -# ttf message output parameters -text_x=10 -text_y=10 -text_size=18 -text_color=#83b9dd -text_font=/usr/share/fonts/liberation/LiberationSans-Regular.ttf - -# name of the picture file (full path recommended) -pic=/etc/splash/ultra2/images/splash-1600x900.png -silentpic=/etc/splash/ultra2/images/splash-1600x900.png diff --git a/projects/Ultra/splash/ultra2/1920x1080.cfg b/projects/Ultra/splash/ultra2/1920x1080.cfg deleted file mode 100644 index 5f139fc5f4..0000000000 --- a/projects/Ultra/splash/ultra2/1920x1080.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# This is a gensplash configuration file for -# theme OpenELEC, resolution 1920x1080. - -# bgcolor is the text background (i.e. transparent) color. -bgcolor=0 - -# ttf message output parameters -text_x=10 -text_y=10 -text_size=18 -text_color=#83b9dd -text_font=/usr/share/fonts/liberation/LiberationSans-Regular.ttf - -# name of the picture file (full path recommended) -pic=/etc/splash/ultra2/images/splash-1920x1080.png -silentpic=/etc/splash/ultra2/images/splash-1920x1080.png diff --git a/projects/Ultra/splash/ultra2/800x600.cfg b/projects/Ultra/splash/ultra2/800x600.cfg deleted file mode 100644 index 2901ac9d6b..0000000000 --- a/projects/Ultra/splash/ultra2/800x600.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# This is a gensplash configuration file for -# theme OpenELEC, resolution 800x600. - -# bgcolor is the text background (i.e. transparent) color. -bgcolor=0 - -# ttf message output parameters -text_x=10 -text_y=10 -text_size=18 -text_color=#83b9dd -text_font=/usr/share/fonts/liberation/LiberationSans-Regular.ttf - -# name of the picture file (full path recommended) -pic=/etc/splash/ultra2/images/splash-800x600.png -silentpic=/etc/splash/ultra2/images/splash-800x600.png diff --git a/projects/Ultra/splash/ultra2/images/splash-1280x1024.png b/projects/Ultra/splash/ultra2/images/splash-1280x1024.png deleted file mode 100644 index b38eac0c35..0000000000 Binary files a/projects/Ultra/splash/ultra2/images/splash-1280x1024.png and /dev/null differ diff --git a/projects/Ultra/splash/ultra2/images/splash-1280x720.png b/projects/Ultra/splash/ultra2/images/splash-1280x720.png deleted file mode 100644 index bc1fdc895a..0000000000 Binary files a/projects/Ultra/splash/ultra2/images/splash-1280x720.png and /dev/null differ diff --git a/projects/Ultra/splash/ultra2/images/splash-1280x800.png b/projects/Ultra/splash/ultra2/images/splash-1280x800.png deleted file mode 100644 index 39b331573e..0000000000 Binary files a/projects/Ultra/splash/ultra2/images/splash-1280x800.png and /dev/null differ diff --git a/projects/Ultra/splash/ultra2/images/splash-1400x1050.png b/projects/Ultra/splash/ultra2/images/splash-1400x1050.png deleted file mode 100644 index 17155fbb20..0000000000 Binary files a/projects/Ultra/splash/ultra2/images/splash-1400x1050.png and /dev/null differ diff --git a/projects/Ultra/splash/ultra2/images/splash-1600x1200.png b/projects/Ultra/splash/ultra2/images/splash-1600x1200.png deleted file mode 100644 index 2478dd62c6..0000000000 Binary files a/projects/Ultra/splash/ultra2/images/splash-1600x1200.png and /dev/null differ diff --git a/projects/Ultra/splash/ultra2/images/splash-1600x900.png b/projects/Ultra/splash/ultra2/images/splash-1600x900.png deleted file mode 100644 index 64f30f1e2f..0000000000 Binary files a/projects/Ultra/splash/ultra2/images/splash-1600x900.png and /dev/null differ diff --git a/projects/Ultra/splash/ultra2/images/splash-800x600.png b/projects/Ultra/splash/ultra2/images/splash-800x600.png deleted file mode 100644 index 93a1277c2b..0000000000 Binary files a/projects/Ultra/splash/ultra2/images/splash-800x600.png and /dev/null differ