date:20031124

[alsa-cvslog] CVS: alsa-driver Makefile,1.100,1.101

2003-11-24 Thread Jaroslav Kysela

Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1:/tmp/cvs-serv29294

Modified Files:
Makefile 
Log Message:
Uros Bizjak [EMAIL PROTECTED] fixes

Index: Makefile
===
RCS file: /cvsroot/alsa/alsa-driver/Makefile,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- Makefile13 Nov 2003 17:41:15 -  1.100
+++ Makefile24 Nov 2003 08:04:14 -  1.101
@@ -125,7 +125,7 @@
@if [ -L /dev/snd ]; then \
echo The ALSA devices were removed from /proc/asound/dev directory. 
; \
echo Creating static device entries in /dev/snd. ; \
-   $(TOPDIR)/snddevices ; \
+   $(SND_TOPDIR)/snddevices ; \
fi
cat WARNING
 
@@ -173,7 +173,7 @@
 .PHONY: check-snd-prefix
 check-snd-prefix:
@ if [ x$(DESTDIR) = x ]; then \
- if modprobe -c | grep -s -q snd_; then \
+ if /sbin/modprobe -c | grep -s -q snd_; then \
echo;\
echo  = WARNING =;\
echo;\



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-utils cvscompile,1.9,1.10

2003-11-24 Thread Jaroslav Kysela

Update of /cvsroot/alsa/alsa-utils
In directory sc8-pr-cvs1:/tmp/cvs-serv30905

Modified Files:
cvscompile 
Log Message:
Use global alsa.m4 configuration

Index: cvscompile
===
RCS file: /cvsroot/alsa/alsa-utils/cvscompile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cvscompile  1 May 2003 08:28:15 -   1.9
+++ cvscompile  24 Nov 2003 08:13:37 -  1.10
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if test -d ../alsa-lib/utils; then
+if test -d ../alsa-lib/utils  ! test -r `aclocal --print-ac-dir`/alsa.m4; then
   alsa_m4_flags=-I ../alsa-lib/utils
 fi
 aclocal $alsa_m4_flags $ACLOCAL_FLAGS



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-lib/src/conf/cards CMI8738-MC6.conf,1.6,1.7

2003-11-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-lib/src/conf/cards
In directory sc8-pr-cvs1:/tmp/cvs-serv12973

Modified Files:
CMI8738-MC6.conf 
Log Message:
- fixed the 5.1 output device.



Index: CMI8738-MC6.conf
===
RCS file: /cvsroot/alsa/alsa-lib/src/conf/cards/CMI8738-MC6.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CMI8738-MC6.conf7 Nov 2003 19:39:16 -   1.6
+++ CMI8738-MC6.conf24 Nov 2003 12:58:07 -  1.7
@@ -59,7 +59,7 @@
 confdir:pcm/surround50.conf
 confdir:pcm/surround51.conf
 
-CMI8738-MC6.pcm.surround51.0 cards.CMI8738-MC6.pcm.front.0
+CMI8738-MC6.pcm.surround51.0 cards.CMI8738-MC6.pcm.surround40.0
 
 confdir:pcm/iec958.conf
 



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-tools/hdspconf hdspconf.desktop,NONE,1.1 Makefile.am,1.2,1.3 configure.in,1.3,1.4

2003-11-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-tools/hdspconf
In directory sc8-pr-cvs1:/tmp/cvs-serv1264/hdspconf

Modified Files:
Makefile.am configure.in 
Added Files:
hdspconf.desktop 
Log Message:
- added desktop file and icon
  new options --with-desktop-dir and --with-pixmap-dir.
- fixed CXXFLAGS for soundbase option.




--- NEW FILE: hdspconf.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=HDSPConf
Comment=Hammerfall DSP control application
Exec=hdspconf
FilePattern=hdspconf
Icon=hdspconf.png
Terminal=false
Type=Application
Categories=Application;AudioVideo;

Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 14 Jul 2003 14:49:16 -  1.2
+++ Makefile.am 24 Nov 2003 14:47:28 -  1.3
@@ -1,4 +1,8 @@
+EXTRA_DIST = hdspconf.desktop
 SUBDIRS = src pixmaps
+
+desktopdir = $(DESKTOP_DIR)
+desktop_DATA = hdspconf.desktop
 
 alsa-dist: distdir
@rm -rf ../distdir/hdspconf

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.in3 Nov 2003 19:09:32 -   1.3
+++ configure.in24 Nov 2003 14:47:28 -  1.4
@@ -1,12 +1,12 @@
 AC_INIT(src/hdspconf.cxx)
-AM_INIT_AUTOMAKE(hdspconf, 1.2)
+AM_INIT_AUTOMAKE(hdspconf, 1.3)
 
 AC_PROG_CXX
 AC_PROG_MAKE_SET
 AC_STDC_HEADERS
 AC_PATH_X
 
-AM_PATH_ALSA(0.9.0)
+AM_PATH_ALSA(1.0.0)
 
 dnl kernel header files
 AC_MSG_CHECKING(for kernel header files)
@@ -32,7 +32,7 @@
   [soundbasedir=$withval], [soundbasedir=$kerneldir])
 if test $soundbasedir !=  -a -r $soundbasedir/sound ; then
   ALSA_CFLAGS=$ALSA_CFLAGS -I$soundbasedir
-  CFLAGS=$CFLAGS -I$soundbasedir
+  CXXFLAGS=$CXXFLAGS -I$soundbasedir
   AC_MSG_RESULT($ALSA_CFLAGS)
 else
   if test x$prefix != xNONE; then
@@ -42,13 +42,33 @@
   fi
   if test -z $soundbasedir -a -r $aprefix/include/sound; then
 ALSA_CFLAGS=$ALSA_CFLAGS -I$aprefix/include
-CFLAGS=$CFLAGS -I$aprefix/include
+CXXFLAGS=$CXXFLAGS -I$aprefix/include
 AC_MSG_RESULT($ALSA_CFLAGS)
   else
 AC_MSG_RESULT(not specified - using C compiler defaults)
   fi
 fi
 
+dnl desktop install
+AC_ARG_WITH(desktop-dir,
+  [ --with-desktop-dir  specify the path to install desktop file],
+  [desktopdir=$withval], [desktopdir=])
+if test -z $desktopdir; then
+  desktopdir=$datadir/applications
+fi
+DESKTOP_DIR=$desktopdir
+AC_SUBST(DESKTOP_DIR)
+   
+AC_ARG_WITH(pixmap-dir,
+  [ --with-pixmap-dir  specify the path to install desktop pixmap file],
+  [pixmapdir=$withval], [pixmapdir=])
+if test -z $pixmapdir; then
+  pixmapdir=$datadir/pixmaps
+fi
+PIXMAP_DIR=$pixmapdir
+AC_SUBST(PIXMAP_DIR)
+
+dnl library check
 AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
 if test $FLTK_CONFIG = no; then
   AC_MSG_ERROR(no fltk-config is found)



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-tools/hdspmixer hdspmixer.desktop,NONE,1.1 Makefile.am,1.1,1.2 NEWS,1.2,1.3 configure.in,1.3,1.4

2003-11-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-tools/hdspmixer
In directory sc8-pr-cvs1:/tmp/cvs-serv1453/hdspmixer

Modified Files:
Makefile.am NEWS configure.in 
Added Files:
hdspmixer.desktop 
Log Message:
- fixed H9632 problem.
- added desktop file and icon
  new options --with-desktop-dir and --with-pixmap-dir.
- fixed CXXFLAGS for soundbase option.
- fixed compile warnings.



--- NEW FILE: hdspmixer.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=HDSPMixer
Comment=Hammerfall DSP matrix mixer control GUI
Exec=hdspmixer
FilePattern=hdspmixer
Icon=hdspmixer.png
Terminal=false
Type=Application
Categories=Application;AudioVideo;

Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 28 Jul 2003 11:32:32 -  1.1
+++ Makefile.am 24 Nov 2003 14:48:21 -  1.2
@@ -1,4 +1,8 @@
+EXTRA_DIST = hdspmixer.desktop
 SUBDIRS = src pixmaps
+
+desktopdir = $(DESKTOP_DIR)
+desktop_DATA = hdspmixer.desktop
 
 alsa-dist: distdir
@rm -rf ../distdir/hdspmixer

Index: NEWS
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/NEWS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NEWS3 Nov 2003 19:10:38 -   1.2
+++ NEWS24 Nov 2003 14:48:21 -  1.3
@@ -1,3 +1,8 @@
+Version 1.5 (21/11/2003):
+* Added a .desktop file
+* H9632 bug fixes (thanks to Pentti Ala-Vannesluoma)
+* Fixes presets handling for H9632 cards
+
 Version 1.4 (01/11/2003):
 * Adds support for H9632 cards
 

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.in3 Nov 2003 19:10:38 -   1.3
+++ configure.in24 Nov 2003 14:48:21 -  1.4
@@ -1,12 +1,12 @@
 AC_INIT(src/hdspmixer.cxx)
