head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.46 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.44 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.42 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.40 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.38 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.36 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.34 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.32 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.30 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.28 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.26 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.24 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.22 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.20 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.18 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.16 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.14 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.12 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.10 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.8 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.6 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.4 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.2 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.4.0.4 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.2 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.1.1.1.0.2 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2004.09.21.17.13.36; author jmmv; state dead; branches; next 1.4; 1.4 date 2004.04.17.15.04.31; author jmmv; state Exp; branches; next 1.3; 1.3 date 2004.04.15.13.16.35; author xtraeme; state Exp; branches; next 1.2; 1.2 date 2004.04.02.05.51.03; author jmmv; state Exp; branches; next 1.1; 1.1 date 2004.02.22.16.32.45; author jmmv; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.02.22.16.32.45; author jmmv; state Exp; branches; next ; desc @@ 1.5 log @Update to 2.8.0. This version corresponds to GNOME 2.8.0. Changes since 2.7.1: * GStreamer-based (CDDB-capable) backend to GNOME CD * Added "nb" and "bs" translations * Added ALSA switches (simple boolean on/off) to Volume Control * Made the whole release compile properly using -Wall -Werror Bugs fixed since 2.7.1: * 51152: CD Player does not support CDDA * 123937: Progress bar does not move while recording * 140082: Too many "name-changed" events for Play/Pause button * 142828: Bad preprocessor directive in gnet-private.h * 143287: [Solaris], Need to set the audio port * 143327: No ATK name for Available Themes selection widget * 144341: gnome-cd chrashes/hangs when opening/closing tray * 144536: missing gst-cdparanoia-cdrom.c and gst-cdparanoia-cdrom.h * 148353: gnome-cd crashes when pressing ejecting a cd while it is ... * 151305: missing return value in seek_to() * 151306: Cleanup of issues reported by sparse/gcc This is gnome-media 2.7.1 Changes since 2.6.1: * Swapped About and Help (Jorn Baayen) * Fixed cddb-slave2 documentation link (Kaushal Kumar) * Added "tk" translation * Fixed compiler warnings in CDDBSlave2 * Lots of functionality updates in CDDBSlave2 * Fixed spelling errors in schemas Bugs fixed since 2.6.1: * 117695: Don't flood syslog with failed CDROMVOLREAD ioctls (Thomas) * 130233: Internationalize profile names and descriptions (Thomas) * 134339: Change dir to path in source (Thomas) * 134340: Use ngettext (Thomas) * 134341: Whitespace before punctuation in gnome-media message (Thomas) * 137139: Change terminal to profile (Thomas) * 141985: Check .cddb directory for entries (Thomas) * 114015: Fix window title for gnome-cd on unknown discs (Thomas) * 135139: Add NetBSD support (Julio M. Merino Vidal) * 130651: Change name and comment in .desktop file (Thomas) * 140344: use gnome-common (Christian Neumair) * 141406: use a colorspace convertor from gst-plugins * 137198: install gstreamer-properties correctly (Julio Vidal) * 125409: redraw display text when style changes (Leena Gunda) * 137464: use gtk_icon_theme in recorder (Fernando Herrera) * 141985: also check .cddb entries (Thomas) * 114015: Fix display of unknown entries (Thomas) * 124924: Initialize pointers (Thomas) * 119596: Differentiate between audio and data cd (Balamurali Viswanathan) * 139555: Make CD playback stop when application exits (Richard Kinder) @ text @$NetBSD: patch-ag,v 1.4 2004/04/17 15:04:31 jmmv Exp $ --- gnome-cd/freebsd-cdrom.c.orig Thu Apr 15 15:03:50 2004 +++ gnome-cd/freebsd-cdrom.c Thu Apr 15 15:11:36 2004 @@@@ -166,7 +166,12 @@@@ { FreeBSDCDRom *lcd = FREEBSD_CDROM (cdrom); FreeBSDCDRomPrivate *priv; +#ifdef __FreeBSD__ struct ioc_read_toc_single_entry tocentry; +#else + struct ioc_read_toc_entry tocentries; + struct cd_toc_entry tocentry; +#endif int i, j; GError *error; @@@@ -190,29 +195,56 @@@@ freebsd_cdrom_invalidate (lcd); priv->track_info = g_malloc ((priv->number_tracks + 1) * sizeof (FreeBSDCDRomTrackInfo)); +#ifdef __FreeBSD__ for (i = 0, j = priv->track0; i < priv->number_tracks; i++, j++) { tocentry.track = j; tocentry.address_format = CD_MSF_FORMAT; - +#else + tocentries.data_len = sizeof(tocentry); + tocentries.data = &tocentry; + for (i = 0, j = priv->track0; i < priv->number_tracks; i++, j++) { + tocentries.starting_track = j; + tocentries.address_format = CD_MSF_FORMAT; +#endif +#ifdef __FreeBSD__ if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) { +#else + if (ioctl (cdrom->fd, CDIOREADTOCENTRYS, &tocentries) < 0) { +#endif g_warning ("IOCtl failed"); continue; } priv->track_info[i].track = j; +#ifdef __FreeBSD__ priv->track_info[i].audio_track = tocentry.entry.control == 0 ? 1 : 0; ASSIGN_MSF (priv->track_info[i].address, tocentry.entry.addr.msf); +#else + priv->track_info[i].audio_track = tocentry.control == 0 ? 1 : 0; + ASSIGN_MSF (priv->track_info[i].address, tocentry.addr.msf); +#endif } +#ifdef __FreeBSD__ /* On FreeBSD, the leadout track is the track LAST_TRACK + 1. */ tocentry.track = priv->number_tracks + 1; tocentry.address_format = CD_MSF_FORMAT; if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) { +#else + /* On NetBSD, the leadout track is the track 0xAA. */ + tocentries.starting_track = 0xAA; + tocentries.address_format = CD_MSF_FORMAT; + if (ioctl (cdrom->fd, CDIOREADTOCENTRYS, &tocentries) < 0) { +#endif g_warning ("Error getting leadout"); freebsd_cdrom_invalidate (lcd); return; } +#ifdef __FreeBSD__ ASSIGN_MSF (priv->track_info[priv->number_tracks].address, tocentry.entry.addr.msf); +#else + ASSIGN_MSF (priv->track_info[priv->number_tracks].address, tocentry.addr.msf); +#endif calculate_track_lengths (lcd); freebsd_cdrom_close (lcd); @@@@ -232,11 +264,18 @@@@ return FALSE; } +#ifdef __FreeBSD__ if (gnome_cdrom_get_status (cdrom, &status, error) == FALSE) { freebsd_cdrom_close (lcd); g_free (status); return FALSE; } +#else + status = g_new0 (GnomeCDRomStatus, 1); + status->volume = 0; + status->cd = GNOME_CDROM_STATUS_OK; + ioctl(cdrom->fd, CDIOCALLOW); +#endif if (status->cd != GNOME_CDROM_STATUS_TRAY_OPEN) { if (ioctl (cdrom->fd, CDIOCEJECT, 0) < 0) { @@@@ -862,7 +901,19 @@@@ return FALSE; } #endif +#ifdef __FreeBSD__ /* FIXME: Figure out how to do this on FreeBSD */ +#else + if (ioctl (cdrom->fd, CDIOREADTOCHEADER, priv->tochdr) < 0) { + realstatus->cd = GNOME_CDROM_STATUS_NO_DISC; + realstatus->audio = GNOME_CDROM_AUDIO_NOTHING; + realstatus->track = -1; + + freebsd_cdrom_close (lcd); + return TRUE; + } + subchnl.track = 0; +#endif realstatus->cd = GNOME_CDROM_STATUS_OK; subchnl.address_format = CD_MSF_FORMAT; @ 1.4 log @Fix build in NetBSD. I don't know how the previous change was supposed to fix it under FreeBSD, because it only modified code inside conditionals for NetBSD only. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.3 2004/04/15 13:16:35 xtraeme Exp $ @ 1.3 log @Make this build in FreeBSD. @ text @d1 1 a1 1 $NetBSD$ d37 1 a37 1 + if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentries) < 0) { d71 1 a71 1 + ASSIGN_MSF (priv->track_info[priv->number_tracks].address, tocentries.addr.msf); @ 1.2 log @Update to 2.6.0 (which I forgot to commit yesterday night). Sorry, couldn't find a suitable list of changes... @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.1.1.1 2004/02/22 16:32:45 jmmv Exp $ d3 3 a5 5 http://bugzilla.gnome.org/show_bug.cgi?id=135139 --- gnome-cd/freebsd-cdrom.c.orig 2003-01-11 06:23:03.000000000 -0600 +++ gnome-cd/freebsd-cdrom.c @@@@ -166,7 +166,12 @@@@ freebsd_cdrom_update_cd (GnomeCDRom *cdr d18 1 a18 1 @@@@ -190,29 +195,53 @@@@ freebsd_cdrom_update_cd (GnomeCDRom *cdr d26 1 d34 5 a38 3 - if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) { + if (ioctl (cdrom->fd, CDIOREADTOCENTRYS, &tocentries) < 0) { d71 1 a71 1 + ASSIGN_MSF (priv->track_info[priv->number_tracks].address, tocentry.addr.msf); d76 1 a76 1 @@@@ -232,11 +261,18 @@@@ freebsd_cdrom_eject (GnomeCDRom *cdrom, d95 1 a95 1 @@@@ -862,7 +898,19 @@@@ freebsd_cdrom_get_status (GnomeCDRom *cd @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.1 2003/12/31 02:30:22 xtraeme Exp $ d3 4 a6 11 --- gnome-cd/bsd-cdrom.c.orig 2003-01-11 06:23:03.000000000 -0600 +++ gnome-cd/bsd-cdrom.c @@@@ -20,7 +20,7 @@@@ #endif #include -#include "freebsd-cdrom.h" +#include "bsd-cdrom.h" #define CD_FRAMES 75 @ 1.1.1.1 log @Move gnome2-media from audio to the multimedia category. This is version 2.4.1.1nb4. @ text @@