Re: UPDATE: xmms

2023-06-11 Thread Brad Smith
On Fri, May 19, 2023 at 01:32:55PM -0400, Brad Smith wrote:
> Disable the JACK backend. The are two backends enabled and the ao backend 
> works fine.

An updated diff that also includes dealing with newer FFmpeg releases.


Index: Makefile
===
RCS file: /home/cvs/ports/audio/xmms2/Makefile,v
retrieving revision 1.61
diff -u -p -u -p -r1.61 Makefile
--- Makefile5 Nov 2022 17:06:23 -   1.61
+++ Makefile19 May 2023 07:27:18 -
@@ -3,7 +3,7 @@ COMMENT =   audio player daemon with libr
 V =0.8
 DISTNAME = xmms2-${V}DrO_o
 PKGNAME =  xmms2-${V}
-REVISION = 17
+REVISION = 18
 
 SHARED_LIBS += xmmsclient++2.0 # 4.0.0
 SHARED_LIBS += xmmsclient++-glib   1.0 # 1.0.0
@@ -19,7 +19,7 @@ PERMIT_PACKAGE =  Yes
 
 WANTLIB += ${COMPILER_LIBCXX} FLAC ao avahi-client avahi-common
 WANTLIB += avahi-glib avcodec avutil c curl ffi gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 intl jack m mpg123
+WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 intl m mpg123
 WANTLIB += ogg opus pcre2-8 perl python2.7 readline sndfile sqlite3
 WANTLIB += swresample vorbis vorbisenc vorbisfile xml2 z
 
@@ -33,7 +33,7 @@ COMPILER =base-clang ports-gcc base-gc
 
 MODULES =  lang/python \
perl
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
 
 NO_TEST =  Yes
 
@@ -44,7 +44,6 @@ LIB_DEPENDS = devel/glib2 \
databases/sqlite3 \
graphics/ffmpeg \
audio/libao \
-   audio/jack \
textproc/libxml \
net/curl \
audio/mpg123 \
@@ -71,7 +70,7 @@ do-configure:
--no-cython \
--disable-shmvis-server \

--without-optionals=medialib-updater,tests,xmmsclient-cf,xmmsclient-ecore,ruby \
-   
--without-plugins=airplay,alsa,cdda,coreaudio,faad,gme,ices,mac,mad,mms,modplug,musepack,nms,ofa,oss,pulse,samba,sid,speex,sun,tremor,vocoder,waveout,wavpack
+   
--without-plugins=airplay,alsa,cdda,coreaudio,faad,gme,ices,jack,mac,mad,mms,modplug,musepack,nms,ofa,oss,pulse,samba,sid,speex,sun,tremor,vocoder,waveout,wavpack
 
 post-configure:
# avoid linking to bogus libraries
Index: patches/patch-src_plugins_avcodec_avcodec_c
===
RCS file: 
/home/cvs/ports/audio/xmms2/patches/patch-src_plugins_avcodec_avcodec_c,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_plugins_avcodec_avcodec_c
--- patches/patch-src_plugins_avcodec_avcodec_c 11 Mar 2022 18:20:36 -  
1.5
+++ patches/patch-src_plugins_avcodec_avcodec_c 19 May 2023 02:06:20 -
@@ -1,7 +1,8 @@
 Deal with newer FFmpeg API.
 
 src/plugins/avcodec/avcodec.c.orig Thu Mar 27 01:42:57 2014
-+++ src/plugins/avcodec/avcodec.c  Thu Mar 27 01:52:27 2014
+Index: src/plugins/avcodec/avcodec.c
+--- src/plugins/avcodec/avcodec.c.orig
 src/plugins/avcodec/avcodec.c
 @@ -23,6 +23,7 @@
  #include 
  #include 
@@ -10,7 +11,14 @@ Deal with newer FFmpeg API.
  
  #include "avcodec_compat.h"
  
-@@ -36,6 +37,8 @@ typedef struct {
+@@ -30,12 +31,15 @@
+ 
+ typedef struct {
+   AVCodecContext *codecctx;
++  AVPacket packet;
+ 
+   guchar *buffer;
+   guint buffer_length;
guint buffer_size;
gboolean no_demuxer;
  
@@ -19,7 +27,7 @@ Deal with newer FFmpeg API.
guint channels;
guint samplerate;
xmms_sample_format_t sampleformat;
-@@ -53,10 +56,14 @@ typedef struct {
+@@ -53,10 +57,14 @@ typedef struct {
  static gboolean xmms_avcodec_plugin_setup (xmms_xform_plugin_t *xform_plugin);
  static gboolean xmms_avcodec_init (xmms_xform_t *xform);
  static void xmms_avcodec_destroy (xmms_xform_t *xform);
@@ -34,7 +42,7 @@ Deal with newer FFmpeg API.
  
  /*
   * Plugin header
-@@ -85,13 +92,23 @@ xmms_avcodec_plugin_setup (xmms_xform_plugin_t *xform_
+@@ -85,13 +93,23 @@ xmms_avcodec_plugin_setup (xmms_xform_plugin_t *xform_
xmms_magic_add ("A/52 (AC-3) header", "audio/x-ffmpeg-ac3",
"0 beshort 0x0b77", NULL);
xmms_magic_add ("DTS header", "audio/x-ffmpeg-dca",
@@ -59,7 +67,7 @@ Deal with newer FFmpeg API.
return TRUE;
  }
  
-@@ -107,6 +124,7 @@ xmms_avcodec_destroy (xmms_xform_t *xform)
+@@ -107,6 +125,7 @@ xmms_avcodec_destroy (xmms_xform_t *xform)
  
avcodec_close (data->codecctx);
av_free (data->codecctx);
@@ -67,18 +75,31 @@ Deal with newer FFmpeg API.
  
g_string_free (data->outbuf, TRUE);
g_free (data->buffer);
-@@ -132,9 +150,10 @@ xmms_avcodec_init (xmms_xform_t *xform)
+@@ -118,7 +137,7 @@ static gboolean
+ xmms_avcodec_init (xmms_xform_t 

Re: UPDATE: xmms

2023-06-08 Thread Brad Smith

ping.

On 5/19/2023 1:32 PM, Brad Smith wrote:

Disable the JACK backend. The are two backends enabled and the ao backend works 
fine.


Index: Makefile
===
RCS file: /home/cvs/ports/audio/xmms2/Makefile,v
retrieving revision 1.61
diff -u -p -u -p -r1.61 Makefile
--- Makefile5 Nov 2022 17:06:23 -   1.61
+++ Makefile19 May 2023 07:27:18 -
@@ -3,7 +3,7 @@ COMMENT =   audio player daemon with libr
  V =   0.8
  DISTNAME =xmms2-${V}DrO_o
  PKGNAME = xmms2-${V}
-REVISION = 17
+REVISION = 18
  
  SHARED_LIBS +=		xmmsclient++		2.0 # 4.0.0

  SHARED_LIBS +=xmmsclient++-glib   1.0 # 1.0.0
@@ -19,7 +19,7 @@ PERMIT_PACKAGE =  Yes
  
  WANTLIB += ${COMPILER_LIBCXX} FLAC ao avahi-client avahi-common

  WANTLIB += avahi-glib avcodec avutil c curl ffi gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 intl jack m mpg123
+WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 intl m mpg123
  WANTLIB += ogg opus pcre2-8 perl python2.7 readline sndfile sqlite3
  WANTLIB += swresample vorbis vorbisenc vorbisfile xml2 z
  
@@ -33,7 +33,7 @@ COMPILER =		base-clang ports-gcc base-gc
  
  MODULES =		lang/python \

perl
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
  
  NO_TEST =		Yes
  
@@ -44,7 +44,6 @@ LIB_DEPENDS =		devel/glib2 \

databases/sqlite3 \
graphics/ffmpeg \
audio/libao \
-   audio/jack \
textproc/libxml \
net/curl \
audio/mpg123 \
@@ -71,7 +70,7 @@ do-configure:
--no-cython \
--disable-shmvis-server \

--without-optionals=medialib-updater,tests,xmmsclient-cf,xmmsclient-ecore,ruby \
-   
--without-plugins=airplay,alsa,cdda,coreaudio,faad,gme,ices,mac,mad,mms,modplug,musepack,nms,ofa,oss,pulse,samba,sid,speex,sun,tremor,vocoder,waveout,wavpack
+   
--without-plugins=airplay,alsa,cdda,coreaudio,faad,gme,ices,jack,mac,mad,mms,modplug,musepack,nms,ofa,oss,pulse,samba,sid,speex,sun,tremor,vocoder,waveout,wavpack
  
  post-configure:

# avoid linking to bogus libraries
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/audio/xmms2/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- pkg/PLIST   11 Mar 2022 18:20:36 -  1.9
+++ pkg/PLIST   19 May 2023 07:29:05 -
@@ -116,7 +116,6 @@ lib/xmms2/
  @so lib/xmms2/libxmms_html.so
  @so lib/xmms2/libxmms_icymetaint.so
  @so lib/xmms2/libxmms_id3v2.so
-@so lib/xmms2/libxmms_jack.so
  @so lib/xmms2/libxmms_karaoke.so
  @so lib/xmms2/libxmms_m3u.so
  @so lib/xmms2/libxmms_mp4.so




UPDATE: xmms

2023-05-19 Thread Brad Smith
Disable the JACK backend. The are two backends enabled and the ao backend works 
fine.


Index: Makefile
===
RCS file: /home/cvs/ports/audio/xmms2/Makefile,v
retrieving revision 1.61
diff -u -p -u -p -r1.61 Makefile
--- Makefile5 Nov 2022 17:06:23 -   1.61
+++ Makefile19 May 2023 07:27:18 -
@@ -3,7 +3,7 @@ COMMENT =   audio player daemon with libr
 V =0.8
 DISTNAME = xmms2-${V}DrO_o
 PKGNAME =  xmms2-${V}
-REVISION = 17
+REVISION = 18
 
 SHARED_LIBS += xmmsclient++2.0 # 4.0.0
 SHARED_LIBS += xmmsclient++-glib   1.0 # 1.0.0
@@ -19,7 +19,7 @@ PERMIT_PACKAGE =  Yes
 
 WANTLIB += ${COMPILER_LIBCXX} FLAC ao avahi-client avahi-common
 WANTLIB += avahi-glib avcodec avutil c curl ffi gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 intl jack m mpg123
+WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 intl m mpg123
 WANTLIB += ogg opus pcre2-8 perl python2.7 readline sndfile sqlite3
 WANTLIB += swresample vorbis vorbisenc vorbisfile xml2 z
 
@@ -33,7 +33,7 @@ COMPILER =base-clang ports-gcc base-gc
 
 MODULES =  lang/python \
perl
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
 
 NO_TEST =  Yes
 
@@ -44,7 +44,6 @@ LIB_DEPENDS = devel/glib2 \
databases/sqlite3 \
graphics/ffmpeg \
audio/libao \
-   audio/jack \
textproc/libxml \
net/curl \
audio/mpg123 \
@@ -71,7 +70,7 @@ do-configure:
--no-cython \
--disable-shmvis-server \

--without-optionals=medialib-updater,tests,xmmsclient-cf,xmmsclient-ecore,ruby \
-   
--without-plugins=airplay,alsa,cdda,coreaudio,faad,gme,ices,mac,mad,mms,modplug,musepack,nms,ofa,oss,pulse,samba,sid,speex,sun,tremor,vocoder,waveout,wavpack
+   
--without-plugins=airplay,alsa,cdda,coreaudio,faad,gme,ices,jack,mac,mad,mms,modplug,musepack,nms,ofa,oss,pulse,samba,sid,speex,sun,tremor,vocoder,waveout,wavpack
 
 post-configure:
# avoid linking to bogus libraries
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/audio/xmms2/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- pkg/PLIST   11 Mar 2022 18:20:36 -  1.9
+++ pkg/PLIST   19 May 2023 07:29:05 -
@@ -116,7 +116,6 @@ lib/xmms2/
 @so lib/xmms2/libxmms_html.so
 @so lib/xmms2/libxmms_icymetaint.so
 @so lib/xmms2/libxmms_id3v2.so
-@so lib/xmms2/libxmms_jack.so
 @so lib/xmms2/libxmms_karaoke.so
 @so lib/xmms2/libxmms_m3u.so
 @so lib/xmms2/libxmms_mp4.so



[UPDATE] xmms-1.2.11

2007-11-24 Thread Antoine Jacoutot

This diff updates XMMS to the latest available version.

Please test, comment, OK... the usual ;)


Index: Makefile
===
RCS file: /cvs/ports/audio/xmms/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- Makefile13 Nov 2007 12:44:23 -  1.53
+++ Makefile24 Nov 2007 09:46:10 -
@@ -8,13 +8,13 @@

 SHARED_ONLY=   Yes

-VERSION=   1.2.10
+VERSION=   1.2.11
 DISTNAME=  xmms-${VERSION}
-PKGNAME-main=  xmms-${VERSION}p11
-PKGNAME-esd=   xmms-esd-${VERSION}p7
-PKGNAME-vorbis=xmms-vorbis-${VERSION}p7
-PKGNAME-mikmod=xmms-mikmod-${VERSION}p7
-PKGNAME-mp3=   xmms-mp3-${VERSION}p8
+PKGNAME-main=  xmms-${VERSION}
+PKGNAME-esd=   xmms-esd-${VERSION}
+PKGNAME-vorbis=xmms-vorbis-${VERSION}
+PKGNAME-mikmod=xmms-mikmod-${VERSION}
+PKGNAME-mp3=   xmms-mp3-${VERSION}
 SHARED_LIBS=   xmms4.1
 CATEGORIES=audio
 HOMEPAGE=  http://www.xmms.org
Index: distinfo
===
RCS file: /cvs/ports/audio/xmms/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo5 Apr 2007 15:37:45 -   1.5
+++ distinfo24 Nov 2007 09:46:10 -
@@ -1,5 +1,5 @@
-MD5 (xmms-1.2.10.tar.gz) = ha0tsQ+/387M0SqPYXERrQ==
-RMD160 (xmms-1.2.10.tar.gz) = S9wPXGT7mwoXzqO8FHOJDFRwybc=
-SHA1 (xmms-1.2.10.tar.gz) = i/7bIIwSeIVG3VnpHRA6rEboK7A=
-SHA256 (xmms-1.2.10.tar.gz) = ixZR5C55rEBoI0CbTGU/Q73cP0xspdISRaH3IDwCplk=
-SIZE (xmms-1.2.10.tar.gz) = 4034832
+MD5 (xmms-1.2.11.tar.gz) = pdfoJcRgVVS3n4rPmGxMsg==
+RMD160 (xmms-1.2.11.tar.gz) = OsnVEeQHbAymY61tUasRjbLZrK8=
+SHA1 (xmms-1.2.11.tar.gz) = XHQprhq0cFfPaue+qytprq4KAbw=
+SHA256 (xmms-1.2.11.tar.gz) = NllznOVlIo3VYl1gwCx30tkyces89SY5Quz+jsPDZD8=
+SIZE (xmms-1.2.11.tar.gz) = 4299286
Index: patches/patch-Input_cdaudio_cdaudio_c
===
RCS file: /cvs/ports/audio/xmms/patches/patch-Input_cdaudio_cdaudio_c,v
retrieving revision 1.3
diff -u -r1.3 patch-Input_cdaudio_cdaudio_c
--- patches/patch-Input_cdaudio_cdaudio_c   15 Apr 2004 19:23:46 -  
1.3
+++ patches/patch-Input_cdaudio_cdaudio_c   24 Nov 2007 09:46:10 -
@@ -1,16 +1,7 @@
 $OpenBSD: patch-Input_cdaudio_cdaudio_c,v 1.3 2004/04/15 19:23:46 naddy Exp $
 Input/cdaudio/cdaudio.c.orig   2004-01-28 00:09:39.0 +0100
-+++ Input/cdaudio/cdaudio.c2004-04-15 14:47:46.0 +0200
-@@ -333,7 +333,7 @@ static gboolean is_mounted(char * device
- #elif defined(HAVE_GETMNTINFO)
-   entries = getmntinfo(fsp, MNT_NOWAIT);
-   if (entries  0)
--  return NULL;
-+  return FALSE;
- 
- 	while (entries--  0)

-   {
-@@ -817,6 +817,10 @@ static int get_current_frame(void)
+--- Input/cdaudio/cdaudio.c.orig   Fri Nov 23 16:18:35 2007
 Input/cdaudio/cdaudio.cFri Nov 23 16:20:02 2007
+@@ -819,6 +819,10 @@ static int get_current_frame(void)
  {
struct ioc_read_subchannel subchnl;
struct cd_sub_channel_info subinfo;
Index: patches/patch-Output_sun_audio_c
===
RCS file: /cvs/ports/audio/xmms/patches/patch-Output_sun_audio_c,v
retrieving revision 1.5
diff -u -r1.5 patch-Output_sun_audio_c
--- patches/patch-Output_sun_audio_c27 Apr 2005 16:31:34 -  1.5
+++ patches/patch-Output_sun_audio_c24 Nov 2007 09:46:10 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Output_sun_audio_c,v 1.5 2005/04/27 16:31:34 robert Exp $
 --- Output/sun/audio.c.origSun Jun  2 15:42:03 2002
-+++ Output/sun/audio.c Wed Apr 27 18:13:18 2005
-@@ -123,14 +123,12 @@
 Output/sun/audio.c Fri Nov 23 18:38:44 2007
+@@ -123,14 +123,12 @@ static void sun_setformat(AFormat fmt, int rate, int n

sun = sun_format(fmt);

@@ -16,8 +16,12 @@
output.frequency = rate;
output.channels = nch;
sun_setparams();
-@@ -153,7 +151,7 @@
-   info.mode = AUMODE_PLAY;
+@@ -150,10 +148,10 @@ void sun_setparams(void)
+ 
+ 	AUDIO_INITINFO(info);
+ 
+-	info.mode = AUMODE_PLAY;

++  info.mode = AUMODE_PLAY_ALL;
if (ioctl(audio.fd, AUDIO_SETINFO, info) != 0)
{
 -  g_error(%s: cannot play (%s), audio.devaudio,
@@ -25,7 +29,7 @@
strerror(errno));
return;
}
-@@ -171,7 +169,7 @@
+@@ -171,7 +169,7 @@ void sun_setparams(void)
strcpy(output.name, enc.name);
if (ioctl(audio.fd, AUDIO_SETINFO, info) != 0)
{
@@ -34,7 +38,7 @@
output.name, strerror(errno));
return;
}
-@@ -182,7 +180,7 @@
+@@ -182,7 +180,7 @@ void sun_setparams(void)
info.play.sample_rate = output.frequency;
if (ioctl(audio.fd, AUDIO_SETINFO, info)  0)
{
@@ -43,7 +47,7 @@
 

Re: [UPDATE] xmms-1.2.11

2007-11-24 Thread Antoine Jacoutot

On Sat, 24 Nov 2007, Christian Weisgerber wrote:

This diff updates XMMS to the latest available version.


Garbled diff.  Looks like Alpine is just as bad as Pine.


Whatever...
New diff attached.

--
AntoineIndex: Makefile
===
RCS file: /cvs/ports/audio/xmms/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- Makefile13 Nov 2007 12:44:23 -  1.53
+++ Makefile24 Nov 2007 09:46:10 -
@@ -8,13 +8,13 @@
 
 SHARED_ONLY=   Yes
 
-VERSION=   1.2.10
+VERSION=   1.2.11
 DISTNAME=  xmms-${VERSION}
-PKGNAME-main=  xmms-${VERSION}p11
-PKGNAME-esd=   xmms-esd-${VERSION}p7
-PKGNAME-vorbis=xmms-vorbis-${VERSION}p7
-PKGNAME-mikmod=xmms-mikmod-${VERSION}p7
-PKGNAME-mp3=   xmms-mp3-${VERSION}p8
+PKGNAME-main=  xmms-${VERSION}
+PKGNAME-esd=   xmms-esd-${VERSION}
+PKGNAME-vorbis=xmms-vorbis-${VERSION}
+PKGNAME-mikmod=xmms-mikmod-${VERSION}
+PKGNAME-mp3=   xmms-mp3-${VERSION}
 SHARED_LIBS=   xmms4.1
 CATEGORIES=audio
 HOMEPAGE=  http://www.xmms.org
Index: distinfo
===
RCS file: /cvs/ports/audio/xmms/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo5 Apr 2007 15:37:45 -   1.5
+++ distinfo24 Nov 2007 09:46:10 -
@@ -1,5 +1,5 @@
-MD5 (xmms-1.2.10.tar.gz) = ha0tsQ+/387M0SqPYXERrQ==
-RMD160 (xmms-1.2.10.tar.gz) = S9wPXGT7mwoXzqO8FHOJDFRwybc=
-SHA1 (xmms-1.2.10.tar.gz) = i/7bIIwSeIVG3VnpHRA6rEboK7A=
-SHA256 (xmms-1.2.10.tar.gz) = ixZR5C55rEBoI0CbTGU/Q73cP0xspdISRaH3IDwCplk=
-SIZE (xmms-1.2.10.tar.gz) = 4034832
+MD5 (xmms-1.2.11.tar.gz) = pdfoJcRgVVS3n4rPmGxMsg==
+RMD160 (xmms-1.2.11.tar.gz) = OsnVEeQHbAymY61tUasRjbLZrK8=
+SHA1 (xmms-1.2.11.tar.gz) = XHQprhq0cFfPaue+qytprq4KAbw=
+SHA256 (xmms-1.2.11.tar.gz) = NllznOVlIo3VYl1gwCx30tkyces89SY5Quz+jsPDZD8=
+SIZE (xmms-1.2.11.tar.gz) = 4299286
Index: patches/patch-Input_cdaudio_cdaudio_c
===
RCS file: /cvs/ports/audio/xmms/patches/patch-Input_cdaudio_cdaudio_c,v
retrieving revision 1.3
diff -u -r1.3 patch-Input_cdaudio_cdaudio_c
--- patches/patch-Input_cdaudio_cdaudio_c   15 Apr 2004 19:23:46 -  
1.3
+++ patches/patch-Input_cdaudio_cdaudio_c   24 Nov 2007 09:46:10 -
@@ -1,16 +1,7 @@
 $OpenBSD: patch-Input_cdaudio_cdaudio_c,v 1.3 2004/04/15 19:23:46 naddy Exp $
 Input/cdaudio/cdaudio.c.orig   2004-01-28 00:09:39.0 +0100
-+++ Input/cdaudio/cdaudio.c2004-04-15 14:47:46.0 +0200
-@@ -333,7 +333,7 @@ static gboolean is_mounted(char * device
- #elif defined(HAVE_GETMNTINFO)
-   entries = getmntinfo(fsp, MNT_NOWAIT);
-   if (entries  0)
--  return NULL;
-+  return FALSE;
-   
-   while (entries--  0)
-   {
-@@ -817,6 +817,10 @@ static int get_current_frame(void)
+--- Input/cdaudio/cdaudio.c.orig   Fri Nov 23 16:18:35 2007
 Input/cdaudio/cdaudio.cFri Nov 23 16:20:02 2007
+@@ -819,6 +819,10 @@ static int get_current_frame(void)
  {
struct ioc_read_subchannel subchnl;
struct cd_sub_channel_info subinfo;
Index: patches/patch-Output_sun_audio_c
===
RCS file: /cvs/ports/audio/xmms/patches/patch-Output_sun_audio_c,v
retrieving revision 1.5
diff -u -r1.5 patch-Output_sun_audio_c
--- patches/patch-Output_sun_audio_c27 Apr 2005 16:31:34 -  1.5
+++ patches/patch-Output_sun_audio_c24 Nov 2007 09:46:10 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Output_sun_audio_c,v 1.5 2005/04/27 16:31:34 robert Exp $
 --- Output/sun/audio.c.origSun Jun  2 15:42:03 2002
-+++ Output/sun/audio.c Wed Apr 27 18:13:18 2005
-@@ -123,14 +123,12 @@
 Output/sun/audio.c Fri Nov 23 18:38:44 2007
+@@ -123,14 +123,12 @@ static void sun_setformat(AFormat fmt, int rate, int n

sun = sun_format(fmt);
  
@@ -16,8 +16,12 @@
output.frequency = rate;
output.channels = nch;
sun_setparams();
-@@ -153,7 +151,7 @@
-   info.mode = AUMODE_PLAY;
+@@ -150,10 +148,10 @@ void sun_setparams(void)
+ 
+   AUDIO_INITINFO(info);
+ 
+-  info.mode = AUMODE_PLAY;
++  info.mode = AUMODE_PLAY_ALL;
if (ioctl(audio.fd, AUDIO_SETINFO, info) != 0)
{
 -  g_error(%s: cannot play (%s), audio.devaudio,
@@ -25,7 +29,7 @@
strerror(errno));
return;
}
-@@ -171,7 +169,7 @@
+@@ -171,7 +169,7 @@ void sun_setparams(void)
strcpy(output.name, enc.name);
if (ioctl(audio.fd, AUDIO_SETINFO, info) != 0)
{
@@ -34,7 +38,7 @@
output.name, strerror(errno));
return;
}
-@@ -182,7 +180,7 @@
+@@ -182,7 +180,7 @@ void sun_setparams(void)