-AM_INIT_AUTOMAKE(hdspmixer, 1.4)
+AM_INIT_AUTOMAKE(hdspmixer, 1.5)
 
 AC_PROG_CXX
 AC_PROG_MAKE_SET
 AC_STDC_HEADERS
 AC_PATH_X
 
-AM_PATH_ALSA(0.9.0)
+AM_PATH_ALSA(1.0.0)
 
 dnl kernel header files
 AC_MSG_CHECKING(for kernel header files)
@@ -32,7 +32,7 @@
   [soundbasedir=$withval], [soundbasedir=$kerneldir])
 if test $soundbasedir !=  -a -r $soundbasedir/sound ; then
   ALSA_CFLAGS=$ALSA_CFLAGS -I$soundbasedir
-  CFLAGS=$CFLAGS -I$soundbasedir
+  CXXFLAGS=$CXXFLAGS -I$soundbasedir
   AC_MSG_RESULT($ALSA_CFLAGS)
 else
   if test x$prefix != xNONE; then
@@ -42,13 +42,33 @@
   fi
   if test -z $soundbasedir -a -r $aprefix/include/sound; then
 ALSA_CFLAGS=$ALSA_CFLAGS -I$aprefix/include
-CFLAGS=$CFLAGS -I$aprefix/include
+CXXFLAGS=$CXXFLAGS -I$aprefix/include
 AC_MSG_RESULT($ALSA_CFLAGS)
   else
 AC_MSG_RESULT(not specified - using C compiler defaults)
   fi
 fi
 
+dnl desktop install
+AC_ARG_WITH(desktop-dir,
+  [ --with-desktop-dir  specify the path to install desktop file],
+  [desktopdir=$withval], [desktopdir=])
+if test -z $desktopdir; then
+  desktopdir=$datadir/applications
+fi
+DESKTOP_DIR=$desktopdir
+AC_SUBST(DESKTOP_DIR)
+   
+AC_ARG_WITH(pixmap-dir,
+  [ --with-pixmap-dir  specify the path to install desktop pixmap file],
+  [pixmapdir=$withval], [pixmapdir=])
+if test -z $pixmapdir; then
+  pixmapdir=$datadir/pixmaps
+fi
+PIXMAP_DIR=$pixmapdir
+AC_SUBST(PIXMAP_DIR)
+
+dnl library check
 AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
 if test $FLTK_CONFIG = no; then
 AC_MSG_ERROR(fltk-config is required)



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-tools/hdspmixer/pixmaps hdspmixer.png,NONE,1.1 Makefile.am,1.1,1.2

2003-11-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-tools/hdspmixer/pixmaps
In directory sc8-pr-cvs1:/tmp/cvs-serv1453/hdspmixer/pixmaps

Modified Files:
Makefile.am 
Added Files:
hdspmixer.png 
Log Message:
- fixed H9632 problem.
- added desktop file and icon
  new options --with-desktop-dir and --with-pixmap-dir.
- fixed CXXFLAGS for soundbase option.
- fixed compile warnings.



--- NEW FILE: hdspmixer.png ---
PNG



