From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Sep 24 16:10:23 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF74316A4B3 for ; Wed, 24 Sep 2003 16:10:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 36FB24401A for ; Wed, 24 Sep 2003 16:10:22 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h8ONAMFY078165 for ; Wed, 24 Sep 2003 16:10:22 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h8ONAMtN078164; Wed, 24 Sep 2003 16:10:22 -0700 (PDT) (envelope-from gnats) Resent-Date: Wed, 24 Sep 2003 16:10:22 -0700 (PDT) Resent-Message-Id: <200309242310.h8ONAMtN078164@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Vladimir Kushnir Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C050E16A4B3 for ; Wed, 24 Sep 2003 16:06:41 -0700 (PDT) Received: from Stalker.alfacom.net (Stalker.Alfacom.net [193.108.124.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id F2E204401A for ; Wed, 24 Sep 2003 16:06:38 -0700 (PDT) (envelope-from vkushnir@Alfacom.net) Received: from kushnir1.kiev.ua (124-212.dialup.Alfacom.net [193.108.124.212]) by Stalker.alfacom.net (8.12.8/8.12.8) with ESMTP id h8ON6T9I017450 for ; Thu, 25 Sep 2003 02:06:32 +0300 (EEST) Received: from kushnir1.kiev.ua (localhost [127.0.0.1]) by kushnir1.kiev.ua (8.12.10/8.12.9) with ESMTP id h8ON6S9R052557 for ; Thu, 25 Sep 2003 02:06:28 +0300 (EEST) (envelope-from vkushnir@kushnir1.kiev.ua) Received: (from vkushnir@localhost) by kushnir1.kiev.ua (8.12.10/8.12.9/Submit) id h8ON6SSO052556; Thu, 25 Sep 2003 02:06:28 +0300 (EEST) (envelope-from vkushnir) Message-Id: <200309242306.h8ON6SSO052556@kushnir1.kiev.ua> Date: Thu, 25 Sep 2003 02:06:28 +0300 (EEST) From: Vladimir Kushnir To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/57198: multimedia/xmms fix to work with CDDA under -CURRENT X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Vladimir Kushnir List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Sep 2003 23:10:24 -0000 >Number: 57198 >Category: ports >Synopsis: multimedia/xmms fix to work with CDDA under -CURRENT >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Sep 24 16:10:21 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Vladimir Kushnir >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD kushnir1.kiev.ua 5.1-CURRENT FreeBSD 5.1-CURRENT #11: Tue Sep 23 12:56:27 EEST 2003 root@kushnir1.kiev.ua:/usr/obj/usr/src/sys/KUSHNIR i386 >Description: Under FreeBSD-CURRENT, several ports including multimedua/xmms would not work with CDDA because of CDIOCREADAUDIO ioctl removal from ATA/ATAPI driver. >How-To-Repeat: Try to listen CD with XMMS choosing "Digital audio extraction" option in CD Audio Player plugin configuration. No sound. >Fix: --- patch-Input::cdaudio::cdaudio.c begins here --- *** Input/cdaudio/cdaudio.c.orig Mon Jul 14 01:20:30 2003 --- Input/cdaudio/cdaudio.c Thu Sep 25 01:55:47 2003 *************** *** 19,24 **** --- 19,25 ---- */ #include "cdaudio.h" + #include #include #include #include "xmms/i18n.h" *************** *** 57,63 **** #ifndef CDDA_DEVICE # ifdef HAVE_SYS_CDIO_H # ifdef __FreeBSD__ ! # define CDDA_DEVICE "/dev/acd0c" # elif defined __OpenBSD__ # define CDDA_DEVICE "/dev/cd0c" # else --- 58,64 ---- #ifndef CDDA_DEVICE # ifdef HAVE_SYS_CDIO_H # ifdef __FreeBSD__ ! # define CDDA_DEVICE "/dev/acd0" # elif defined __OpenBSD__ # define CDDA_DEVICE "/dev/cd0c" # else *************** *** 860,885 **** } - #if defined(CDIOCREADAUDIO) #ifdef __FreeBSD__ int read_audio_data(int fd, int pos, int num, void *buf) { ! struct ioc_read_audio cdra; ! cdra.address.lba = pos - CDDA_MSF_OFFSET; ! cdra.address_format = CD_LBA_FORMAT; ! cdra.nframes = num; ! cdra.buffer = buf; ! ! if (ioctl(fd, CDIOCREADAUDIO, &cdra) < 0) ! return -errno; ! ! return cdra.nframes; } - #else - #error Please test on other platforms. #endif - #endif /* CDIOCREADAUDIO */ #ifdef XMMS_CDROM_BSD_NETBSD /* NetBSD, OpenBSD */ --- 861,876 ---- } #ifdef __FreeBSD__ int read_audio_data(int fd, int pos, int num, void *buf) { ! int bsize = 2352; ! if (ioctl(fd, CDRIOCSETBLOCKSIZE, &bsize) == -1) return -errno; ! if (pread(fd, buf, num*bsize, (pos - 150)*bsize) != num*bsize) return 0; ! return num; } #endif #ifdef XMMS_CDROM_BSD_NETBSD /* NetBSD, OpenBSD */ --- patch-Input::cdaudio::cdaudio.c ends here --- >Release-Note: >Audit-Trail: >Unformatted: