|
|
@ -128,17 +128,20 @@ then |
|
|
|
set MIXER_AUX ${MIXER} |
|
|
|
set MIXER_AUX ${MIXER} |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
if [ -f ${SDCARD_MIXERS_PATH}/${MIXER}.main.mix ] |
|
|
|
if [ "$MIXER_FILE" == none ] |
|
|
|
then |
|
|
|
then |
|
|
|
# Use the mixer file from the SD-card if it exists. |
|
|
|
if [ -f ${SDCARD_MIXERS_PATH}/${MIXER}.main.mix ] |
|
|
|
set MIXER_FILE ${SDCARD_MIXERS_PATH}/${MIXER}.main.mix |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
# Try out the old convention, for backward compatibility. |
|
|
|
|
|
|
|
if [ -f ${SDCARD_MIXERS_PATH}/${MIXER}.mix ] |
|
|
|
|
|
|
|
then |
|
|
|
then |
|
|
|
set MIXER_FILE ${SDCARD_MIXERS_PATH}/${MIXER}.mix |
|
|
|
# Use the mixer file from the SD-card if it exists. |
|
|
|
|
|
|
|
set MIXER_FILE ${SDCARD_MIXERS_PATH}/${MIXER}.main.mix |
|
|
|
else |
|
|
|
else |
|
|
|
set MIXER_FILE /etc/mixers/${MIXER}.main.mix |
|
|
|
# Try out the old convention, for backward compatibility. |
|
|
|
|
|
|
|
if [ -f ${SDCARD_MIXERS_PATH}/${MIXER}.mix ] |
|
|
|
|
|
|
|
then |
|
|
|
|
|
|
|
set MIXER_FILE ${SDCARD_MIXERS_PATH}/${MIXER}.mix |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
set MIXER_FILE /etc/mixers/${MIXER}.main.mix |
|
|
|
|
|
|
|
fi |
|
|
|
fi |
|
|
|
fi |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
@ -168,7 +171,6 @@ then |
|
|
|
tone_alarm ${TUNE_ERR} |
|
|
|
tone_alarm ${TUNE_ERR} |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
unset MIXER_FILE |
|
|
|
|
|
|
|
else |
|
|
|
else |
|
|
|
if [ $MIXER != skip ] |
|
|
|
if [ $MIXER != skip ] |
|
|
|
then |
|
|
|
then |
|
|
|