Z  -¤ZX0Þx)Xe¶ÿo½òÂ`PMrf 
ÑrÓêîîªÊÊzgåûæÍ¼÷÷æ£Èjd£*ãF_|ç\ùïùTÃC#¥´þ6»Ï¿d2síÞJ~Dxñ¼¡-Ñ9=f2°´ºAÉíá1©Ð\úgÇ-Ü{÷!ã83ä)pqÔd0¸q÷6§ÆCzãIâÑ=?%{ïÜ'îíöÛxm÷IcÔñXßÚÀ7Äüê=^?Æ1¹Ê2¦ì*o¨
 MpÂ!Ñé)Võ%÷w
,ºgçäãÁñ 
v?âñÛëåâøbæ¢yÈd°Qø§·]FÝÅIÄÞóø;uß~¸M÷äq·MÍóØûúÄ1÷®¹»Ç±J§Ù æííDÞÝ.pcÕG,Dg§xaHsï
¯÷¾æÃ|Îdàzï?|kWyòù?ðâÅl¢
w¾Ke%Ï×òòÇ'$¹\ï{¸cme
·WBUòù¹À§T*±¹¹NFi
Ä*Þ++«6ê
3rpvd1Áó|[EMAIL PROTECTED]nèF3T
rpv]ÄPpÈÅNÀQAjÁÄNâ¢BÞ7pàDG\èYÜs§dÿø¦çgç¨¦ØRÀáæÛCMT-iY 
AàS©TûC    [EMAIL PROTECTED]|ÑïvAÔfy©Ìë×Øûæ
áphjSR©L©Tääø$Ã¿ÎÖ[]_ÃívÚ¼Ù}qxÂÙÅ O¹^!øæoðóÁv¯K½ZãÞÝ»t»]NOð|N¯Ë 
©-UÙ¸¶ÅáaÖy×siµÛF#JÅßýÎãLvqÚÝáhÄím*ËUGM:mÏá¼uUËöµmv®_ewX[EMAIL 
PROTECTED]@7ÄIÆó¦{ÂÓþ£($IHÆIó¢wÌðpRx±ñDyr¾Ç«þ  Ñd«([EMAIL 
PROTECTED] ò3À$UE3æHªMõTAµ0RM(±ÂØ([EMAIL PROTECTED]Kì*jVö/-£ª¦ 
ý-A5ÓÓiõHjM3ÙÔ N%©
I×!9µm´?¨`(RóÅ¿f,ª£Ù¯XT²b´ú³.}Æ¢:;ëåu5mFKeÒ,denÝ¼E
  ú}~ïË|ö±
åbÛ·oãçó¸GPÈ(T+K7o[M¿3é÷jae¥NµTdX*ð\\+cX_]¥^.sÞmñOÖr5ËàEJË[TEÎ.ÚóÒùÎöu8¡Ýëñ[oçñÔÃqSÈxøÁCv¶·éöB§
 
aæ ZYâñ·¿ÍêJû;ðç²Âõµtw«U=~L¥²D$Í/¢°µ¹Áßú¹ÀçûßÉóïÿ ÊZÕ1l_»ÆÃo}ë6ëw®3ßºqwÞ}Ïu°qÖªòàþ}¸
øýÿì½
7ÿÊ;)ÉiæA(ÝUÞú×Bq35 2ÍßQ®üV$mE3Ü
ä×Á¸YÄN¼r0iïF2ÌÚHêã¼3ÌIVV·(Tßrµ)×fÚhmÆÉÓ]¹$s½[EMAIL 
PROTECTED]:.èBgÈf©
!wÚ|Í*ü²3sÌ¼óËìw³ gdúa!º,cQK:_dÐ#ÂúïBm`0Á¨Í(LU//M¿Ú
6+n1ó   s.DtêÇ¨))L×»¼!v
ÈÇÒqÑ4ïcÄìÑ¡¦åFp}Tñ^Ñ3×q²ø¹÷«2*×¤çl#®ï ª?¯âôò5¸çãø9¬UQ   
ùE#ë%W\bÉªx¿(r¸Käq¼ØB¥»FüYL0äòEÂá«Jådä0Áu4 \paÔRÚ_Ç¾I(UJ¸®ëúãã¨R~¾Z¥T)ã¹^#¬µÔmck%Üv«ÍþþQyôÓAp;´/Úìï7#H@,[EMAIL
 PROTECTED]I4áøèÓî)ÖUÈ)ÞG.¡3L¯ 
