From 70d1bdb4e801ae6b0c29d2f103225c966b9eded4 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sun, 26 Feb 2006 01:16:54 -0400 Subject: add pvrusb2 to local v4l-dvb build From: Michael Krufky - removed 'make pvrusb2' merge command - created in-kernel Makefile, Kconfig not yet done. Signed-off-by: Michael Krufky --- v4l/Make.config | 3 +-- v4l/Makefile | 7 +------ 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'v4l') diff --git a/v4l/Make.config b/v4l/Make.config index 0dd4365ce..802c847a2 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -20,7 +20,7 @@ CONFIG_VIDEO_ALSA := y CONFIG_VIDEO_ADV_DEBUG := y -CONFIG_VIDEO_PVRUSB2 := n +CONFIG_VIDEO_PVRUSB2 := m CONFIG_VIDEO_IVTV := n @@ -112,4 +112,3 @@ ifeq ($(CONFIG_DVB_CORE),m) endif CONFIG_VIDEO_IVTV := $(if $(wildcard $(src)/ivtv-svnversion.h),m) -CONFIG_VIDEO_PVRUSB2 := $(if $(wildcard $(src)/.pvrusb2-merge),m) diff --git a/v4l/Makefile b/v4l/Makefile index 1a34c6f24..d90e4b8ae 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -345,11 +345,6 @@ all:: default default:: links .version $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules -pvrusb2:: - @echo creating pvrusb2 symbolic links... - @find ../v4l_experimental/pvrusb2 -name '*.[ch]' -type f -exec ln -sf '{}' . \; - @echo 'm' > .pvrusb2-merge - ivtv-checkout:: @if [ ! -d ivtv ]; then \ echo retrieving the latest ivtv sources from ivtvdriver.org; \ @@ -523,7 +518,7 @@ rmmodules:: clean:: @find . -name '*.c' -type l -exec rm '{}' \; @find . -name '*.h' -type l -exec rm '{}' \; - -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump ivtv-svnversion.h .pvrusb2-merge + -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump ivtv-svnversion.h distclean:: clean -rm -f .version .*.o.flags .*.o.d -- cgit v1.2.3 From 1dca1609fdd707e6717a93ea15fcb71becf46341 Mon Sep 17 00:00:00 2001 From: Michael Hunold Date: Wed, 8 Mar 2006 22:42:09 +0100 Subject: Add mxb, dpc7146, hexium_orion and hexium_gemini to the Makefile From: Michael Hunold Signed-off-by: Michael Hunold --- v4l/Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'v4l') diff --git a/v4l/Makefile b/v4l/Makefile index 1af345804..9f940dbe7 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -88,6 +88,10 @@ ifeq ($(CONFIG_VIDEO_DEV),m) obj-m += videodev.o endif +obj-$(CONFIG_VIDEO_MXB) += mxb.o tea6420.o tea6415c.o tda9840.o +obj-$(CONFIG_VIDEO_DPC) += dpc7146.o +obj-$(CONFIG_VIDEO_HEXIUM_ORION)+= hexium_orion.o +obj-$(CONFIG_VIDEO_HEXIUM_GEMINI)+= hexium_gemini.o obj-$(CONFIG_VIDEO_BTTV) += btcx-risc.o ir-common.o bttv.o tveeprom.o obj-$(CONFIG_VIDEO_CX88) += btcx-risc.o cx88xx.o cx8800.o cx8802.o \ cx88-blackbird.o tveeprom.o -- cgit v1.2.3 From 02474d0a0181592ab0ce78cc5b536b76d23a4799 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 10 Mar 2006 14:20:58 -0300 Subject: Added better handling for errors at mailscript From: Mauro Carvalho Chehab Now, it checks if author have signed its own patch. Also, prints better error messages. Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/hghead.pl | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'v4l') diff --git a/v4l/scripts/hghead.pl b/v4l/scripts/hghead.pl index c495abc8b..5c5e63f1f 100755 --- a/v4l/scripts/hghead.pl +++ b/v4l/scripts/hghead.pl @@ -19,6 +19,7 @@ my $maintainer_email=$ENV{CHANGE_LOG_EMAIL_ADDRESS}; my $from=""; my $body=""; my $signed=""; +my $fromname=""; open IN, "<$in"; @@ -57,10 +58,11 @@ while ($line = ) { my $email=$2; $name =~ s/\s+$//; $email =~ s/\s+$//; - $from= "From: $name <$email>\n"; + $fromname="$name <$email>"; + $from= "From: $fromname\n"; next; } - print "Bad formed author\n"; + print "Bad: author line have a wrong syntax\n"; die; } @@ -86,7 +88,7 @@ while ($line = ) { next; } if ($line =~ m/^Acked-by:.*/) { - print $line; + $signed="$signed$line"; next; } @@ -128,12 +130,19 @@ while ($line = ) { close IN; if ($from eq "") { - print "Bad formed author\n"; + print "Bad: author doesn't exist!\n"; die; } + if (!$maint_ok) { $signed=$signed."Signed-off-by: $maintainer_name <$maintainer_email>\n"; } + +if (!$signed =~ m/$from/) { + print "Bad: Author didn't signed his patch!\n"; + die; +} + $body=~s/\n+$//; $body=~s/^\n+$//; -- cgit v1.2.3 From 1254c4a78ff6728e02609f72002c87783b1a610e Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 10 Mar 2006 15:20:59 -0300 Subject: Some fixes and improvements at mailimport From: Mauro Carvalho Chehab hg mq were offering some troubles, because it seems to be also updated at master site. So, now, default is not to use it. Several validations added. Also improved output log by separating subject from from: line. Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/hghead.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'v4l') diff --git a/v4l/scripts/hghead.pl b/v4l/scripts/hghead.pl index 5c5e63f1f..ddaef0767 100755 --- a/v4l/scripts/hghead.pl +++ b/v4l/scripts/hghead.pl @@ -66,7 +66,7 @@ while ($line = ) { die; } - if ($line =~ m/^Subject:\s*(.*)\n/) { + if ($line =~ m/^Subject:\s*(.*\n)/) { $subject=$1; next; } @@ -100,7 +100,7 @@ while ($line = ) { next; } - if ($line =~ m|^(V4L\/DVB\s*\(.+\)\s*:.*)\n|) { + if ($line =~ m|^(V4L\/DVB\s*\(.+\)\s*:.*\n)|) { $subject=$1; $line="\n"; } @@ -147,6 +147,6 @@ $body=~s/\n+$//; $body=~s/^\n+$//; # First from is used by hg to recognize commiter name -print "From: $maintainer_name <$maintainer_email>\n"; +print "#Committer: $maintainer_name <$maintainer_email>\n"; print "$subject\n$from\n$body\n\n$signed"; -- cgit v1.2.3 From 4f947824c3825aae87faac1d61c600b69fdb5fd2 Mon Sep 17 00:00:00 2001 From: Markus Rechberger Date: Mon, 13 Mar 2006 04:53:21 +0100 Subject: added setupscript for setting up usbaudio for usb video devices From: Markus Rechberger added setupscript for setting up usbaudio for usb video devices Signed-off-by: Markus Rechberger --- v4l/scripts/usbaudio_setup.sh | 106 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100755 v4l/scripts/usbaudio_setup.sh (limited to 'v4l') diff --git a/v4l/scripts/usbaudio_setup.sh b/v4l/scripts/usbaudio_setup.sh new file mode 100755 index 000000000..33b15e56b --- /dev/null +++ b/v4l/scripts/usbaudio_setup.sh @@ -0,0 +1,106 @@ +#!/bin/bash +# +# Copyright (C) 2006 Markus Rechberger +# +# 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 of the License, 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 this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +which /usr/bin/dialog >/dev/null +if [ "0" != "$?" ]; then +echo "this tool requires \"dialog\" (http://hightek.org/dialog/)" +exit 1 +fi +uid=`id -u` +if [ "0" != "$uid" ]; then +echo "this tool must be run as root, you can disable this message by editing the script but only do that unless you know what you're doing!" +exit 1 +fi +which gcc > /dev/null +if [ "0" != "$?" ]; then +echo "this tool won't work unless you install gcc" +exit 1 +fi +test -f ossid +if [ "0" != "$?" ]; then +cat > ossid.c <<_EOF +#include +#include +#include +#include +#include +#include + +int main(int argc, char **argv){ + int fd; + struct mixer_info *info; + fd=open(argv[1],O_RDONLY); + if(fd>=0){ + info=malloc(sizeof(struct mixer_info)); + ioctl(fd,SOUND_MIXER_INFO,info); + printf("%c \"%s %s\"\n",(argv[1][strlen(argv[1])-1]=='p')?'0':argv[1][strlen(argv[1])-1],info->name,info->id); + free(info); + close(fd); + } else { + return 1; + } + return 0; +} +_EOF +gcc ossid.c -o ossid +rm ossid.c +fi + +test -f /proc/asound/cards +if [ "0" != "$?" ]; then +dialog --title "Welcome" --backtitle "Empia Sound Configuration" \ +--msgbox "Your system doesn't support ALSA, please have a look at \ +www.alsa-project.org and set it up properly \ + + +Press any key to continue... " 11 50 +exit 1; +fi + +dialog --title "Welcome" --backtitle "Empia Sound Configuration" \ +--msgbox "This tool was written to ease up sound configuration for +* Terratec Hybrid XS +* Terratec Cinergy 250 USB 2.0 +* Hauppauge HVR 900 +* and possible others :) + +first select an usb audio source, as target choose your soundcard +Press any key to continue... " 13 60 + +ls /dev/dsp* | while read a; do ./ossid $a; done | xargs dialog --menu "Choose your TV Audio source:" 12 60 5 2>/tmp/em2880_source.$$ +ls /dev/dsp* | while read a; do ./ossid $a; done | xargs dialog --menu "Choose your output soundcard device:" 12 60 5 2>/tmp/em2880_dst.$$ + +source=`egrep '^[0-9]' /tmp/em2880_source.$$` +dst=`egrep '^[0-9]' /tmp/em2880_dst.$$` + +echo "playing $source to $dst"; +if [ "$source" = "0" ]; then + device="/dev/dsp" +else + device="/dev/dsp$source" +fi + +if [ "$dst" = "0" ]; then + device2="/dev/dsp" +else + device2="/dev/dsp$source" +fi +clear +echo "Using command: sox -r 48000 -w -c 2 -t ossdsp $device -t ossdsp $device2" +sox -r 48000 -w -c 2 -t ossdsp $device -t ossdsp $device2 -- cgit v1.2.3 From e07574e1290ffc63432bc2b06a7677abc365de2d Mon Sep 17 00:00:00 2001 From: Markus Rechberger Date: Mon, 13 Mar 2006 05:41:17 +0100 Subject: small usbaudio_setup.sh change to support dsp0 From: Markus Rechberger small usbaudio_setup.sh change to support dsp0 Signed-off-by: Markus Rechberger --- v4l/scripts/usbaudio_setup.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'v4l') diff --git a/v4l/scripts/usbaudio_setup.sh b/v4l/scripts/usbaudio_setup.sh index 33b15e56b..66fdd23df 100755 --- a/v4l/scripts/usbaudio_setup.sh +++ b/v4l/scripts/usbaudio_setup.sh @@ -49,7 +49,7 @@ int main(int argc, char **argv){ if(fd>=0){ info=malloc(sizeof(struct mixer_info)); ioctl(fd,SOUND_MIXER_INFO,info); - printf("%c \"%s %s\"\n",(argv[1][strlen(argv[1])-1]=='p')?'0':argv[1][strlen(argv[1])-1],info->name,info->id); + printf("%c \"%s %s\"\n",(argv[1][strlen(argv[1])-1]=='p')?'0':(argv[1][strlen(argv[1])-1]+1),info->name,info->id); free(info); close(fd); } else { @@ -86,20 +86,20 @@ Press any key to continue... " 13 60 ls /dev/dsp* | while read a; do ./ossid $a; done | xargs dialog --menu "Choose your TV Audio source:" 12 60 5 2>/tmp/em2880_source.$$ ls /dev/dsp* | while read a; do ./ossid $a; done | xargs dialog --menu "Choose your output soundcard device:" 12 60 5 2>/tmp/em2880_dst.$$ -source=`egrep '^[0-9]' /tmp/em2880_source.$$` -dst=`egrep '^[0-9]' /tmp/em2880_dst.$$` +source=`egrep '^[0-9p]' /tmp/em2880_source.$$` +dst=`egrep '^[0-9p]' /tmp/em2880_dst.$$` echo "playing $source to $dst"; if [ "$source" = "0" ]; then device="/dev/dsp" else - device="/dev/dsp$source" + device="/dev/dsp`expr $source - 1`" fi if [ "$dst" = "0" ]; then device2="/dev/dsp" else - device2="/dev/dsp$source" + device2="/dev/dsp`expr $source - 1`" fi clear echo "Using command: sox -r 48000 -w -c 2 -t ossdsp $device -t ossdsp $device2" -- cgit v1.2.3 From e6cc0810ca4ec4c23568a94d983d8484f7b4834a Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Mon, 13 Mar 2006 01:48:38 -0500 Subject: cx88-ivtv: add Makefile build logic (experimental) From: Michael Krufky - add build logic for cx88-ivtv.ko, an ivtv ioctl emulation module for blackbird TV cards. - disabled by default. Signed-off-by: Michael Krufky --- v4l/Make.config | 4 +++- v4l/Makefile | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'v4l') diff --git a/v4l/Make.config b/v4l/Make.config index 0dd4365ce..e2e658ac8 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -26,7 +26,9 @@ CONFIG_VIDEO_IVTV := n CONFIG_DVB_FIRESAT := n -CONFIG_VIDEO_CPIA2 := m +CONFIG_VIDEO_CPIA2 := m + +CONFIG_VIDEO_CX88_IVTV := n # doesn't build on older kernels diff --git a/v4l/Makefile b/v4l/Makefile index 1af345804..c4cbb7158 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -91,6 +91,7 @@ endif obj-$(CONFIG_VIDEO_BTTV) += btcx-risc.o ir-common.o bttv.o tveeprom.o obj-$(CONFIG_VIDEO_CX88) += btcx-risc.o cx88xx.o cx8800.o cx8802.o \ cx88-blackbird.o tveeprom.o +obj-$(CONFIG_VIDEO_CX88_IVTV) += cx88-ivtv.o obj-$(CONFIG_TVP5150) += tvp5150.o obj-$(CONFIG_SAA711X) += saa711x.o obj-$(CONFIG_EM28XX) += em28xx.o tveeprom.o @@ -311,8 +312,8 @@ endif inst_video += ir-kbd-i2c.ko msp3400.ko inst_video += tvp5150.ko saa711x.ko saa7134-alsa.ko saa7134-oss.ko inst_video += saa7115.ko cx25840.ko saa7127.ko compat_ioctl32.ko -inst_cx88 := cx8800.ko cx8802.ko cx88-alsa.ko -inst_cx88 += cx88-blackbird.ko cx88xx.ko cx88-dvb.ko cx88-vp3054-i2c.ko +inst_cx88 := cx88xx.ko cx8800.ko cx8802.ko cx88-alsa.ko cx88-dvb.ko +inst_cx88 += cx88-blackbird.ko cx88-vp3054-i2c.ko cx88-ivtv.ko inst_saa7134 := saa6752hs.ko saa7134.ko saa7134-empress.ko saa7134-dvb.ko inst_em28xx := em28xx.ko inst_bt8xx := bt878.ko dvb-bt8xx.ko dst.ko dst_ca.ko -- cgit v1.2.3 From aa74e8c588686e857f1817a82211865bf3cc28e4 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Mon, 13 Mar 2006 01:50:23 -0500 Subject: use "make cx88-ivtv" to build cx88-ivtv.ko From: Michael Krufky - This makes it easier for users to build and install the cx88-ivtv module, from the v4l_experimental area, while still leaving it disabled by default. Signed-off-by: Michael Krufky --- v4l/Make.config | 1 + v4l/Makefile | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'v4l') diff --git a/v4l/Make.config b/v4l/Make.config index e2e658ac8..dace4f2c4 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -115,3 +115,4 @@ endif CONFIG_VIDEO_IVTV := $(if $(wildcard $(src)/ivtv-svnversion.h),m) CONFIG_VIDEO_PVRUSB2 := $(if $(wildcard $(src)/.pvrusb2-merge),m) +CONFIG_VIDEO_CX88_IVTV := $(if $(wildcard $(src)/cx88-ivtv.c),m) diff --git a/v4l/Makefile b/v4l/Makefile index c4cbb7158..626858fac 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -380,6 +380,10 @@ ivtv:: ivtv-links @echo '#define IVTV_DRIVER_VERSION_COMMENT "(v4l-dvb + ivtv virtual merge)"' > ivtv-svnversion.h @echo ivtv trunk merged. Run make to build the entire tree. +cx88-ivtv:: + @echo creating cx88-ivtv symbolic links... + @ln -sf ../v4l_experimental/cx88-ivtv.c . + links:: @echo creating symbolic links... @find ../linux/drivers/media -name '*.[ch]' -type f -exec ln -sf '{}' . \; -- cgit v1.2.3 From 0be24dbf03c86fd341e6cb26f63766e0f7f6bff3 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 13 Mar 2006 13:31:31 -0300 Subject: Remove saa711x driver From: Mauro Carvalho Chehab Now, em28xx uses saa7115 instead of saa711x. saa7115 driver is capable of handling saa 7113, 7114 and 7115. Signed-off-by: Mauro Carvalho Chehab --- v4l/Make.config | 1 - v4l/Makefile | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'v4l') diff --git a/v4l/Make.config b/v4l/Make.config index 0dd4365ce..1c89d0fa1 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -9,7 +9,6 @@ CONFIG_VIDEO_TVAUDIO := m CONFIG_VIDEO_CX88 := m CONFIG_TVP5150 := m -CONFIG_SAA711X := m #enable experimental support for xc3028 tuner CONFIG_XC3028 := m diff --git a/v4l/Makefile b/v4l/Makefile index 1af345804..426851c60 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -92,7 +92,6 @@ obj-$(CONFIG_VIDEO_BTTV) += btcx-risc.o ir-common.o bttv.o tveeprom.o obj-$(CONFIG_VIDEO_CX88) += btcx-risc.o cx88xx.o cx8800.o cx8802.o \ cx88-blackbird.o tveeprom.o obj-$(CONFIG_TVP5150) += tvp5150.o -obj-$(CONFIG_SAA711X) += saa711x.o obj-$(CONFIG_EM28XX) += em28xx.o tveeprom.o obj-$(CONFIG_VIDEO_DECODER) += saa7115.o cx25840.o saa7127.o bt832.o @@ -309,7 +308,7 @@ ifeq ($(CONFIG_VIDEO_DEV),m) inst_video += videodev.ko endif inst_video += ir-kbd-i2c.ko msp3400.ko -inst_video += tvp5150.ko saa711x.ko saa7134-alsa.ko saa7134-oss.ko +inst_video += tvp5150.ko saa7134-alsa.ko saa7134-oss.ko inst_video += saa7115.ko cx25840.ko saa7127.ko compat_ioctl32.ko inst_cx88 := cx8800.ko cx8802.ko cx88-alsa.ko inst_cx88 += cx88-blackbird.ko cx88xx.ko cx88-dvb.ko cx88-vp3054-i2c.ko -- cgit v1.2.3 From 67e573775c79f80861b483d28faefa6159450d6f Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 14 Mar 2006 12:15:21 -0300 Subject: Merging mrec tree From: Mauro Carvalho Chehab merge: Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/usbaudio_setup.sh | 106 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100755 v4l/scripts/usbaudio_setup.sh (limited to 'v4l') diff --git a/v4l/scripts/usbaudio_setup.sh b/v4l/scripts/usbaudio_setup.sh new file mode 100755 index 000000000..66fdd23df --- /dev/null +++ b/v4l/scripts/usbaudio_setup.sh @@ -0,0 +1,106 @@ +#!/bin/bash +# +# Copyright (C) 2006 Markus Rechberger +# +# 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 of the License, 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 this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +which /usr/bin/dialog >/dev/null +if [ "0" != "$?" ]; then +echo "this tool requires \"dialog\" (http://hightek.org/dialog/)" +exit 1 +fi +uid=`id -u` +if [ "0" != "$uid" ]; then +echo "this tool must be run as root, you can disable this message by editing the script but only do that unless you know what you're doing!" +exit 1 +fi +which gcc > /dev/null +if [ "0" != "$?" ]; then +echo "this tool won't work unless you install gcc" +exit 1 +fi +test -f ossid +if [ "0" != "$?" ]; then +cat > ossid.c <<_EOF +#include +#include +#include +#include +#include +#include + +int main(int argc, char **argv){ + int fd; + struct mixer_info *info; + fd=open(argv[1],O_RDONLY); + if(fd>=0){ + info=malloc(sizeof(struct mixer_info)); + ioctl(fd,SOUND_MIXER_INFO,info); + printf("%c \"%s %s\"\n",(argv[1][strlen(argv[1])-1]=='p')?'0':(argv[1][strlen(argv[1])-1]+1),info->name,info->id); + free(info); + close(fd); + } else { + return 1; + } + return 0; +} +_EOF +gcc ossid.c -o ossid +rm ossid.c +fi + +test -f /proc/asound/cards +if [ "0" != "$?" ]; then +dialog --title "Welcome" --backtitle "Empia Sound Configuration" \ +--msgbox "Your system doesn't support ALSA, please have a look at \ +www.alsa-project.org and set it up properly \ + + +Press any key to continue... " 11 50 +exit 1; +fi + +dialog --title "Welcome" --backtitle "Empia Sound Configuration" \ +--msgbox "This tool was written to ease up sound configuration for +* Terratec Hybrid XS +* Terratec Cinergy 250 USB 2.0 +* Hauppauge HVR 900 +* and possible others :) + +first select an usb audio source, as target choose your soundcard +Press any key to continue... " 13 60 + +ls /dev/dsp* | while read a; do ./ossid $a; done | xargs dialog --menu "Choose your TV Audio source:" 12 60 5 2>/tmp/em2880_source.$$ +ls /dev/dsp* | while read a; do ./ossid $a; done | xargs dialog --menu "Choose your output soundcard device:" 12 60 5 2>/tmp/em2880_dst.$$ + +source=`egrep '^[0-9p]' /tmp/em2880_source.$$` +dst=`egrep '^[0-9p]' /tmp/em2880_dst.$$` + +echo "playing $source to $dst"; +if [ "$source" = "0" ]; then + device="/dev/dsp" +else + device="/dev/dsp`expr $source - 1`" +fi + +if [ "$dst" = "0" ]; then + device2="/dev/dsp" +else + device2="/dev/dsp`expr $source - 1`" +fi +clear +echo "Using command: sox -r 48000 -w -c 2 -t ossdsp $device -t ossdsp $device2" +sox -r 48000 -w -c 2 -t ossdsp $device -t ossdsp $device2 -- cgit v1.2.3 From 45cff91c8b8ac334241058d1c07242714a209f8c Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 14 Mar 2006 14:21:37 -0300 Subject: Removed inclusion of linux/version.h included on a previous patch From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- v4l/Make.config | 2 ++ 1 file changed, 2 insertions(+) (limited to 'v4l') diff --git a/v4l/Make.config b/v4l/Make.config index 39c6a118c..65bc8dfea 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -30,6 +30,8 @@ CONFIG_VIDEO_CPIA2 := m CONFIG_VIDEO_CX88_IVTV := n +CONFIG_VIDEO_MXB := m + # doesn't build on older kernels CONFIG_DVB_CORE := n -- cgit v1.2.3