changeset ddefee93afdc in /var/www/hg/openbricks
author: Johannes Schwanzer <johan
...@schwan-net.com>
details:
http://hg.openbricks.org/openbricks?cmd=changeset;node=ddefee93afdc
description:
merge two heads
diffstat:
config/platforms/arm/omap4/packages/gst-plugins-bad/meta | 2 +-
config/platforms/arm/omap4/packages/gst-plugins-base/meta | 2 +-
config/platforms/arm/omap4/packages/gst-plugins-good/meta | 2 +-
config/platforms/arm/omap4/packages/xbmc/meta | 47 --
packages/alsa-lib/config/ucm/Panda/Panda.conf | 5 -
packages/alsa-lib/config/ucm/Panda/hifi | 103 ++--
packages/alsa-lib/config/ucm/Panda/hifiLP | 55 ++-
packages/alsa-lib/config/ucm/PandaBoard/HiFi | 151 --------
packages/alsa-lib/config/ucm/PandaBoard/HiFiLP | 152 --------
packages/alsa-lib/config/ucm/PandaBoard/PandaBoard.conf | 39 --
packages/alsa-lib/config/ucm/SDP4430/SDP4430.conf | 10 -
packages/alsa-lib/config/ucm/SDP4430/hifi | 257 ++++++++++---
packages/alsa-lib/config/ucm/SDP4430/hifiLP | 210 ++++++++++-
packages/alsa-lib/config/ucm/SDP4430/record | 4 +-
packages/alsa-lib/config/ucm/SDP4430/voice | 8 +-
packages/alsa-lib/config/ucm/SDP4430/voiceCall | 8 +-
packages/alsa-utils/scripts/alsa-mixer-setup | 2 +-
packages/gst-ducati/meta | 4 +-
packages/gst-plugins-bad/meta | 2 +-
packages/gst-plugins-ugly/meta | 2 +-
packages/libdce/meta | 4 +-
21 files changed, 502 insertions(+), 567 deletions(-)
diffs (1353 lines):
diff -r 23d7bcd393eb -r ddefee93afdc config/platforms/arm/omap4/packages/gst-plugins-bad/meta
--- a/config/platforms/arm/omap4/packages/gst-plugins-bad/meta Sat Jul 28 17:25:37 2012 +0200
+++ b/config/platforms/arm/omap4/packages/gst-plugins-bad/meta Sat Jul 28 17:32:35 2012 +0200
@@ -4,7 +4,7 @@
# Refer to https://launchpad.net/~tiomap-dev/+archive/release/+packages
# for updates
#
-PKG_URL_REV=036dc3d
+PKG_URL_REV=feb53a9
PKG_VERSION=0.10.23+${PKG_URL_REV}
PKG_URL_PROTO=git
PKG_URL="git://gitorious.org/ubuntu-omap/gst-plugins-bad.git"
diff -r 23d7bcd393eb -r ddefee93afdc config/platforms/arm/omap4/packages/gst-plugins-base/meta
--- a/config/platforms/arm/omap4/packages/gst-plugins-base/meta Sat Jul 28 17:25:37 2012 +0200
+++ b/config/platforms/arm/omap4/packages/gst-plugins-base/meta Sat Jul 28 17:32:35 2012 +0200
@@ -4,7 +4,7 @@
# Refer to https://launchpad.net/~tiomap-dev/+archive/release/+packages
# for updates
#
-PKG_URL_REV=f81c9fb
+PKG_URL_REV=7a5b437
PKG_VERSION=0.10.36+${PKG_URL_REV}
PKG_URL_PROTO=git
PKG_URL="git://gitorious.org/ubuntu-omap/gst-plugins-base.git"
diff -r 23d7bcd393eb -r ddefee93afdc config/platforms/arm/omap4/packages/gst-plugins-good/meta
--- a/config/platforms/arm/omap4/packages/gst-plugins-good/meta Sat Jul 28 17:25:37 2012 +0200
+++ b/config/platforms/arm/omap4/packages/gst-plugins-good/meta Sat Jul 28 17:32:35 2012 +0200
@@ -4,7 +4,7 @@
# Refer to https://launchpad.net/~tiomap-dev/+archive/release/+packages
# for updates
#
-PKG_URL_REV=e2f21fd
+PKG_URL_REV=a270839
PKG_VERSION=0.10.31+${PKG_URL_REV}
PKG_URL_PROTO=git
PKG_URL="git://gitorious.org/ubuntu-omap/gst-plugins-good.git"
diff -r 23d7bcd393eb -r ddefee93afdc config/platforms/arm/omap4/packages/xbmc/meta
--- a/config/platforms/arm/omap4/packages/xbmc/meta Sat Jul 28 17:25:37 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Note to packagers:
-# - grab xbmc sources from http://mirrors.xbmc.org/releases/source/
-# - bootstrap
-# - package
-#
-
-PKG_NAME=xbmc
-PKG_VERSION=pvr-20120528-git8e5fa796
-PKG_URL="$DISTRO_SRCS/$PKG_NAME-${PKG_VERSION}.tar.bz2"
-PKG_REV=1
-PKG_DEPENDS="$TARGET_LIBC Python boost zlib bzip2 lzo pcre alsa-lib libssh libass enca curl dbus libXt libXtst libXmu libXrandr libXinerama fontconfig fribidi jpeg libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 SDL SDL-mixer SDL-image sqlite alsa yajl libplist openssl python-simplejson tinyxml"
-PKG_RUN_DEPENDS="mesa-demos xdpyinfo libmysqlclient libsmbclient"
-PKG_BUILD_DEPENDS="toolchain boost mysql samba unzip zip"
-PKG_USE="opengl opengles openmax joystick zeroconf webserver vdpau xvba vaapi crystalhd pulseaudio dvdcss bluray rtmp nonfree externalffmpeg pvr addons libcec libnfs afpclient airtunes screensavers gst"
-PKG_DEPENDS_opengl="mesa glew"
-PKG_DEPENDS_opengles="glew"
-PKG_USE_DEFAULT_opengl=yes
-PKG_BUILD_DEPENDS_opengles="OpenGLES"
-PKG_BUILD_DEPENDS_openmax="OpenMAX"
-PKG_USE_DESC_gst="Enable GStreamer modules"
-PKG_USE_DESC_joystick="Enable Joystick support"
-PKG_USE_DESC_faac="Enable AAC encoding support"
-PKG_USE_DESC_webserver="Enable Web Server support"
-PKG_DEPENDS_webserver="libmicrohttpd"
-PKG_DEPENDS_vdpau="libvdpau"
-PKG_DEPENDS_xvba="libva-xvba"
-PKG_DEPENDS_vaapi="libva"
-PKG_DEPENDS_zeroconf="avahi"
-PKG_DEPENDS_crystalhd="crystalhd"
-PKG_DEPENDS_pulseaudio="pulseaudio"
-PKG_USE_DESC_nonfree="Enable Non-Free modules"
-PKG_DEPENDS_bluray="libbluray"
-PKG_USE_DESC_rtmp="Enable RTMP support"
-PKG_DEPENDS_rtmp="rtmpdump"
-PKG_DEPENDS_externalffmpeg="ffmpeg"
-PKG_DEPENDS_pvr="pvr"
-PKG_DEPENDS_addons="xbmc-addon-geexbox-network xbmc-addon-geexbox-updater"
-PKG_DEPENDS_libcec="libcec"
-PKG_DEPENDS_libnfs="libnfs"
-PKG_DEPENDS_afpclient="afpfs-ng"
-PKG_DEPENDS_airtunes="libshairport"
-
-PKG_PRIORITY=optional
-PKG_SECTION=multimedia
-PKG_SHORTDESC="XBMC MediaCenter"
-PKG_LONGDESC="XBMC Media Center (which was formerly named Xbox Media Center) is a free and open source cross-platform media player and home entertainment system software with a 10-foot user interface designed for the living-room TV. Its graphical user interface allows the user to easily manage video, photos, podcasts, and music from a computer, optical disk, local network, and the internet using a remote control."
diff -r 23d7bcd393eb -r ddefee93afdc packages/alsa-lib/config/ucm/Panda/Panda.conf
--- a/packages/alsa-lib/config/ucm/Panda/Panda.conf Sat Jul 28 17:25:37 2012 +0200
+++ b/packages/alsa-lib/config/ucm/Panda/Panda.conf Sat Jul 28 17:32:35 2012 +0200
@@ -1,9 +1,4 @@
# UCM configuration for Panda
-SectionUseCase."Record" {
- File "record"
- Comment "Record."
-}
-
SectionUseCase."HiFi" {
File "hifi"
Comment "Play HiFi quality Music."
diff -r 23d7bcd393eb -r ddefee93afdc packages/alsa-lib/config/ucm/Panda/hifi
--- a/packages/alsa-lib/config/ucm/Panda/hifi Sat Jul 28 17:25:37 2012 +0200
+++ b/packages/alsa-lib/config/ucm/Panda/hifi Sat Jul 28 17:32:35 2012 +0200
@@ -1,83 +1,86 @@
# Use case Configuration for TI Panda HiFi Music
# By Liam Girdwood <l...@slimlogic.co.uk>
+# Updated by Sebastien Jan <s-...@ti.com>
SectionVerb {
EnableSequence [
- cdev "hw:Panda"
+ cdev "hw:Panda"
+
+ # program everything here. Not sure if it's better to split with a SectionDevice?
+
+ # ABE playback path through DL1
cset "name='DL1 Mixer Multimedia' 1"
cset "name='Sidetone Mixer Playback' 1"
- cset "name='DL1 PDM Switch' 1"
+ cset "name='DL1 PDM Switch' 1"
cset "name='DL1 Media Playback Volume' 90,90"
- cset "name='SDT DL Volume' 120"
+ cset "name='SDT DL Volume' 120"
- cset "name='Headset Left Playback' 1"
- cset "name='Headset Right Playback' 1"
- cset "name='Headset Playback Volume' 13"
+ # ABE PDM-UL capture path
+ cset "name='MUX_UL00' 11"
+ cset "name='MUX_UL01' 12"
+
+ # TWL6040 playback path
+ cset "name='Headset Left Playback' 1"
+ cset "name='Headset Right Playback' 1"
+ cset "name='Headset Playback Volume' 13"
+
+ # TWL6040 capture path
+ cset "name='Analog Left Capture Route' 0"
+ cset "name='Analog Right Capture Route' 0"
+ cset "name='Capture Preamplifier Volume' 2"
+ cset "name='Capture Volume' 4"
]
DisableSequence [
- cdev "hw:Panda"
+ cdev "hw:Panda"
+
+ # ABE playback path through DL1
cset "name='DL1 Mixer Multimedia' 0"
cset "name='Sidetone Mixer Playback' 0"
- cset "name='DL1 PDM Switch' 0"
+ cset "name='DL1 PDM Switch' 0"
cset "name='DL1 Media Playback Volume' 0,0"
- cset "name='SDT DL Volume' 0"
+ cset "name='SDT DL Volume' 0"
+ # ABE capture path
+ cset "name='MUX_UL00' 'None'"
+ cset "name='MUX_UL01' 'None'"
+ cset "name='Capture Volume' 0"
+
+ # TWL6040 playback path
cset "name='Headset Right Playback' 0"
cset "name='Headset Left Playback' 0"
- cset "name='Headset Playback Volume' 0"
+ cset "name='Headset Playback Volume' 0"
+
+ # TWL6040 Capture Path
+ cset "name='Analog Left Capture Route' 3"
+ cset "name='Analog Right Capture Route' 3"
+ cset "name='Capture Preamplifier Volume' 0"
+ cset "name='Capture Volume' 0"
]
# Optional TQ and ALSA PCMs
-# Value {
-# TQ "Music"
-# PlaybackPCM "hw:0,0"
-# PlaybackVolume "name='DL1 Media Playback Volume' 90,90"
-# PlaybackSwitch "name='DL1 PDM Switch' 1"
-# }
+ Value {
+ TQ "HiFi"
+
+ # ALSA PCM device for HiFi
+ PlaybackPCM "hw:Panda,0"
+ CapturePCM "hw:Panda,0"
+
+ # Default ALSA volume gain and mute kcontrols
+ PlaybackVolume "name='Headset Playback Volume' 13"
+ CaptureVolume "name='Capture Volume' 4"
+ }
}
SectionDevice."Headset".0 {
Comment "Panda 3.5mm Headset"
EnableSequence [
- cdev "hw:Panda"
- cset "name='Headset Left Playback' 1"
- cset "name='Headset Right Playback' 1"
- cset "name='Headset Playback Volume' 13"
+ cdev "hw:Panda"
]
DisableSequence [
- cdev "hw:Panda"
- cset "name='Headset Right Playback' 0"
- cset "name='Headset Left Playback' 0"
- cset "name='Headset Playback Volume' 0"
+ cdev "hw:Panda"
]
}
-#SectionModifier."RecordMedia".0 {
-# SupportedDevice [
-# "Headset"
-# ]
- # EnableSequence [
- # ....
- # ]
- #
- # DisableSequence [
- # ...
- # ]
- #
- # TransitionSequence."ToModifierName" [
- # ...
- # ]
- #
- # # Optional TQ and ALSA PCMs
- # Value {
- # TQ Voice
- # CapturePCM "hw:1"
- # PlaybackVolume "name='Master Playback Volume',index=2"
- # PlaybackSwitch "name='Master Playback Switch',index=2"
- # }
-#
-#}
-
diff -r 23d7bcd393eb -r ddefee93afdc packages/alsa-lib/config/ucm/Panda/hifiLP
--- a/packages/alsa-lib/config/ucm/Panda/hifiLP Sat Jul 28 17:25:37 2012 +0200
+++ b/packages/alsa-lib/config/ucm/Panda/hifiLP Sat Jul 28 17:32:35 2012 +0200
@@ -1,29 +1,71 @@
# Use case Configuration for TI Panda HiFi Music
# By Liam Girdwood <l...@slimlogic.co.uk>
+# Updated by Sebastien Jan <s-...@ti.com>
SectionVerb {
EnableSequence [
cdev "hw:Panda"
+
+ # program everything here. Not sure if it's better to split with a SectionDevice?
+
+ # ABE playback path through DL1
cset "name='DL1 Mixer Multimedia' 1"
cset "name='Sidetone Mixer Playback' 1"
cset "name='DL1 PDM Switch' 1"
cset "name='DL1 Media Playback Volume' 90,90"
cset "name='SDT DL Volume' 120"
+
+ # ABE PDM-UL capture path
+ cset "name='MUX_UL00' 11"
+ cset "name='MUX_UL01' 12"
+
+ # TWL6040 playback path
+ cset "name='Headset Left Playback' 1"
+ cset "name='Headset Right Playback' 1"
+
+ # TWL6040 capture path
+ cset "name='Analog Left Capture Route' 0"
+ cset "name='Analog Right Capture Route' 0"
+ cset "name='Capture Preamplifier Volume' 2"
]
DisableSequence [
cdev "hw:Panda"
+
+ # ABE playback path through DL1
cset "name='DL1 Mixer Multimedia' 0"
cset "name='Sidetone Mixer Playback' 0"
cset "name='DL1 PDM Switch' 0"
cset "name='DL1 Media Playback Volume' 0,0"
cset "name='SDT DL Volume' 0"
+
+ # ABE capture path
+ cset "name='MUX_UL00' 'None'"
+ cset "name='MUX_UL01' 'None'"
+ cset "name='Capture Volume' 0"
+
+ # TWL6040 playback path
+ cset "name='Headset Right Playback' 0"
+ cset "name='Headset Left Playback' 0"
+ cset "name='Headset Playback Volume' 0"
+
+ # TWL6040 Capture Path
+ cset "name='Analog Left Capture Route' 3"
+ cset "name='Analog Right Capture Route' 3"
+ cset "name='Capture Preamplifier Volume' 0"
]
- # Optional TQ and ALSA PCMs
+ # Optional TQ and ALSA PCMs
Value {
- TQ "Music"
- PlaybackPCM "hw:0,6"
+ TQ "HiFiLP"
+
+ # ALSA PCM device for HiFi
+ PlaybackPCM "hw:Panda,6"
+ CapturePCM "hw:Panda,0"
+
+ # Default ALSA volume gain and mute kcontrols
+ PlaybackVolume "name='Headset Playback Volume' 13"
+ CaptureVolume "name='Capture Volume' 4"
}
}
@@ -32,15 +74,10 @@
EnableSequence [
cdev "hw:Panda"
- cset "name='Headset Left Playback' 1"
- cset "name='Headset Right Playback' 1"
- cset "name='Headset Playback Volume' 13"
]
DisableSequence [
cdev "hw:Panda"
- cset "name='Headset Right Playback' 0"
- cset "name='Headset Left Playback' 0"
- cset "name='Headset Playback Volume' 0"
]
}
+
diff -r 23d7bcd393eb -r ddefee93afdc packages/alsa-lib/config/ucm/PandaBoard/HiFi
--- a/packages/alsa-lib/config/ucm/PandaBoard/HiFi Sat Jul 28 17:25:37 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,151 +0,0 @@
-# Use case Configuration for TI PandaBoard HiFi audio playback and capture
-# By Liam Girdwood <l...@ti.com>
-# Updated by Sebastien Jan <s-...@ti.com>
-
-######### Main Verb Config #################
-
-SectionVerb {
-
- EnableSequence [
- # Set SDP device for following cset commands
- cdev "hw:PandaBoard"
-
- # Enable ABE playback path through DL1
- cset "name='DL1 Mixer Multimedia' 1"
- cset "name='Sidetone Mixer Playback' 1"
- cset "name='DL1 PDM Switch' 1"
-
- # set ABE playback gains to 0dB
- cset "name='DL1 Media Playback Volume' 120"
- cset "name='DL2 Media Playback Volume' 120"
- cset "name='SDT DL Volume' 120"
-
- # Enable ABE PDM-UL Capture path
- cset "name='MUX_UL10' 11"
- cset "name='MUX_UL11' 12"
-
- # set ABE capture gains to 0dB
- cset "name='AMIC UL Volume' 120"
- ]
-
- DisableSequence [
- # Set SDP device for following cset commands
- cdev "hw:PandaBoard"
-
- # Disable ABE playback path through DL1
- cset "name='DL1 Mixer Multimedia' 0"
- cset "name='Sidetone Mixer Playback' 0"
- cset "name='DL1 PDM Switch' 0"
-
- # mute ABE playback gains
- cset "name='DL1 Media Playback Volume' 0"
- cset "name='DL2 Media Playback Volume' 0"
- cset "name='SDT DL Volume' 0"
-
- # Disable ABE PDM-UL Capture path
- cset "name='MUX_UL10' 0"
- cset "name='MUX_UL11' 0"
-
- # mute ABE capture gains
- cset "name='AMIC UL Volume' 0"
-
- ]
-
- # ALSA PCM
- Value {
-
- TQ "HiFi"
-
- # ALSA PCM device for HiFi
- PlaybackPCM "hw:PandaBoard,0"
- CapturePCM "hw:PandaBoard,1"
- }
-}
-
-###### Headset Devices Options ############
-
-SectionDevice."Headset" {
- Comment "PandaBoard 3.5mm Headset playback and capture"
-
- EnableSequence [
-
- # Set SDP device for following cset commands
- cdev "hw:PandaBoard"
-
- # TWL6040 playback path
- cset "name='Headset Left Playback' 1"
- cset "name='Headset Right Playback' 1"
-
- # TWL6040 Capture Path
- cset "name='Analog Left Capture Route' 0"
- cset "name='Analog Right Capture Route' 0"
- cset "name='Capture Preamplifier Volume' 2"
- ]
-
- DisableSequence [
-
- # Set SDP device for following cset commands
- cdev "hw:PandaBoard"
-
- # TWL6040 playback path
- cset "name='Headset Right Playback' 0"
- cset "name='Headset Left Playback' 0"
-
- # TWL6040 Capture path
- cset "name='Analog Left Capture Route' 3"
- cset "name='Analog Right Capture Route' 3"
- cset "name='Capture Preamplifier Volume' 0"
- ]
-
- Value {
- # Default ALSA volume gain and mute kcontrols
- CaptureVolume "name='Capture Volume' 4"
- PlaybackVolume "name='Headset Playback Volume' 13"
- PlaybackChannels "2"
- CaptureChannels "2"
- }
-}
-
-SectionModifier."PlayTone" {
- Comment "Play a ring tone or system sound"
-
- EnableSequence [
-
- # Set SDP device for following cset commands
- cdev "hw:PandaBoard"
-
- # ABE playback path through DL2
- cset "name='DL2 Mixer Tones' 1"
- cset "name='DL2 Tones Playback Volume' 120"
- cset "name='DL1 Mixer Tones' 1"
- cset "name='DL1 Tones Playback Volume' 120"
-
- # TWL6040 playback path
- cset "name='Handsfree Left Playback' 1"
- cset "name='Handsfree Right Playback' 1"
- ]
-
- DisableSequence [
-
- # Set SDP device for following cset commands
- cdev "hw:PandaBoard"
-
- # ABE playback path through DL2
- cset "name='DL2 Mixer Tones' 0"
- cset "name='DL2 Tones Playback Volume' 0"
- cset "name='DL1 Mixer Tones' 0"
- cset "name='DL1 Tones Playback Volume' 0"
-
- # TWL6040 playback path
- cset "name='Handsfree Left Playback' 0"
- cset "name='Handsfree Right Playback' 0"
- ]
-
- # QoS, Mixers and ALSA PCMs
- Value {
- TQ "Tones"
- PlaybackPCM "hw:PandaBoard,3"
- PlaybackVolume "name='DL2 Tones Playback Volume' 120"
- }
-}
-
diff -r 23d7bcd393eb -r ddefee93afdc packages/alsa-lib/config/ucm/PandaBoard/HiFiLP
--- a/packages/alsa-lib/config/ucm/PandaBoard/HiFiLP Sat Jul 28 17:25:37 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-# Use case Configuration for TI PandaBoard HiFiLP audio playback and capture
-# By Liam Girdwood <l...@ti.com>
-# Updated by Sebastien Jan <s-...@ti.com>
-
-######### Main Verb Config #################
-
-SectionVerb {
-
- EnableSequence [
- # Set SDP device for following cset commands
- cdev "hw:PandaBoard"
-
- # Enable ABE playback path through DL1
- cset "name='DL1 Mixer Multimedia' 1"
- cset "name='Sidetone Mixer Playback' 1"
- cset "name='DL1 PDM Switch' 1"
-
- # set ABE playback gains to 0dB
- cset "name='DL1 Media Playback Volume' 120"
- cset "name='DL2 Media Playback Volume' 120"
- cset "name='SDT DL Volume' 120"
-
- # Enable ABE PDM-UL Capture path
- cset "name='MUX_UL10' 11"
- cset "name='MUX_UL11' 12"
-
- # set ABE capture gains to 0dB
- cset "name='AMIC UL Volume' 120"
- ]
-
- DisableSequence [
- # Set SDP device for following cset commands
- cdev "hw:PandaBoard"
-
- # Disable ABE playback path through DL1
- cset "name='DL1 Mixer Multimedia' 0"
- cset "name='Sidetone Mixer Playback' 0"
- cset "name='DL1 PDM Switch' 0"
-
- # mute ABE playback gains
- cset "name='DL1 Media Playback Volume' 0"
- cset "name='DL2 Media Playback Volume' 0"
- cset "name='SDT DL Volume' 0"
-
- # Disable ABE PDM-UL Capture path
- cset "name='MUX_UL10' 0"
- cset "name='MUX_UL11' 0"
-
- # mute ABE capture gains
- cset "name='AMIC UL Volume' 0"
-
- ]
-
- # ALSA PCM
- Value {
-
- TQ "HiFi"
-
- # ALSA PCM device for HiFiLP
- PlaybackPCM "hw:PandaBoard,6"
- CapturePCM "hw:PandaBoard,1"
- }
-}
-
-###### Headset Devices Options ############
-
-SectionDevice."Headset" {
- Comment "PandaBoard 3.5mm Headset playback and capture"
-
- EnableSequence [
-
- # Set SDP device for following cset commands
- cdev "hw:PandaBoard"
-
- # TWL6040 playback path
- cset "name='Headset Left Playback' 1"
- cset "name='Headset Right Playback' 1"
-
- # TWL6040 Capture Path
- cset "name='Analog Left Capture Route' 0"
- cset "name='Analog Right Capture Route' 0"
- cset "name='Capture Preamplifier Volume' 2"
- ]
-
- DisableSequence [
-
- # Set SDP device for following cset commands
- cdev "hw:PandaBoard"
-
- # TWL6040 playback path
- cset "name='Headset Right Playback' 0"
- cset "name='Headset Left Playback' 0"
-
- # TWL6040 Capture path
- cset "name='Analog Left Capture Route' 3"
- cset "name='Analog Right Capture Route' 3"
- cset "name='Capture Preamplifier Volume' 0"
- ]
-
- Value {
- # Default ALSA volume gain and mute kcontrols
- CaptureVolume "name='Capture Volume' 4"
- PlaybackVolume "name='Headset Playback Volume' 13"
- PlaybackPCM "hw:PandaBoard,6"
- PlaybackChannels "2"
- CaptureChannels "2"
- }
-}
-
-SectionModifier."PlayTone" {
- Comment "Play a ring tone or system sound"
-
- EnableSequence [
-
- # Set SDP device for following cset commands
- cdev "hw:PandaBoard"
-
- # ABE playback path through DL2
- cset "name='DL2 Mixer Tones' 1"
- cset "name='DL2 Tones Playback Volume' 120"
- cset "name='DL1 Mixer Tones' 1"
- cset "name='DL1 Tones Playback Volume' 120"
-
- # TWL6040 playback path
- cset "name='Handsfree Left Playback' 1"
- cset "name='Handsfree Right Playback' 1"
- ]
-
- DisableSequence [
-
- # Set SDP device for following cset commands
- cdev "hw:PandaBoard"
-
- # ABE playback path through DL2
- cset "name='DL2 Mixer Tones' 0"
- cset "name='DL2 Tones Playback Volume' 0"
- cset "name='DL1 Mixer Tones' 0"
- cset "name='DL1 Tones Playback Volume' 0"
-
- # TWL6040 playback path
- cset "name='Handsfree Left Playback' 0"
- cset "name='Handsfree Right Playback' 0"
- ]
-
- # QoS, Mixers and ALSA PCMs
- Value {
- TQ "Tones"
- PlaybackPCM "hw:PandaBoard,3"
- PlaybackVolume "name='DL2 Tones Playback Volume' 120"
- }
-}
-
diff -r 23d7bcd393eb -r ddefee93afdc packages/alsa-lib/config/ucm/PandaBoard/PandaBoard.conf
--- a/packages/alsa-lib/config/ucm/PandaBoard/PandaBoard.conf Sat Jul 28 17:25:37 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-# UCM configuration for PandaBoard
-
-#
-# This files list all the high level audio use cases supported by the PandaBoard.
-# The use case definitions for PandaBoard are stored in separate files in this
-# directory.
-#
-
-# The default PandaBoard audio setting loaded by UCM at init.
-SectionDefaults [
- cdev "hw:PandaBoard"
-
-# Add any cset command to configure default state here.
-]
-
-#
-# The UCM use case verbs for PandaBoard.
-#
-# Please check if your use case fits into a current verb below before creating
-# a new use case verb.
-#
-
-#
-# HiFi Use case has support for HS, HF, EP, HP, BT, HDMI and Mics for
-# general purpose HiFi quality playback and capture.
-#
-SectionUseCase."HiFi" {
- File "HiFi"
- Comment "Play and Capture HiFi quality audio."
-}
-
-#
-# HiFi_Low_Power Use case has support for HS, HF, EP, HP, BT, HDMI and Mics for
-# general purpose HiFi low power quality playback and capture.
-#
-SectionUseCase."HiFi_Low_Power" {
- File "HiFiLP"
- Comment "Play and Capture HiFi low power quality audio."
-}
diff -r 23d7bcd393eb -r ddefee93afdc packages/alsa-lib/config/ucm/SDP4430/SDP4430.conf
--- a/packages/alsa-lib/config/ucm/SDP4430/SDP4430.conf Sat Jul 28 17:25:37 2012 +0200
+++ b/packages/alsa-lib/config/ucm/SDP4430/SDP4430.conf Sat Jul 28 17:32:35 2012 +0200
@@ -1,9 +1,4 @@
# UCM configuration for SDP4430
-SectionUseCase."Record" {
- File "record"
- Comment "Record."
-}
-
SectionUseCase."HiFi" {
File "hifi"
Comment "Play HiFi quality Music."
@@ -29,11 +24,6 @@
Comment "Capture and Playback in Voice quality."
}
-SectionUseCase."Voice_Call_IP" {
- File "voiceCall"
- Comment "Capture and Playback in Voice quality."
-}
-
SectionUseCase."FM_Analog_Radio" {
File "FMAnalog"
Comment "Capture FM Analog Radio."
diff -r 23d7bcd393eb -r ddefee93afdc packages/alsa-lib/config/ucm/SDP4430/hifi
--- a/packages/alsa-lib/config/ucm/SDP4430/hifi Sat Jul 28 17:25:37 2012 +0200
+++ b/packages/alsa-lib/config/ucm/SDP4430/hifi Sat Jul 28 17:32:35 2012 +0200
@@ -1,83 +1,220 @@
# Use case Configuration for TI SDP4430 HiFi Music
# By Liam Girdwood <l...@slimlogic.co.uk>
+# Updated by Sebastien Jan <s-...@ti.com>
SectionVerb {
+ # Nothing todo here since most HiFi path as device specific within the ABE
+
EnableSequence [
- cdev "hw:SDP4430"
- cset "name='DL1 Mixer Multimedia' 1"
- cset "name='Sidetone Mixer Playback' 1"
- cset "name='DL1 PDM Switch' 1"
- cset "name='DL1 Media Playback Volume' 90,90"
- cset "name='SDT DL Volume' 120"
-
- cset "name='HS Left Playback' 1"
- cset "name='HS Right Playback' 1"
- cset "name='Headset Playback Volume' 13"
]
DisableSequence [
- cdev "hw:SDP4430"
- cset "name='DL1 Mixer Multimedia' 0"
- cset "name='Sidetone Mixer Playback' 0"
- cset "name='DL1 PDM Switch' 0"
- cset "name='DL1 Media Playback Volume' 0,0"
- cset "name='SDT DL Volume' 0"
-
- cset "name='HS Right Playback' 0"
- cset "name='HS Left Playback' 0"
- cset "name='Headset Playback Volume' 0"
]
# Optional TQ and ALSA PCMs
-# Value {
-# TQ "Music"
-# PlaybackPCM "hw:0,0"
-# PlaybackVolume "name='DL1 Media Playback Volume' 90,90"
-# PlaybackSwitch "name='DL1 PDM Switch' 1"
-# }
+ Value {
+ TQ "HiFi"
+
+ # ALSA PCM device for HiFi
+ PlaybackPCM "hw:SDP4430,0"
+ CapturePCM "hw:SDP4430,0"
+ }
}
+###### Headset Devices Options ############
+
SectionDevice."Headset".0 {
- Comment "SDP4430 3.5mm Headset"
+ Comment "SDP4430 3.5mm Headset playback and capture"
EnableSequence [
- cdev "hw:SDP4430"
- cset "name='HS Left Playback' 1"
- cset "name='HS Right Playback' 1"
- cset "name='Headset Playback Volume' 13"
+ # Set SDP device for following cset commands
+ cdev "hw:SDP4430"
+
+ # ABE playback path through DL1
+ cset "name='DL1 Mixer Multimedia' 1"
+ cset "name='Sidetone Mixer Playback' 1"
+ cset "name='DL1 PDM Switch' 1"
+ cset "name='DL1 Media Playback Volume' 90,90"
+ cset "name='SDT DL Volume' 120"
+
+ # ABE PDM-UL Capture path
+ cset "name='MUX_UL00' 11"
+ #cset "name='MUX_UL01' 10"
+
+ # TWL6040 playback path
+ cset "name='Headset Left Playback' 1"
+ cset "name='Headset Right Playback' 1"
+ cset "name='Headset Playback Volume' 13"
+
+ # TWL6040 Capture Path
+ cset "name='Analog Left Capture Route' 0"
+ cset "name='Capture Preamplifier Volume' 2"
+ cset "name='Capture Volume' 4"
]
DisableSequence [
- cdev "hw:SDP4430"
- cset "name='HS Right Playback' 0"
- cset "name='HS Left Playback' 0"
- cset "name='Headset Playback Volume' 0"
+ # Set SDP device for following cset commands
+ cdev "hw:SDP4430"
+
+ # ABE playback path through DL1
+ cset "name='DL1 Mixer Multimedia' 0"
+ cset "name='Sidetone Mixer Playback' 0"
+ cset "name='DL1 PDM Switch' 0"
+ cset "name='DL1 Media Playback Volume' 0,0"
+ cset "name='SDT DL Volume' 0"
+
+ # TWL6040 playback path
+ cset "name='Headset Right Playback' 0"
+ cset "name='Headset Left Playback' 0"
+ cset "name='Headset Playback Volume' 0"
+
+ # ABE capture path
+ cset "name='MUX_UL00' 0"
+
+ # TWL6040 Capture path
+ cset "name='Analog Left Capture Route' 3"
+ cset "name='Capture Preamplifier Volume' 0"
+ cset "name='Capture Volume' 0"
]
+
+ Value {
+ # Default ALSA volume gain and mute kcontrols
+ CaptureVolume "name='Capture Volume' 4"
+ PlaybackVolume "name='Headset Playback Volume' 13"
+ }
}
-#SectionModifier."RecordMedia".0 {
-# SupportedDevice [
-# "Headset"
-# ]
- # EnableSequence [
- # ....
- # ]
- #
- # DisableSequence [
- # ...
- # ]
- #
- # TransitionSequence."ToModifierName" [
- # ...
- # ]
- #
- # # Optional TQ and ALSA PCMs
- # Value {
- # TQ Voice
- # CapturePCM "hw:1"
- # PlaybackVolume "name='Master Playback Volume',index=2"
- # PlaybackSwitch "name='Master Playback Switch',index=2"
- # }
-#
-#}
+########### Earphone device Options ################
+SectionDevice."Earphone".0 {
+ Comment "Earphone playback and Main Mic capture"
+
+ EnableSequence [
+
+ # Set SDP device for following cset commands
+ cdev "hw:SDP4430"
+
+ # ABE playback path through DL1
+ cset "name='DL1 Mixer Multimedia' 1"
+ cset "name='Sidetone Mixer Playback' 1"
+ cset "name='DL1 PDM Switch' 1"
+ cset "name='DL1 Media Playback Volume' 100,100"
+ cset "name='SDT DL Volume' 120"
+
+ # TWL6040 playback path
+ cset "name='Headset Left Playback' 1"
+ cset "name='Headset Right Playback' 1"
+
+ # ABE PDM-UL Capture path
+ cset "name='MUX_UL00' 11"
+ #cset "name='MUX_UL01' 10"
+
+ # TWL6040 Capture Path
+ cset "name='Analog Left Capture Route' 1"
+ cset "name='Earphone Playback Switch' 1"
+ ]
+
+ DisableSequence [
+
+ # Set SDP device for following cset commands
+ cdev "hw:SDP4430"
+
+ # ABE playback path through DL1
+ cset "name='DL1 Mixer Multimedia' 0"
+ cset "name='Sidetone Mixer Playback' 0"
+ cset "name='DL1 PDM Switch' 0"
+ cset "name='DL1 Media Playback Volume' 0,0"
+ cset "name='SDT DL Volume' 0"
+
+ # TWL6040 playback path
+ cset "name='Headset Right Playback' 0"
+ cset "name='Headset Left Playback' 0"
+
+ # ABE PDM-UL Capture path
+ cset "name='MUX_UL00' 0"
+ #cset "name='MUX_UL01' 0"
+
+ # TWL6040 Capture Path
+ cset "name='Analog Left Capture Route' 3"
+ cset "name='Earphone Playback Switch' 0"
+
+ ]
+
+ TransitionSequence."Headset" [
+ exec echo "Transition to HS"
+ ]
+
+ Value {
+ # Default ALSA volume gain and mute kcontrols
+ PlaybackVolume "name='Earphone Playback Volume' 13"
+ CaptureVolume "name='Capture Volume' 4"
+ }
+}
+
+########### Handsfree Device Options ################
+
+SectionDevice."Handsfree".0 {
+ Comment "SDP4430 Handsfree Speaker playback and Main + Sub Mic capture"
+
+ EnableSequence [
+
+ # Set SDP device for following cset commands
+ cdev "hw:SDP4430"
+
+ # ABE playback path through DL2
+ cset "name='DL2 Mixer Multimedia' 1"
+ cset "name='DL2 Media Playback Volume' 100,100"
+
+ # TWL6040 playback path
+ cset "name='Handsfree Left Playback' 1"
+ cset "name='Handsfree Right Playback' 1"
+ cset "name='Handsfree Playback Volume' 27"
+
+ # ABE PDM-UL Capture path
+ cset "name='MUX_UL00' 11"
+ cset "name='MUX_UL01' 12"
+
+ # TWL6040 Capture Path - Main Mic is L Sub Mic is R
+ cset "name='Analog Left Capture Route' 1"
+ cset "name='Analog Right Capture Route' 1"
+ cset "name='Capture Preamplifier Volume' 2"
+ cset "name='Capture Volume' 4"
+ cset "name='AMIC UL Volume' 135"
+ ]
+
+ DisableSequence [
+
+ # Set SDP device for following cset commands
+ cdev "hw:SDP4430"
+
+ # ABE playback path through DL1
+ cset "name='DL1 Mixer Multimedia' 0"
+ cset "name='Sidetone Mixer Playback' 0"
+ cset "name='DL1 PDM Switch' 0"
+ cset "name='DL1 Media Playback Volume' 0,0"
+ cset "name='SDT DL Volume' 0"
+
+ # TWL6040 playback path
+ cset "name='Handsfree Left Playback' 0"
+ cset "name='Handsfree Right Playback' 0"
+ cset "name='Handsfree Playback Volume' 0"
+
+ # ABE PDM-UL Capture path
+ cset "name='MUX_UL00' 0"
+ #cset "name='MUX_UL01' 0"
+
+ # TWL6040 Capture Path
+ cset "name='Analog Left Capture Route' 3"
+ cset "name='Analog Right Capture Route' 3"
+ cset "name='Capture Preamplifier Volume' 0"
+ cset "name='Capture Volume' 0"
+ cset "name='AMIC UL Volume' 0"
+ ]
+
+ Value {
+ # Default ALSA volume gain and mute kcontrols
+ PlaybackVolume "name='Handsfree Playback Volume' 13"
+ CaptureVolume "name='Capture Volume' 4"
+ }
+}
+
diff -r 23d7bcd393eb -r ddefee93afdc packages/alsa-lib/config/ucm/SDP4430/hifiLP
--- a/packages/alsa-lib/config/ucm/SDP4430/hifiLP Sat Jul 28 17:25:37 2012 +0200
+++ b/packages/alsa-lib/config/ucm/SDP4430/hifiLP Sat Jul 28 17:32:35 2012 +0200
@@ -1,46 +1,208 @@
# Use case Configuration for TI SDP4430 HiFi Music
# By Liam Girdwood <l...@slimlogic.co.uk>
+# Updated by Sebastien Jan <s-...@ti.com>
SectionVerb {
+ # Nothing todo here since most HiFi path as device specific within the ABE
+
EnableSequence [
- cdev "hw:SDP4430"
- cset "name='DL1 Mixer Multimedia' 1"
- cset "name='Sidetone Mixer Playback' 1"
- cset "name='DL1 PDM Switch' 1"
- cset "name='DL1 Media Playback Volume' 90,90"
- cset "name='SDT DL Volume' 120"
]
DisableSequence [
- cdev "hw:SDP4430"
- cset "name='DL1 Mixer Multimedia' 0"
- cset "name='Sidetone Mixer Playback' 0"
- cset "name='DL1 PDM Switch' 0"
- cset "name='DL1 Media Playback Volume' 0,0"
- cset "name='SDT DL Volume' 0"
]
- # Optional TQ and ALSA PCMs
+ # Optional TQ and ALSA PCMs
Value {
- TQ "Music"
- PlaybackPCM "hw:0,6"
+ TQ "HiFi"
+
+ # ALSA PCM device for HiFi
+ PlaybackPCM "hw:SDP4430,6"
+ CapturePCM "hw:SDP4430,0"
}
}
+###### Headset Devices Options ############
+
SectionDevice."Headset".0 {
- Comment "SDP4430 3.5mm Headset"
+ Comment "SDP4430 3.5mm Headset playback and capture"
EnableSequence [
- cdev "hw:SDP4430"
- cset "name='HS Left Playback' 1"
- cset "name='HS Right Playback' 1"
- cset "name='Headset Playback Volume' 13"
+ # Set SDP device for following cset commands
+ cdev "hw:SDP4430"
+
+ # ABE playback path through DL1
+ cset "name='DL1 Mixer Multimedia' 1"
+ cset "name='Sidetone Mixer Playback' 1"
+ cset "name='DL1 PDM Switch' 1"
+ cset "name='DL1 Media Playback Volume' 90,90"
+ cset "name='SDT DL Volume' 120"
+
+ # ABE PDM-UL Capture path
+ cset "name='MUX_UL00' 11"
+ #cset "name='MUX_UL01' 10"
+
+ # TWL6040 playback path
+ cset "name='Headset Left Playback' 1"
+ cset "name='Headset Right Playback' 1"
+
+ # TWL6040 Capture Path
+ cset "name='Analog Left Capture Route' 0"
+ cset "name='Capture Preamplifier Volume' 2"
]
DisableSequence [
- cdev "hw:SDP4430"
- cset "name='HS Right Playback' 0"
- cset "name='HS Left Playback' 0"
- cset "name='Headset Playback Volume' 0"
+ # Set SDP device for following cset commands
+ cdev "hw:SDP4430"
+
+ # ABE playback path through DL1
+ cset "name='DL1 Mixer Multimedia' 0"
+ cset "name='Sidetone Mixer Playback' 0"
+ cset "name='DL1 PDM Switch' 0"
+ cset "name='DL1 Media Playback Volume' 0,0"
+ cset "name='SDT DL Volume' 0"
+
+ # TWL6040 playback path
+ cset "name='Headset Right Playback' 0"
+ cset "name='Headset Left Playback' 0"
+
+ # ABE capture path
+ cset "name='MUX_UL00' 0"
+
+ # TWL6040 Capture path
+ cset "name='Analog Left Capture Route' 3"
+ cset "name='Capture Preamplifier Volume' 0"
]
+
+ Value {
+ # Default ALSA volume gain and mute kcontrols
+ CaptureVolume "name='Capture Volume' 4"
+ PlaybackVolume "name='Headset Playback Volume' 13"
+ }
}
+
+########### Earphone device Options ################
+
+SectionDevice."Earphone".0 {
+ Comment "Earphone playback and Main Mic capture"
+
+ EnableSequence [
+
+ # Set SDP device for following cset commands
+ cdev "hw:SDP4430"
+
+ # ABE playback path through DL1
+ cset "name='DL1 Mixer Multimedia' 1"
+ cset "name='Sidetone Mixer Playback' 1"
+ cset "name='DL1 PDM Switch' 1"
+ cset "name='DL1 Media Playback Volume' 100,100"
+ cset "name='SDT DL Volume' 120"
+
+ # TWL6040 playback path
+ cset "name='Headset Left Playback' 1"
+ cset "name='Headset Right Playback' 1"
+
+ # ABE PDM-UL Capture path
+ cset "name='MUX_UL00' 11"
+ #cset "name='MUX_UL01' 10"
+
+ # TWL6040 Capture Path
+ cset "name='Analog Left Capture Route' 1"
+ cset "name='Earphone Playback Switch' 1"
+ ]
+
+ DisableSequence [
+
+ # Set SDP device for following cset commands
+ cdev "hw:SDP4430"
+
+ # ABE playback path through DL1
+ cset "name='DL1 Mixer Multimedia' 0"
+ cset "name='Sidetone Mixer Playback' 0"
+ cset "name='DL1 PDM Switch' 0"
+ cset "name='DL1 Media Playback Volume' 0,0"
+ cset "name='SDT DL Volume' 0"
+
+ # TWL6040 playback path
+ cset "name='Headset Right Playback' 0"
+ cset "name='Headset Left Playback' 0"
+
+ # ABE PDM-UL Capture path
+ cset "name='MUX_UL00' 0"
+ #cset "name='MUX_UL01' 0"
+
+ # TWL6040 Capture Path
+ cset "name='Analog Left Capture Route' 3"
+ cset "name='Earphone Playback Switch' 0"
+
+ ]
+
+ TransitionSequence."Headset" [
+ exec echo "Transition to HS"
+ ]
+
+ Value {
+ # Default ALSA volume gain and mute kcontrols
+ PlaybackVolume "name='Earphone Playback Volume' 13"
+ CaptureVolume "name='Capture Volume' 4"
+ }
+}
+
+########### Handsfree Device Options ################
+
+SectionDevice."Handsfree".0 {
+ Comment "SDP4430 Handsfree Speaker playback and Main + Sub Mic capture"
+
+ EnableSequence [
+
+ # Set SDP device for following cset commands
+ cdev "hw:SDP4430"
+
+ # ABE playback path through DL2
+ cset "name='DL2 Mixer Multimedia' 1"
+ cset "name='DL2 Media Playback Volume' 100,100"
+
+ # TWL6040 playback path
+ cset "name='Handsfree Left Playback' 1"
+ cset "name='Handsfree Right Playback' 1"
+
+ # ABE PDM-UL Capture path
+ cset "name='MUX_UL00' 11"
+ cset "name='MUX_UL01' 12"
+
+ # TWL6040 Capture Path - Main Mic is L Sub Mic is R
+ cset "name='Analog Left Capture Route' 1"
+ cset "name='Analog Right Capture Route' 1"
+ ]
+
+ DisableSequence [
+
+ # Set SDP device for following cset commands
+ cdev "hw:SDP4430"
+
+ # ABE playback path through DL1
+ cset "name='DL1 Mixer Multimedia' 0"
+ cset "name='Sidetone Mixer Playback' 0"
+ cset "name='DL1 PDM Switch' 0"
+ cset "name='DL1 Media Playback Volume' 0,0"
+ cset "name='SDT DL Volume' 0"
+
+ # TWL6040 playback path
+ cset "name='Handsfree Left Playback' 0"
+ cset "name='Handsfree Right Playback' 0"
+
+ # ABE PDM-UL Capture path
+ cset "name='MUX_UL00' 0"
+ #cset "name='MUX_UL01' 0"
+
+ # TWL6040 Capture Path
+ cset "name='Analog Left Capture Route' 3"
+ cset "name='Analog Right Capture Route' 3"
+ ]
+
+ Value {
+ # Default ALSA volume gain and mute kcontrols
+ PlaybackVolume "name='Handsfree Playback Volume' 13"
+ CaptureVolume "name='Capture Volume' 4"
+ }
+}
+
diff -r 23d7bcd393eb -r ddefee93afdc packages/alsa-lib/config/ucm/SDP4430/record
--- a/packages/alsa-lib/config/ucm/SDP4430/record Sat Jul 28 17:25:37 2012 +0200
+++ b/packages/alsa-lib/config/ucm/SDP4430/record Sat Jul 28 17:32:35 2012 +0200
@@ -1,5 +1,5 @@
-# Use case Configuration for TI SDP4430 HiFi Music
-# By Liam Girdwood <l...@slimlogic.co.uk>
+# Use case Configuration for TI SDP4430 Record Music
+# Template by Liam Girdwood <l...@slimlogic.co.uk>
SectionVerb {
EnableSequence [
diff -r 23d7bcd393eb -r ddefee93afdc packages/alsa-lib/config/ucm/SDP4430/voice
--- a/packages/alsa-lib/config/ucm/SDP4430/voice Sat Jul 28 17:25:37 2012 +0200
+++ b/packages/alsa-lib/config/ucm/SDP4430/voice Sat Jul 28 17:32:35 2012 +0200
@@ -32,15 +32,15 @@
EnableSequence [
cdev "hw:SDP4430"
- cset "name='HS Left Playback' 1"
- cset "name='HS Right Playback' 1"
+ cset "name='Headset Left Playback' 1"
+ cset "name='Headset Right Playback' 1"
cset "name='Headset Playback Volume' 13"
]
DisableSequence [
cdev "hw:SDP4430"
- cset "name='HS Right Playback' 0"
- cset "name='HS Left Playback' 0"
+ cset "name='Headset Right Playback' 0"
+ cset "name='Headset Left Playback' 0"
cset "name='Headset Playback Volume' 0"
]
}
diff -r 23d7bcd393eb -r ddefee93afdc packages/alsa-lib/config/ucm/SDP4430/voiceCall
--- a/packages/alsa-lib/config/ucm/SDP4430/voiceCall Sat Jul 28 17:25:37 2012 +0200
+++ b/packages/alsa-lib/config/ucm/SDP4430/voiceCall Sat Jul 28 17:32:35 2012 +0200
@@ -49,8 +49,8 @@
cset "name='Analog Left Capture Route' 0"
cset "name='Analog Right Capture Route' 0"
cset "name='Capture Preamplifier Volume' 2"
- cset "name='HS Left Playback' 1"
- cset "name='HS Right Playback' 1"
+ cset "name='Headset Left Playback' 1"
+ cset "name='Headset Right Playback' 1"
cset "name='Headset Playback Volume' 13"
]
@@ -59,8 +59,8 @@
cset "name='Analog Left Capture Route' 3"
cset "name='Analog Right Capture Route' 3"
cset "name='Capture Preamplifier Volume' 0"
- cset "name='HS Right Playback' 0"
- cset "name='HS Left Playback' 0"
+ cset "name='Headset Right Playback' 0"
+ cset "name='Headset Left Playback' 0"
cset "name='Headset Playback Volume' 0"
]
}
diff -r 23d7bcd393eb -r ddefee93afdc packages/alsa-utils/scripts/alsa-mixer-setup
--- a/packages/alsa-utils/scripts/alsa-mixer-setup Sat Jul 28 17:25:37 2012 +0200
+++ b/packages/alsa-utils/scripts/alsa-mixer-setup Sat Jul 28 17:32:35 2012 +0200
@@ -108,7 +108,7 @@
# Required for PandaBoard
if grep -q 'OMAP4 Panda board' /proc/cpuinfo; then
- echo "set _verb HiFi" | alsaucm -c PandaBoard -b -
+ echo "set _verb HiFi" | alsaucm -c Panda -b -
fi
# Check for analog or HDMI Output
diff -r 23d7bcd393eb -r ddefee93afdc packages/gst-ducati/meta
--- a/packages/gst-ducati/meta Sat Jul 28 17:25:37 2012 +0200
+++ b/packages/gst-ducati/meta Sat Jul 28 17:32:35 2012 +0200
@@ -1,6 +1,6 @@
PKG_NAME=gst-ducati
-PKG_URL_REV=4d0742b
-PKG_VERSION=1.6.3.3+${PKG_URL_REV}
+PKG_URL_REV=7794453
+PKG_VERSION=1.6.4.2+${PKG_URL_REV}
PKG_URL_PROTO=git
PKG_URL="git://gitorious.org/ubuntu-omap/gst-plugin-ducati.git"
PKG_REV=1
diff -r 23d7bcd393eb -r ddefee93afdc packages/gst-plugins-bad/meta
--- a/packages/gst-plugins-bad/meta Sat Jul 28 17:25:37 2012 +0200
+++ b/packages/gst-plugins-bad/meta Sat Jul 28 17:32:35 2012 +0200
@@ -2,7 +2,7 @@
PKG_VERSION=0.10.22
PKG_URL="http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PKG_VERSION}.tar.bz2"
PKG_REV=1
-PKG_DEPENDS="gstreamer gst-plugins-base orc"
+PKG_DEPENDS="gstreamer gst-plugins-base orc libdvdnav"
[ "$TARGET_PLATFORM" = omap4 ] && PKG_DEPENDS="$PKG_DEPENDS sgx540-OpenGLES"
PKG_RUN_DEPENDS="$TARGET_LIBC"
PKG_BUILD_DEPENDS="toolchain"
diff -r 23d7bcd393eb -r ddefee93afdc packages/gst-plugins-ugly/meta
--- a/packages/gst-plugins-ugly/meta Sat Jul 28 17:25:37 2012 +0200
+++ b/packages/gst-plugins-ugly/meta Sat Jul 28 17:32:35 2012 +0200
@@ -2,7 +2,7 @@
PKG_VERSION=0.11.92
PKG_URL="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PKG_VERSION}.tar.xz"
PKG_REV=1
-PKG_DEPENDS="gstreamer gst-plugins-base GLib"
+PKG_DEPENDS="gstreamer gst-plugins-base GLib libmad libdvdread"
PKG_RUN_DEPENDS="$TARGET_LIBC"
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY=optional
diff -r 23d7bcd393eb -r ddefee93afdc packages/libdce/meta
--- a/packages/libdce/meta Sat Jul 28 17:25:37 2012 +0200
+++ b/packages/libdce/meta Sat Jul 28 17:32:35 2012 +0200
@@ -1,6 +1,6 @@
PKG_NAME=libdce
-PKG_URL_REV=bee68df
-PKG_VERSION=1.6.3.1+${PKG_URL_REV}
+PKG_URL_REV=1038c44
+PKG_VERSION=1.6.3.3+${PKG_URL_REV}
PKG_URL_PROTO=git
PKG_URL="git://gitorious.org/ubuntu-omap/dce"
PKG_REV=1
