Correctly set the mixer for each sound subsystem.

For now it's /dev/mixer and ALSA:default.

2 files changed, 72 insertions, 0 deletions

diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
new file mode 100644
index 0000000..4da7463
--- /dev/null
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -0,0 +1,66 @@
+pkgname=LinHES-config
+pkgver=1.0
+pkgrel=296
+conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
+pkgdesc="Install and configure your system"
+depends=(bc libstatgrab  mysql-python expect curl dnsutils parted sg3_utils nmbscan )
+arch=('i686')
+
+source=(mythinstall.bin myth_user_call file_time_offset.py install-ui.xml install_proxy.sh install_functions.sh systemconfig.sh install_db_chroot.sh restore_default_settings.sh xconfig.sh timezip.py soundconfig.sh LinHES-release issue MythVantage.sh create_master.sh build_diskless.sh networkconfig.sh timezone.bin autocard.py restore_km_db_chroot.sh README)
+
+install=LinHES.install
+build() {
+    mkdir -p $startdir/pkg/etc
+    mkdir -p $startdir/pkg/usr/share/mythtv/themes/default
+
+    MVDIR=$startdir/pkg/usr/MythVantage
+    mkdir  $startdir/pkg/etc/profile.d
+    install -m 0755 MythVantage.sh  $startdir/pkg/etc/profile.d/MythVantage.sh
+    mkdir -p $MVDIR/bin
+    mkdir -p $MVDIR/templates
+    mkdir -p $MVDIR/etc
+
+#copy in all the installer specific stuff
+    rsync -r --exclude=.svn ../templates $MVDIR/
+    install -m0700 myth_user_call  $MVDIR/bin/myth_user_call
+    install -m 0755 install_proxy.sh  $MVDIR/bin/install_proxy.sh
+    install -m 0755 install_functions.sh  $MVDIR/bin/install_functions.sh
+    install -m 0755 systemconfig.sh  $MVDIR/bin/systemconfig.sh
+    install -m 0755 xconfig.sh  $MVDIR/bin/xconfig.sh
+#    install -m 0755 live-install.sh $MVDIR/bin/live-install.sh
+    install -m 0755 install_db_chroot.sh $MVDIR/bin/install_db_chroot.sh
+    install -m 0755 restore_km_db_chroot.sh $MVDIR/bin/restore_km_db_chroot.sh
+    install -m 0755 restore_default_settings.sh $MVDIR/bin/restore_default_settings.sh
+    install -m 0755 soundconfig.sh $MVDIR/bin/soundconfig.sh
+    install -m 0755 networkconfig.sh $MVDIR/bin/networkconfig.sh
+    install -m 0755 create_master.sh $MVDIR/bin/create_master.sh
+    install -m 0755 build_diskless.sh $MVDIR/bin/build_diskless.sh
+    install -m 0755 timezone.bin $MVDIR/bin/timezone.bin
+    install -m 0755 timezip.py $MVDIR/bin/timezip.py
+    install -m 0755 autocard.py $MVDIR/bin/autocard.py
+    
+    
+    install -m 0755 README $MVDIR/README
+
+    mkdir -p $startdir/pkg/usr/bin
+    install -m 0755 file_time_offset.py $startdir/pkg/usr/bin/file_time_offset.py
+    #copy in the branding stuff
+    install -m 0755 LinHES-release $startdir/pkg/etc/LinHES-release
+    install -m 0755 issue $startdir/pkg/etc/issue
+
+# copy over the ui files
+    install -m 0755 install-ui.xml $startdir/pkg/usr/share/mythtv/themes/default/
+
+#copy in the binaries
+    #install -g mythtv -m 4750 mythinstall.bin $MVDIR/bin/MythVantage
+    install  -m 4755 mythinstall.bin $MVDIR/bin/MythVantage
+    cd $MVDIR/bin
+    ln -s MythVantage mythvantage
+    ln -s MythVantage mythinstall
+    cd -
+#    install -g mythtv -m 4750 mythbeselect.bin $MVDIR/bin/mythbeselect
+
+#    install -m 0755 startx $startdir/pkg/root/startx
+#    install -m 0755 live-install.sh $startdir/pkg/root/live-install.sh
+}
+
diff --git a/abs/core-testing/LinHES-config/restore_default_settings.sh b/abs/core-testing/LinHES-config/restore_default_settings.sh
index 30429c6..dcf5e23 100755
--- a/abs/core-testing/LinHES-config/restore_default_settings.sh
+++ b/abs/core-testing/LinHES-config/restore_default_settings.sh
@@ -62,7 +62,11 @@ function ALSADEVICE () {
     if [ x$Audiotype = xALSA ]
     then
         SoundDevice=ALSA:$SoundDevice
+        MixerDevice="ALSA:default"
+    else
+        MixerDevice="/dev/mixer"
     fi
+
 }
 
 
@@ -310,7 +314,9 @@ case $OPERATION in
         MUSICFRONT)
                 ALSADEVICE
                 $MYSQLCMD_C "delete from settings where value='AudioOutputDevice' and hostname=\"$hostname\";"
+                $MYSQLCMD_C "delete from settings where value='MixerDevice' and hostname=\"$hostname\";"
                 $MYSQLCMD_C "REPLACE INTO  settings set data='$SoundDevice',  value='AudioOutputDevice' , hostname=\"$hostname\";"
+                $MYSQLCMD_C "REPLACE INTO  settings set data='$MixerDevice',  value='MixerDevice' , hostname=\"$hostname\";"
                 #need to reload the settings.
                 systemconfig.sh reloadfe
                 ;;