s?ôY®×pýº¿ÝEZE¨¼YOèwûì7èê!!Hh¸vss{n»ËÞé£[Qzë8ØÅÆÖYÝþ£í¼¾Ãzkî¿Ê:{Dw#d$xG.%¯D29;9çu¼K² ëÂçj*q½Îaó+-«°d)ì¹º~·^¯ñÞûï0aCGøJeÖÖVyïýw1äA|¡º^¡T*råÊ^Þ#öâô\àUßçÆÍ*2±NÁPJ¸ÏÛ,µÄb!ÎMÃæêù|Û·o²Ü¯¦÷Ðesc|ÏwÞfDÍÎÞÍ
ä¿þ·¿Ôå5|ÏÑ¸ë:4äs9? 
Ï#Æ¤WÜ°¿·KµV£P(ìÚ!IbNNÏ¨U+x®G³s1Âg}Êí;wñ|.OÄFïÒd}m
\×q££CnÝ¹M,®ëbÉxÌ 
âÖªU®_¹ÁkW¯²ººÊßüð¯ÙÚÜBcpCµV#cJ¥öwoßfÐjë8Lâ1½A[;;ÂD¨V««+uýô®_½Áe³¾±ÁA£Á[oßão~ø×Ü¹yÓsÏãwÞáç|ÂöõmZç§¸wÆÁ!£ÑGÑï÷9Àm]´¾
 L4÷  üÆ~Éd±%
GAqÒyå ÙÄu¢hB'øïùaHwÔçå7¯#ÆÑ\1ÇqG¯_¿-ýÁý]Æã1Ç
ú{JLÆO´Û¾yó0ùìWÒévFýAOûïþÆVã¢(Âó®\ÝD¥ßÒïÒ7+
ïR¯.!bèõCáÏó¢1ç²½sp0¢ÝîÒë÷)Kô{=?`mµBl0èv{i6»]êõe+´/ºX«
ÃÙûà\`©#¢hÌhá¸¨RV0\b±ÈÞÁ6Mz½|\P 8=¦qÐ ÛëpÑnËåYZªØæá(¤Ûë0
8âRÍîO¿xï¹6q\qJÅ2AàóÕ×_'1Æåb|®ZÈçsìîïÑºhB\×£T(á¹a8äõo89=a)
8·îÜúóFóx2ÆøXµôºGLc\×ÁóÜlL8;?£uÑÊÄÇªÇu8hÐn_à8BÇ$FmÂy«ÅÙùY:v$×aOã³³SÎÏÏ#\'=8McÔ4
L_E#þNÜ«ù
Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/pixmaps/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 28 Jul 2003 11:32:32 -  1.1
+++ Makefile.am 24 Nov 2003 14:48:21 -  1.2
@@ -1 +1,4 @@
-EXTRA_DIST = $(wildcard *.xpm)
+pixmapdir = $(PIXMAP_DIR)
+pixmap_DATA = hdspmixer.png
+
+EXTRA_DIST = $(wildcard *.xpm) hdspmixer.png



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/drivers/vx vx_pcm.c,1.1,1.2

2003-11-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/drivers/vx
In directory sc8-pr-cvs1:/tmp/cvs-serv9263/drivers/vx

Modified Files:
vx_pcm.c 
Log Message:
- added hw_constraint to align 4bytes.
  this will solve the 24bit problem on vx222.



Index: vx_pcm.c
===
RCS file: /cvsroot/alsa/alsa-kernel/drivers/vx/vx_pcm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vx_pcm.c23 May 2003 16:00:43 -  1.1
+++ vx_pcm.c24 Nov 2003 15:27:28 -  1.2
@@ -611,6 +611,10 @@
runtime-hw.period_bytes_min = chip-ibl.size;
runtime-private_data = pipe;
 
+   /* align to 4 bytes (otherwise will be problematic when 24bit is used) */ 
+   snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 4);
+   snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 4);
+
return 0;
 }
 
@@ -1014,6 +1018,10 @@
runtime-hw = vx_pcm_capture_hw;
runtime-hw.period_bytes_min = chip-ibl.size;
runtime-private_data = pipe;
+
+   /* align to 4 bytes (otherwise will be problematic when 24bit is used) */ 
+   snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 4);
+   snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 4);
 
return 0;
 }



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/core pcm.c,1.34,1.35

2003-11-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv21459

Modified Files:
pcm.c 
Log Message:
- clear the status record before calling snd_pcm_status() in proc read.
  this will prevent to show bogus values when status = OPEN.



Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- pcm.c   23 Oct 2003 14:34:52 -  1.34
+++ pcm.c   24 Nov 2003 16:20:42 -  1.35
@@ -371,6 +371,7 @@
snd_iprintf(buffer, closed\n);
return;
}
+   memset(status, 0, sizeof(status));
err = snd_pcm_status(substream, status);
if (err  0) {
snd_iprintf(buffer, error %d\n, err);



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-tools/hdspconf ChangeLog,1.2,1.3 configure.in,1.4,1.5

2003-11-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-tools/hdspconf
In directory sc8-pr-cvs1:/tmp/cvs-serv14965

Modified Files:
ChangeLog configure.in 
Log Message:
- updated to version 1.4
  fixed compile warnings.



Index: ChangeLog
===
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog   3 Nov 2003 19:09:32 -   1.2
+++ ChangeLog   24 Nov 2003 18:16:26 -  1.3
@@ -1,2 +1,8 @@
+Version 1.4 (24/11/2003) :
+* Fix compilation warnings
+
+Version 1.3 (21/11/2003) :
+* Added a .desktop file and icon
+
 Version 1.2 (01/11/2003) :
 * added support for HDSP 9652 and HDSP 9632 specific features

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configure.in24 Nov 2003 14:47:28 -  1.4
+++ configure.in24 Nov 2003 18:16:26 -  1.5
@@ -1,5 +1,5 @@
 AC_INIT(src/hdspconf.cxx)
-AM_INIT_AUTOMAKE(hdspconf, 1.3)
+AM_INIT_AUTOMAKE(hdspconf, 1.4)
 
 AC_PROG_CXX
 AC_PROG_MAKE_SET



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-tools/hdspmixer/src HDSPMixerCard.cxx,1.3,1.4 HDSPMixerCard.h,1.3,1.4 HDSPMixerFader.cxx,1.1,1.2 HDSPMixerMaster.cxx,1.1,1.2 HDSPMixerMeter.cxx,1.2,1.3 HDSPMixerOutput.cxx,1.3,1.4 HDSPMixerOutput.h,1.3,1.4 HDSPMixerPan.cxx,1.1,1.2 HDSPMixerSelector.cxx,1.3,1.4 HDSPMixerSelector.h,1.3,1.4 HDSPMixerView.cxx,1.1,1.2 HDSPMixerWindow.cxx,1.3,1.4 Makefile.am,1.1,1.2

2003-11-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-tools/hdspmixer/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15125/src

Modified Files:
HDSPMixerCard.cxx HDSPMixerCard.h HDSPMixerFader.cxx 
HDSPMixerMaster.cxx HDSPMixerMeter.cxx HDSPMixerOutput.cxx 
HDSPMixerOutput.h HDSPMixerPan.cxx HDSPMixerSelector.cxx 
HDSPMixerSelector.h HDSPMixerView.cxx HDSPMixerWindow.cxx 
Makefile.am 
Log Message:
- updated to version 1.6
  - fixed compile warnings
  - corrects preset 7 for H9632 cards



Index: HDSPMixerCard.cxx
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/src/HDSPMixerCard.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HDSPMixerCard.cxx   24 Nov 2003 14:48:21 -  1.3
+++ HDSPMixerCard.cxx   24 Nov 2003 18:17:05 -  1.4
@@ -19,9 +19,76 @@
  */
 
 #pragma implementation
-#define HDSPMIXER_DEFINE_MAPPINGS
 #include HDSPMixerCard.h
 
+static char channel_map_df_ss[26] = {
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+18, 19, 20, 21, 22, 23, 24, 25
+};
+
+static char channel_map_mf_ss[26] = {
+0, 1, 2, 3, 4, 5, 6, 7,
+16, 17, 18, 19, 20, 21, 22, 23, 
+24, 25,
+-1, -1, -1, -1, -1, -1, -1, -1
+};
+
+static char meter_map_ds[26] = {
+0, 1, 2, 3, 8, 9, 10, 11, 16, 17, 18, 19, 
+24, 25,
+-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
+};
+
+static char channel_map_ds[26] = {
+1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 
+24, 25,
+-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
+};
+
+static char dest_map_mf_ss[10] = {
+0, 2, 4, 6, 16, 18, 20, 22, 24, 26 
+};
+
+static char dest_map_ds[8] = {
+0, 2, 8, 10, 16, 18, 24, 26 
+};
+
+static char dest_map_df_ss[14] = {
+0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26 
+};
+
+static char dest_map_h9652_ss[13] = {
+0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24 
+};
+
+static char dest_map_h9652_ds[7] = {
+0, 2, 8, 10, 16, 18, 24 
+};
+
+static char dest_map_h9632_ss[8] = {
+0, 2, 4, 6, 8, 10, 12, 14
+};
+
+static char dest_map_h9632_ds[6] = {
+0, 2, 8, 10, 12, 14
+};
+
+static char dest_map_h9632_qs[4] = {
+8, 10, 12, 14
+};
+
+static char channel_map_h9632_ss[16] = {
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+};
+
+static char channel_map_h9632_ds[12] = {
+0, 1, 2, 3, 8, 9, 10, 11, 12, 13, 14, 15
+};
+
+static char channel_map_h9632_qs[8] = {
+8, 9, 10, 11, 12, 13, 14, 15
+};
+
 static void alsactl_cb(snd_async_handler_t *handler)
 {
 int err, clock_value;
@@ -76,12 +143,7 @@
 
 int HDSPMixerCard::getAutosyncSpeed()
 {
-/*  FIXME : this is over simplistic, there are lots of crooked cases
-   It should always be possible to do what one wants executing the 
-   proper sequence of actions, though.
-*/
-
-int err, external_rate;
+int err, rate;
 snd_ctl_elem_value_t *elemval;
 snd_ctl_elem_id_t * elemid;
 snd_ctl_t *handle;
@@ -92,24 +154,22 @@
return -1; 
 }
 
-snd_ctl_elem_id_set_name(elemid, External Rate);
-snd_ctl_elem_id_set_numid(elemid, 17);
-snd_ctl_elem_id_set_interface(elemid, SND_CTL_ELEM_IFACE_PCM);
+snd_ctl_elem_id_set_name(elemid, System Sample Rate);
+snd_ctl_elem_id_set_numid(elemid, 16);
+snd_ctl_elem_id_set_interface(elemid, SND_CTL_ELEM_IFACE_HWDEP);
 snd_ctl_elem_id_set_device(elemid, 0);
 snd_ctl_elem_id_set_subdevice(elemid, 0);
 snd_ctl_elem_id_set_index(elemid, 0);
 snd_ctl_elem_value_set_id(elemval, elemid);
 snd_ctl_elem_read(handle, elemval);
-external_rate = snd_ctl_elem_value_get_enumerated(elemval, 0);
+rate = snd_ctl_elem_value_get_integer(elemval, 0);
 
 snd_ctl_close(handle);
 
-if (external_rate  2  external_rate  6) {
-   return 1;
-} else if (external_rate  6) {
+if (rate  96000) {
return 2;
-} else if (external_rate = 2) {
-   return 0;
+} else if (rate  48000) {
+   return 1;
 }
 return 0;
 }
@@ -189,7 +249,7 @@
 }
 
 void HDSPMixerCard::getAeb() {
-int err, i;
+int err;
 snd_hwdep_t *hw;
 snd_hwdep_info_t *info;
 snd_hwdep_info_alloca(info);

Index: HDSPMixerCard.h
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/src/HDSPMixerCard.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HDSPMixerCard.h 24 Nov 2003 14:48:21 -  1.3
+++ HDSPMixerCard.h 24 Nov 2003 18:17:05 -  1.4
@@ -26,9 +26,6 @@
 #include stdio.h
 #include alsa/asoundlib.h
 #include sound/hdsp.h
-#ifdef HDSPMIXER_DEFINE_MAPPINGS
-#include mappings.h
-#endif
 #include defines.h
 #include HDSPMixerWindow.h
 

Index: HDSPMixerFader.cxx
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/src/HDSPMixerFader.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
---

[alsa-cvslog] CVS: alsa-kernel/pci/ice1712 aureon.c,1.3,1.4 prodigy.c,1.2,1.3

2003-11-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci/ice1712
In directory sc8-pr-cvs1:/tmp/cvs-serv17530

Modified Files:
aureon.c prodigy.c 
Log Message:
fixes by Apostolos Dimitromanolakis [EMAIL PROTECTED]:
- fixed the pop noise at the start up of aureon boards.
- update of prodigy driver (modifed by ti).





Index: aureon.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/aureon.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aureon.c1 Sep 2003 09:20:56 -   1.3
+++ aureon.c24 Nov 2003 18:29:54 -  1.4
@@ -185,7 +185,7 @@
if (nvol = 0x1a  ovol = 0x1a)
change = 0;
else
-   wm_put(ice, idx, nvol | 0x100);
+   wm_put(ice, idx, nvol | 0x180); /* update on zero detect */
}
snd_ice1712_restore_gpio_status(ice);
return change;
@@ -366,9 +366,15 @@
 static int __devinit aureon_init(ice1712_t *ice)
 {
static unsigned short wm_inits[] = {
+   /* These come first to reduce init pop noise */
+   0x1b, 0x000,/* ADC Mux */
+   0x1c, 0x009,/* Out Mux1 */
+   0x1d, 0x009,/* Out Mux2 */
+
+   0x18, 0x000,/* All power-up */
+
0x16, 0x122,/* I2S, normal polarity, 24bit */
0x17, 0x022,/* 256fs, slave mode */
-   0x18, 0x000,/* All power-up */
0x00, 0,/* DAC1 analog mute */
0x01, 0,/* DAC2 analog mute */
0x02, 0,/* DAC3 analog mute */
@@ -393,9 +399,6 @@
0x15, 0x000,/* no deemphasis, no ZFLG */
0x19, 0x000,/* -12dB ADC/L */
0x1a, 0x000,/* -12dB ADC/R */
-   0x1b, 0x000,/* ADC Mux */
-   0x1c, 0x009,/* Out Mux1 */
-   0x1d, 0x009,/* Out Mux2 */
};
static unsigned short cs_inits[] = {
0x0441, /* RUN */

Index: prodigy.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/prodigy.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- prodigy.c   13 Nov 2003 13:34:06 -  1.2
+++ prodigy.c   24 Nov 2003 18:29:56 -  1.3
@@ -5,6 +5,11 @@
  *  Copyright (c) 2003 Dimitromanolakis Apostolos [EMAIL PROTECTED]
  * based on the aureon.c code (c) 2003 by Takashi Iwai [EMAIL PROTECTED]
  *
+ *   version 0.82: Stable / not all features work yet (no communication with AC97 
secondary)
+ *   added 64x/128x oversampling switch (should be 64x only for 96khz)
+ *   fixed some recording labels (still need to check the rest)
+ *   recording is working probably thanks to correct wm8770 initialization
+ *
  *   version 0.5: Initial release:
  *   working: analog output, mixer, headphone amplifier switch
  *   not working: prety much everything else, at least i could verify that
@@ -42,12 +47,14 @@
  *   if they show better response than DAC analog volumes, we can use them
  *   instead.
  *
- * - Prodigy boards are equipped with AC97 codec, too.  it's used to do
+ * - Prodigy boards are equipped with AC97 STAC9744 chip , too.  it's used to do
  *   the analog mixing but not easily controllable (it's not connected
  *   directly from envy24ht chip).  so let's leave it as it is.
  *
  */
 
+#define REVISION 0.82b
+
 #include sound/driver.h
 #include asm/io.h
 #include linux/delay.h
@@ -61,18 +68,20 @@
 #include prodigy.h
 
 
-static void prodigy_set_headphone_amp(ice1712_t *ice, int enable)
+static int prodigy_set_headphone_amp(ice1712_t *ice, int enable)
 {
-   unsigned int tmp = snd_ice1712_gpio_read(ice);
+   unsigned int tmp, tmp2;
 
-   tmp = ~ PRODIGY_HP_AMP_EN;
-   if(enable)
+   tmp2 = tmp = snd_ice1712_gpio_read(ice);
+   if (enable)
tmp |= PRODIGY_HP_AMP_EN;
else
tmp = ~ PRODIGY_HP_AMP_EN;
-
-
-   snd_ice1712_gpio_write(ice, tmp);
+   if (tmp != tmp2) {
+   snd_ice1712_gpio_write(ice, tmp);
+   return 1;
+   }
+   return 0;
 }
 
 
@@ -192,18 +201,115 @@
 {
ice1712_t *ice = snd_kcontrol_chip(kcontrol);
 
-   /*snd_printk(Prodigy set headphone amplifier: 
%d\n,ucontrol-value.integer.value[0]);*/
-   prodigy_set_headphone_amp(ice,ucontrol-value.integer.value[0]);
-   return 1;
+   return prodigy_set_headphone_amp(ice,ucontrol-value.integer.value[0]);
+}
+
+
+
+#define PRODIGY_CON_DEEMP \
+{\
+.iface = SNDRV_CTL_ELEM_IFACE_MIXER,  \
+.name =  DAC De-emphasis, \
+.info =

[alsa-cvslog] CVS: alsa-driver Makefile,1.100,1.101

[alsa-cvslog] CVS: alsa-utils cvscompile,1.9,1.10

[alsa-cvslog] CVS: alsa-lib/src/conf/cards CMI8738-MC6.conf,1.6,1.7

[alsa-cvslog] CVS: alsa-tools/hdspconf hdspconf.desktop,NONE,1.1 Makefile.am,1.2,1.3 configure.in,1.3,1.4

[alsa-cvslog] CVS: alsa-tools/hdspmixer hdspmixer.desktop,NONE,1.1 Makefile.am,1.1,1.2 NEWS,1.2,1.3 configure.in,1.3,1.4

[alsa-cvslog] CVS: alsa-tools/hdspmixer/pixmaps hdspmixer.png,NONE,1.1 Makefile.am,1.1,1.2

[alsa-cvslog] CVS: alsa-kernel/drivers/vx vx_pcm.c,1.1,1.2

[alsa-cvslog] CVS: alsa-kernel/core pcm.c,1.34,1.35

[alsa-cvslog] CVS: alsa-tools/hdspconf ChangeLog,1.2,1.3 configure.in,1.4,1.5

[alsa-cvslog] CVS: alsa-kernel/pci/ice1712 aureon.c,1.3,1.4 prodigy.c,1.2,1.3

11 matches

Site Navigation

Mail list logo

Footer information