From 7a778ee4b7ec09a1f5b2185c9cceee3910dfbdf2 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sun, 14 Mar 2004 22:34:33 +0000 Subject: gst-indent Original commit message from CVS: gst-indent --- sys/cdrom/gstcdplayer.c | 105 +++---- sys/cdrom/gstcdplayer.h | 41 +-- sys/cdrom/gstcdplayer_ioctl.c | 71 +++-- sys/cdrom/gstcdplayer_ioctl.h | 47 +-- sys/cdrom/gstcdplayer_ioctl_bsd.h | 556 +++++++++++++++++----------------- sys/cdrom/gstcdplayer_ioctl_irix.h | 91 +++--- sys/cdrom/gstcdplayer_ioctl_solaris.h | 289 +++++++++--------- 7 files changed, 612 insertions(+), 588 deletions(-) (limited to 'sys/cdrom') diff --git a/sys/cdrom/gstcdplayer.c b/sys/cdrom/gstcdplayer.c index 92f75b86..f76e9df6 100644 --- a/sys/cdrom/gstcdplayer.c +++ b/sys/cdrom/gstcdplayer.c @@ -41,30 +41,27 @@ enum LAST_SIGNAL, }; -static void cdplayer_base_init (gpointer g_class); -static void cdplayer_class_init (CDPlayerClass *klass); -static void cdplayer_init (CDPlayer *cdp); -static void cdplayer_dispose (GObject *object); +static void cdplayer_base_init (gpointer g_class); +static void cdplayer_class_init (CDPlayerClass * klass); +static void cdplayer_init (CDPlayer * cdp); +static void cdplayer_dispose (GObject * object); -static void cdplayer_set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *spec); -static void cdplayer_get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *spec); -static gboolean cdplayer_iterate (GstBin *bin); +static void cdplayer_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * spec); +static void cdplayer_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * spec); +static gboolean cdplayer_iterate (GstBin * bin); -static GstElementStateReturn - cdplayer_change_state (GstElement * element); +static GstElementStateReturn cdplayer_change_state (GstElement * element); static GstElementClass *parent_class; static guint cdplayer_signals[LAST_SIGNAL] = { 0 }; -static GstElementDetails cdplayer_details = GST_ELEMENT_DETAILS ( - "CD Player", - "Generic/Bin", - "Play CD audio through the CD Drive", - "Charles Schmidt , " - "Wim Taymans " -); +static GstElementDetails cdplayer_details = GST_ELEMENT_DETAILS ("CD Player", + "Generic/Bin", + "Play CD audio through the CD Drive", + "Charles Schmidt , " + "Wim Taymans "); GType @@ -86,7 +83,8 @@ cdplayer_get_type (void) NULL }; - cdplayer_type = g_type_register_static (GST_TYPE_BIN, "CDPlayer", &cdplayer_info, 0); + cdplayer_type = + g_type_register_static (GST_TYPE_BIN, "CDPlayer", &cdplayer_info, 0); } return cdplayer_type; @@ -121,33 +119,31 @@ cdplayer_class_init (CDPlayerClass * klass) gobject_klass->get_property = cdplayer_get_property; g_object_class_install_property (gobject_klass, ARG_DEVICE, - g_param_spec_string ("device", "device", "CDROM device", NULL, - G_PARAM_READWRITE)); + g_param_spec_string ("device", "device", "CDROM device", NULL, + G_PARAM_READWRITE)); g_object_class_install_property (gobject_klass, ARG_NUM_TRACKS, - g_param_spec_int ("num_tracks", "num_tracks", "Number of Tracks", - G_MININT, G_MAXINT, 0, G_PARAM_READABLE)); + g_param_spec_int ("num_tracks", "num_tracks", "Number of Tracks", + G_MININT, G_MAXINT, 0, G_PARAM_READABLE)); g_object_class_install_property (gobject_klass, ARG_START_TRACK, - g_param_spec_int ("start_track", "start_track", - "Track to start playback on", 1, - CDPLAYER_MAX_TRACKS - 1, 1, - G_PARAM_READWRITE)); + g_param_spec_int ("start_track", "start_track", + "Track to start playback on", 1, + CDPLAYER_MAX_TRACKS - 1, 1, G_PARAM_READWRITE)); g_object_class_install_property (gobject_klass, ARG_END_TRACK, - g_param_spec_int ("end_track", "end_track", - "Track to end playback on", 0, - CDPLAYER_MAX_TRACKS - 1, 0, - G_PARAM_READWRITE)); + g_param_spec_int ("end_track", "end_track", + "Track to end playback on", 0, + CDPLAYER_MAX_TRACKS - 1, 0, G_PARAM_READWRITE)); g_object_class_install_property (gobject_klass, ARG_CURRENT_TRACK, - g_param_spec_int ("current_track", "current_track", - "Current track playing", 1, - CDPLAYER_MAX_TRACKS - 1, 1, G_PARAM_READABLE)); + g_param_spec_int ("current_track", "current_track", + "Current track playing", 1, + CDPLAYER_MAX_TRACKS - 1, 1, G_PARAM_READABLE)); g_object_class_install_property (gobject_klass, ARG_CDDB_DISCID, - g_param_spec_uint ("cddb_discid", "cddb_discid", "CDDB Disc ID", - 0, G_MAXUINT, 1, G_PARAM_READABLE)); + g_param_spec_uint ("cddb_discid", "cddb_discid", "CDDB Disc ID", + 0, G_MAXUINT, 1, G_PARAM_READABLE)); cdplayer_signals[TRACK_CHANGE] = - g_signal_new ("track-change", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (CDPlayerClass, track_change), NULL, NULL, - gst_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); + g_signal_new ("track-change", G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (CDPlayerClass, track_change), NULL, + NULL, gst_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); return; } @@ -169,7 +165,8 @@ cdplayer_init (CDPlayer * cdp) } static void -cdplayer_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * spec) +cdplayer_set_property (GObject * object, guint prop_id, const GValue * value, + GParamSpec * spec) { CDPlayer *cdp; @@ -204,7 +201,8 @@ cdplayer_set_property (GObject * object, guint prop_id, const GValue * value, GP static void -cdplayer_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * spec) +cdplayer_get_property (GObject * object, guint prop_id, GValue * value, + GParamSpec * spec) { CDPlayer *cdp; @@ -268,7 +266,8 @@ cdplayer_iterate (GstBin * bin) if (current_track != -1 && current_track != cdp->current_track) { cdp->current_track = current_track; - g_signal_emit (G_OBJECT (cdp), cdplayer_signals[TRACK_CHANGE], 0, cdp->current_track); + g_signal_emit (G_OBJECT (cdp), cdplayer_signals[TRACK_CHANGE], 0, + cdp->current_track); } return TRUE; @@ -328,7 +327,8 @@ cdplayer_change_state (GstElement * element) cdp->paused = FALSE; } else { - if (cd_start (CDPLAYER_CD (cdp), cdp->start_track, cdp->end_track) == FALSE) { + if (cd_start (CDPLAYER_CD (cdp), cdp->start_track, + cdp->end_track) == FALSE) { return GST_STATE_FAILURE; } } @@ -336,7 +336,8 @@ cdplayer_change_state (GstElement * element) break; case GST_STATE_NULL: /* stop & close fd */ - if (cd_stop (CDPLAYER_CD (cdp)) == FALSE || cd_close (CDPLAYER_CD (cdp)) == FALSE) { + if (cd_stop (CDPLAYER_CD (cdp)) == FALSE + || cd_close (CDPLAYER_CD (cdp)) == FALSE) { return GST_STATE_FAILURE; } @@ -356,17 +357,9 @@ cdplayer_change_state (GstElement * element) static gboolean plugin_init (GstPlugin * plugin) { - return gst_element_register (plugin, "cdplayer", GST_RANK_NONE, GST_TYPE_CDPLAYER); + return gst_element_register (plugin, "cdplayer", GST_RANK_NONE, + GST_TYPE_CDPLAYER); } -GST_PLUGIN_DEFINE ( - GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "cdplayer", - "CD Player", - plugin_init, - VERSION, - GST_LICENSE, /* ? */ - GST_PACKAGE, - GST_ORIGIN -); +GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, "cdplayer", "CD Player", plugin_init, VERSION, GST_LICENSE, /* ? */ + GST_PACKAGE, GST_ORIGIN); diff --git a/sys/cdrom/gstcdplayer.h b/sys/cdrom/gstcdplayer.h index 7c6c4bf9..60d0b606 100644 --- a/sys/cdrom/gstcdplayer.h +++ b/sys/cdrom/gstcdplayer.h @@ -35,30 +35,31 @@ typedef struct _CDPlayer CDPlayer; typedef struct _CDPlayerClass CDPlayerClass; -struct _CDPlayer { - GstBin element; - - /* properties */ - gchar *device; - gint num_tracks; - gint start_track; - gint end_track; - gint current_track; - guint32 cddb_discid; +struct _CDPlayer +{ + GstBin element; - /* private */ - struct cd cd; - gboolean paused; + /* properties */ + gchar *device; + gint num_tracks; + gint start_track; + gint end_track; + gint current_track; + guint32 cddb_discid; + + /* private */ + struct cd cd; + gboolean paused; }; -struct _CDPlayerClass { - GstBinClass parent_class; +struct _CDPlayerClass +{ + GstBinClass parent_class; - /* signal callbacks */ - void (*track_change) (GstElement *element,guint track); + /* signal callbacks */ + void (*track_change) (GstElement * element, guint track); }; -GType cdplayer_get_type(void); - -#endif +GType cdplayer_get_type (void); +#endif diff --git a/sys/cdrom/gstcdplayer_ioctl.c b/sys/cdrom/gstcdplayer_ioctl.c index 22ef22be..8cb3891b 100644 --- a/sys/cdrom/gstcdplayer_ioctl.c +++ b/sys/cdrom/gstcdplayer_ioctl.c @@ -35,8 +35,9 @@ /* private functions */ -static void cd_fix_track_range(struct cd *cd,gint *start_track,gint *end_track); -static gint cddb_sum(gint n); +static void cd_fix_track_range (struct cd *cd, gint * start_track, + gint * end_track); +static gint cddb_sum (gint n); #if defined(HAVE_LINUX_CDROM_H) #include @@ -58,7 +59,7 @@ irix cdaudio works quite a bit differently than ioctl(), so its not ready CDStatus cd_status(struct cd *cd); gint cd_current_track(struct cd *cd); gboolean cd_close(struct cd *cd); -*/ +*/ #if defined(HAVE_CDROM_SOLARIS) #include "gstcdplayer_ioctl_solaris.h" #elif defined(HAVE_CDROM_BSD) @@ -69,25 +70,26 @@ irix cdaudio works quite a bit differently than ioctl(), so its not ready */ #endif -static void cd_fix_track_range(struct cd *cd,gint *start_track,gint *end_track) +static void +cd_fix_track_range (struct cd *cd, gint * start_track, gint * end_track) { - if (*start_track <= 0) { - *start_track = 1; - } + if (*start_track <= 0) { + *start_track = 1; + } - if (*start_track > cd->num_tracks) { - *start_track = cd->num_tracks; - } + if (*start_track > cd->num_tracks) { + *start_track = cd->num_tracks; + } - if (*end_track < *start_track && *end_track != LEADOUT) { - *end_track = *start_track; - } + if (*end_track < *start_track && *end_track != LEADOUT) { + *end_track = *start_track; + } - if (*end_track > cd->num_tracks || *end_track + 1 > cd->num_tracks) { - *end_track = LEADOUT; - } + if (*end_track > cd->num_tracks || *end_track + 1 > cd->num_tracks) { + *end_track = LEADOUT; + } - return; + return; } /* this cddb info is from @@ -96,29 +98,32 @@ static void cd_fix_track_range(struct cd *cd,gint *start_track,gint *end_track) this will probably be of interest to anyone wishing to actually use the discid http://www.freedb.org/modules.php?name=Sections&sop=viewarticle&artid=28 */ -static gint cddb_sum(gint n) +static gint +cddb_sum (gint n) { - gint ret = 0; + gint ret = 0; - while (n > 0) { - ret += n % 10; - n /= 10; - } + while (n > 0) { + ret += n % 10; + n /= 10; + } - return ret; + return ret; } -guint32 cd_cddb_discid(struct cd *cd) +guint32 +cd_cddb_discid (struct cd * cd) { - guint i; - guint n = 0; - guint t; + guint i; + guint n = 0; + guint t; - for (i = 1; i <= cd->num_tracks; i++) { - n += cddb_sum(cd->tracks[i].minute * 60 + cd->tracks[i].second); - } + for (i = 1; i <= cd->num_tracks; i++) { + n += cddb_sum (cd->tracks[i].minute * 60 + cd->tracks[i].second); + } - t = (cd->tracks[LEADOUT].minute * 60 + cd->tracks[LEADOUT].second) - (cd->tracks[1].minute * 60 + cd->tracks[1].second); + t = (cd->tracks[LEADOUT].minute * 60 + cd->tracks[LEADOUT].second) - + (cd->tracks[1].minute * 60 + cd->tracks[1].second); - return ((n % 0xff) << 24 | t << 8 | (cd->num_tracks)); + return ((n % 0xff) << 24 | t << 8 | (cd->num_tracks)); } diff --git a/sys/cdrom/gstcdplayer_ioctl.h b/sys/cdrom/gstcdplayer_ioctl.h index 65bc2c66..5998276e 100644 --- a/sys/cdrom/gstcdplayer_ioctl.h +++ b/sys/cdrom/gstcdplayer_ioctl.h @@ -28,37 +28,40 @@ #define CDPLAYER_MAX_TRACKS 128 -typedef enum { - CD_PLAYING, - CD_COMPLETED, - CD_ERROR +typedef enum +{ + CD_PLAYING, + CD_COMPLETED, + CD_ERROR } CDStatus; -struct cd_msf { - guint8 minute; - guint8 second; - guint8 frame; +struct cd_msf +{ + guint8 minute; + guint8 second; + guint8 frame; - gboolean data_track; + gboolean data_track; }; -struct cd { - gint fd; - gint num_tracks; - struct cd_msf tracks[CDPLAYER_MAX_TRACKS]; +struct cd +{ + gint fd; + gint num_tracks; + struct cd_msf tracks[CDPLAYER_MAX_TRACKS]; }; /* these are defined by the different cdrom type header files */ -gboolean cd_init(struct cd *cd,const gchar *device); -gboolean cd_start(struct cd *cd,gint start_track,gint end_track); -gboolean cd_pause(struct cd *cd); -gboolean cd_resume(struct cd *cd); -gboolean cd_stop(struct cd *cd); -CDStatus cd_status(struct cd *cd); -gint cd_current_track(struct cd *cd); -gboolean cd_close(struct cd *cd); +gboolean cd_init (struct cd *cd, const gchar * device); +gboolean cd_start (struct cd *cd, gint start_track, gint end_track); +gboolean cd_pause (struct cd *cd); +gboolean cd_resume (struct cd *cd); +gboolean cd_stop (struct cd *cd); +CDStatus cd_status (struct cd *cd); +gint cd_current_track (struct cd *cd); +gboolean cd_close (struct cd *cd); -guint32 cd_cddb_discid(struct cd *cd); +guint32 cd_cddb_discid (struct cd *cd); #endif diff --git a/sys/cdrom/gstcdplayer_ioctl_bsd.h b/sys/cdrom/gstcdplayer_ioctl_bsd.h index f8a94cd7..34c2d9aa 100644 --- a/sys/cdrom/gstcdplayer_ioctl_bsd.h +++ b/sys/cdrom/gstcdplayer_ioctl_bsd.h @@ -17,329 +17,337 @@ * Boston, MA 02111-1307, USA. */ -#ifdef HAVE_CDROM_BSD_NETBSD /* net & open */ +#ifdef HAVE_CDROM_BSD_NETBSD /* net & open */ #ifndef CDIOREADTOCHDR #define CDIOREADTOCHDR CDIOREADTOCHEADER #endif -gboolean cd_init(struct cd *cd,const gchar *device) +gboolean +cd_init (struct cd *cd, const gchar * device) { - struct ioc_toc_header toc_header; - struct ioc_read_toc_entry toc_entry; - struct cd_toc_entry toc_entry_data; - guint i; - - cd->fd = open(device,O_RDONLY | O_NONBLOCK); - - if (cd->fd == -1) { - return FALSE; - } - - /* get the toc header information */ - if (ioctl(cd->fd,CDIOREADTOCHDR,&toc_header) != 0) { - close(cd->fd); - cd->fd = -1; - return FALSE; - } - - /* read each entry in the toc header */ - for (i = 1; i <= toc_header.ending_track; i++) { - toc_entry.address_format = CD_MSF_FORMAT; - toc_entry.starting_track = i; - toc_entry.data = &toc_entry_data; - toc_entry.data_len = sizeof(toc_entry_data); - - if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) { - close(cd->fd); - cd->fd = -1; - return FALSE; - } - - cd->tracks[i].minute = toc_entry.data->addr.msf.minute; - cd->tracks[i].second = toc_entry.data->addr.msf.second; - cd->tracks[i].frame = toc_entry.data->addr.msf.frame; - cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4; - } - - /* read the leadout */ - toc_entry.address_format = CD_MSF_FORMAT; - toc_entry.starting_track = 0xAA; /* leadout */ - toc_entry.data = &toc_entry_data; - toc_entry.data_len = sizeof(toc_entry_data); - - if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) { - close(cd->fd); - cd->fd = -1; - return FALSE; - } - - cd->tracks[LEADOUT].minute = toc_entry.data->addr.msf.minute; - cd->tracks[LEADOUT].second = toc_entry.data->addr.msf.second; - cd->tracks[LEADOUT].frame = toc_entry.data->addr.msf.frame; - - cd->num_tracks = toc_header.ending_track; - - return TRUE; + struct ioc_toc_header toc_header; + struct ioc_read_toc_entry toc_entry; + struct cd_toc_entry toc_entry_data; + guint i; + + cd->fd = open (device, O_RDONLY | O_NONBLOCK); + + if (cd->fd == -1) { + return FALSE; + } + + /* get the toc header information */ + if (ioctl (cd->fd, CDIOREADTOCHDR, &toc_header) != 0) { + close (cd->fd); + cd->fd = -1; + return FALSE; + } + + /* read each entry in the toc header */ + for (i = 1; i <= toc_header.ending_track; i++) { + toc_entry.address_format = CD_MSF_FORMAT; + toc_entry.starting_track = i; + toc_entry.data = &toc_entry_data; + toc_entry.data_len = sizeof (toc_entry_data); + + if (ioctl (cd->fd, CDIOREADTOCENTRYS, &toc_entry) != 0) { + close (cd->fd); + cd->fd = -1; + return FALSE; + } + + cd->tracks[i].minute = toc_entry.data->addr.msf.minute; + cd->tracks[i].second = toc_entry.data->addr.msf.second; + cd->tracks[i].frame = toc_entry.data->addr.msf.frame; + cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4; + } + + /* read the leadout */ + toc_entry.address_format = CD_MSF_FORMAT; + toc_entry.starting_track = 0xAA; /* leadout */ + toc_entry.data = &toc_entry_data; + toc_entry.data_len = sizeof (toc_entry_data); + + if (ioctl (cd->fd, CDIOREADTOCENTRYS, &toc_entry) != 0) { + close (cd->fd); + cd->fd = -1; + return FALSE; + } + + cd->tracks[LEADOUT].minute = toc_entry.data->addr.msf.minute; + cd->tracks[LEADOUT].second = toc_entry.data->addr.msf.second; + cd->tracks[LEADOUT].frame = toc_entry.data->addr.msf.frame; + + cd->num_tracks = toc_header.ending_track; + + return TRUE; } #elif defined HAVE_CDROM_BSD_DARWIN -gboolean cd_init(struct cd *cd,const gchar *device) +gboolean +cd_init (struct cd *cd, const gchar * device) { - struct ioc_toc_header toc_header; - struct ioc_read_toc_entry toc_entry; - guint i; - - cd->fd = open(device,O_RDONLY | O_NONBLOCK); - - if (cd->fd == -1) { - return FALSE; - } - - /* get the toc header information */ - if (ioctl(cd->fd,CDIOREADTOCHDR,&toc_header) != 0) { - close(cd->fd); - cd->fd = -1; - return FALSE; - } - - /* read each entry in the toc header */ - for (i = 1; i <= toc_header.ending_track; i++) { - toc_entry.address_format = CD_MSF_FORMAT; - toc_entry.starting_track = i; - - if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) { - close(cd->fd); - cd->fd = -1; - return FALSE; - } - - cd->tracks[i].minute = toc_entry.data->addr[1]; - cd->tracks[i].second = toc_entry.data->addr[2]; - cd->tracks[i].frame = toc_entry.data->addr[3]; - cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4; - } - - /* read the leadout */ - toc_entry.address_format = CD_MSF_FORMAT; - toc_entry.starting_track = 0xAA; /* leadout */ - toc_entry.data = &toc_entry_data; - toc_entry.data_len = sizeof(toc_entry_data); - - if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) { - close(cd->fd); - cd->fd = -1; - return FALSE; - } - - cd->tracks[LEADOUT].minute = toc_entry.data->addr[1]; - cd->tracks[LEADOUT].second = toc_entry.data->addr[2]; - cd->tracks[LEADOUT].frame = toc_entry.data->addr[3]; - - cd->num_tracks = toc_header.ending_track; - - return TRUE; + struct ioc_toc_header toc_header; + struct ioc_read_toc_entry toc_entry; + guint i; + + cd->fd = open (device, O_RDONLY | O_NONBLOCK); + + if (cd->fd == -1) { + return FALSE; + } + + /* get the toc header information */ + if (ioctl (cd->fd, CDIOREADTOCHDR, &toc_header) != 0) { + close (cd->fd); + cd->fd = -1; + return FALSE; + } + + /* read each entry in the toc header */ + for (i = 1; i <= toc_header.ending_track; i++) { + toc_entry.address_format = CD_MSF_FORMAT; + toc_entry.starting_track = i; + + if (ioctl (cd->fd, CDIOREADTOCENTRYS, &toc_entry) != 0) { + close (cd->fd); + cd->fd = -1; + return FALSE; + } + + cd->tracks[i].minute = toc_entry.data->addr[1]; + cd->tracks[i].second = toc_entry.data->addr[2]; + cd->tracks[i].frame = toc_entry.data->addr[3]; + cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4; + } + + /* read the leadout */ + toc_entry.address_format = CD_MSF_FORMAT; + toc_entry.starting_track = 0xAA; /* leadout */ + toc_entry.data = &toc_entry_data; + toc_entry.data_len = sizeof (toc_entry_data); + + if (ioctl (cd->fd, CDIOREADTOCENTRYS, &toc_entry) != 0) { + close (cd->fd); + cd->fd = -1; + return FALSE; + } + + cd->tracks[LEADOUT].minute = toc_entry.data->addr[1]; + cd->tracks[LEADOUT].second = toc_entry.data->addr[2]; + cd->tracks[LEADOUT].frame = toc_entry.data->addr[3]; + + cd->num_tracks = toc_header.ending_track; + + return TRUE; } #else /* free */ -gboolean cd_init(struct cd *cd,const gchar *device) +gboolean +cd_init (struct cd *cd, const gchar * device) { - struct ioc_toc_header toc_header; - struct ioc_read_toc_entry toc_entry; - guint i; - - cd->fd = open(device,O_RDONLY | O_NONBLOCK); - - if (cd->fd == -1) { - return FALSE; - } - - /* get the toc header information */ - if (ioctl(cd->fd,CDIOREADTOCHDR,&toc_header) != 0) { - close(cd->fd); - cd->fd = -1; - return FALSE; - } - - /* read each entry in the toc header */ - for (i = 1; i <= toc_header.ending_track; i++) { - toc_entry.address_format = CD_MSF_FORMAT; - toc_entry.starting_track = i; - - if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) { - close(cd->fd); - cd->fd = -1; - return FALSE; - } - - cd->tracks[i].minute = toc_entry.entry.addr.msf.minute; - cd->tracks[i].second = toc_entry.entry.addr.msf.second; - cd->tracks[i].frame = toc_entry.entry.addr.msf.frame; - cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4; - } - - /* read the leadout */ - toc_entry.address_format = CD_MSF_FORMAT; - toc_entry.starting_track = 0xAA; /* leadout */ - toc_entry.data = &toc_entry_data; - toc_entry.data_len = sizeof(toc_entry_data); - - if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) { - close(cd->fd); - cd->fd = -1; - return FALSE; - } - - cd->tracks[LEADOUT].minute = toc_entry.entry.addr.msf.minute; - cd->tracks[LEADOUT].second = toc_entry.entry.addr.msf.second; - cd->tracks[LEADOUT].frame = toc_entry.entry.addr.msf.frame; - - cd->num_tracks = toc_header.ending_track; - - return TRUE; + struct ioc_toc_header toc_header; + struct ioc_read_toc_entry toc_entry; + guint i; + + cd->fd = open (device, O_RDONLY | O_NONBLOCK); + + if (cd->fd == -1) { + return FALSE; + } + + /* get the toc header information */ + if (ioctl (cd->fd, CDIOREADTOCHDR, &toc_header) != 0) { + close (cd->fd); + cd->fd = -1; + return FALSE; + } + + /* read each entry in the toc header */ + for (i = 1; i <= toc_header.ending_track; i++) { + toc_entry.address_format = CD_MSF_FORMAT; + toc_entry.starting_track = i; + + if (ioctl (cd->fd, CDIOREADTOCENTRYS, &toc_entry) != 0) { + close (cd->fd); + cd->fd = -1; + return FALSE; + } + + cd->tracks[i].minute = toc_entry.entry.addr.msf.minute; + cd->tracks[i].second = toc_entry.entry.addr.msf.second; + cd->tracks[i].frame = toc_entry.entry.addr.msf.frame; + cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4; + } + + /* read the leadout */ + toc_entry.address_format = CD_MSF_FORMAT; + toc_entry.starting_track = 0xAA; /* leadout */ + toc_entry.data = &toc_entry_data; + toc_entry.data_len = sizeof (toc_entry_data); + + if (ioctl (cd->fd, CDIOREADTOCENTRYS, &toc_entry) != 0) { + close (cd->fd); + cd->fd = -1; + return FALSE; + } + + cd->tracks[LEADOUT].minute = toc_entry.entry.addr.msf.minute; + cd->tracks[LEADOUT].second = toc_entry.entry.addr.msf.second; + cd->tracks[LEADOUT].frame = toc_entry.entry.addr.msf.frame; + + cd->num_tracks = toc_header.ending_track; + + return TRUE; } #endif -gboolean cd_start(struct cd *cd,gint start_track,gint end_track) +gboolean +cd_start (struct cd * cd, gint start_track, gint end_track) { - struct ioc_play_msf msf; + struct ioc_play_msf msf; - if (cd->fd == -1) { - return FALSE; - } + if (cd->fd == -1) { + return FALSE; + } - cd_fix_track_range(cd,&start_track,&end_track); + cd_fix_track_range (cd, &start_track, &end_track); - msf.start_m = cd->tracks[start_track].minute; - msf.start_s = cd->tracks[start_track].second; - msf.start_f = cd->tracks[start_track].frame; + msf.start_m = cd->tracks[start_track].minute; + msf.start_s = cd->tracks[start_track].second; + msf.start_f = cd->tracks[start_track].frame; - if (end_track == LEADOUT) { - msf.end_m = cd->tracks[end_track].minute; - msf.end_s = cd->tracks[end_track].second; - msf.end_f = cd->tracks[end_track].frame; - } else { - msf.end_m = cd->tracks[end_track+1].minute; - msf.end_s = cd->tracks[end_track+1].second; - msf.end_f = cd->tracks[end_track+1].frame; - } + if (end_track == LEADOUT) { + msf.end_m = cd->tracks[end_track].minute; + msf.end_s = cd->tracks[end_track].second; + msf.end_f = cd->tracks[end_track].frame; + } else { + msf.end_m = cd->tracks[end_track + 1].minute; + msf.end_s = cd->tracks[end_track + 1].second; + msf.end_f = cd->tracks[end_track + 1].frame; + } - if (ioctl(cd->fd,CDIOCPLAYMSF,&msf) != 0) { - return FALSE; - } + if (ioctl (cd->fd, CDIOCPLAYMSF, &msf) != 0) { + return FALSE; + } } -gboolean cd_pause(struct cd *cd) +gboolean +cd_pause (struct cd * cd) { - if (cd->fd == -1) { - return FALSE; - } + if (cd->fd == -1) { + return FALSE; + } - if (ioctl(cd->fd,CDIOCPAUSE,NULL) != 0) { - return FALSE; - } + if (ioctl (cd->fd, CDIOCPAUSE, NULL) != 0) { + return FALSE; + } - return TRUE; + return TRUE; } -gboolean cd_resume(struct cd *cd) +gboolean +cd_resume (struct cd * cd) { - if (cd->fd == -1) { - return FALSE; - } + if (cd->fd == -1) { + return FALSE; + } - if (ioctl(cd->fd,CDIOCRESUME,NULL) != 0) { - return FALSE; - } + if (ioctl (cd->fd, CDIOCRESUME, NULL) != 0) { + return FALSE; + } - return TRUE; + return TRUE; } -gboolean cd_stop(struct cd *cd) +gboolean +cd_stop (struct cd * cd) { - if (cd->fd == -1) { - return FALSE; - } + if (cd->fd == -1) { + return FALSE; + } - if (ioctl(cd->fd,CDIOCSTOP,NULL) != 0) { - return FALSE; - } + if (ioctl (cd->fd, CDIOCSTOP, NULL) != 0) { + return FALSE; + } - return TRUE; + return TRUE; } /* -1 for error, 0 for not playing, 1 for playing */ -CDStatus cd_status(struct cd *cd) +CDStatus +cd_status (struct cd * cd) { - struct ioc_read_subchannel sub_channel; - struct cd_sub_channel_info sub_channel_info; - - if (cd->fd == -1) { - return -1; - } - - sub_channel.address_format = CD_MSF_FORMAT; - sub_channel.data_format = CD_CURRENT_POSITION; - sub_channel.track = 0; - sub_channel.data = &sub_channel_info; - sub_channel.data_len = sizeof(sub_channel_info); - - if (ioctl(cd->fd,CDIOCREADSUBCHANNEL,&sub_channel) != 0) { - return FALSE; - } - - switch (sub_channel.data->header.audio_status) { - case CD_AS_PLAY_IN_PROGRESS: - case CD_AS_PLAY_PAUSED: - return CD_PLAYING; - break; - case CD_AS_PLAY_COMPLETED: - return CD_COMPLETED; - break; - case CD_AS_AUDIO_INVALID: - case CD_AS_PLAY_ERROR: - default: - return CD_ERROR; - break; - - } + struct ioc_read_subchannel sub_channel; + struct cd_sub_channel_info sub_channel_info; + + if (cd->fd == -1) { + return -1; + } + + sub_channel.address_format = CD_MSF_FORMAT; + sub_channel.data_format = CD_CURRENT_POSITION; + sub_channel.track = 0; + sub_channel.data = &sub_channel_info; + sub_channel.data_len = sizeof (sub_channel_info); + + if (ioctl (cd->fd, CDIOCREADSUBCHANNEL, &sub_channel) != 0) { + return FALSE; + } + + switch (sub_channel.data->header.audio_status) { + case CD_AS_PLAY_IN_PROGRESS: + case CD_AS_PLAY_PAUSED: + return CD_PLAYING; + break; + case CD_AS_PLAY_COMPLETED: + return CD_COMPLETED; + break; + case CD_AS_AUDIO_INVALID: + case CD_AS_PLAY_ERROR: + default: + return CD_ERROR; + break; + + } } -gint cd_current_track(struct cd *cd) +gint +cd_current_track (struct cd *cd) { - struct ioc_read_subchannel sub_channel; - struct cd_sub_channel_info sub_channel_info; - - if (cd->fd == -1) { - return -1; - } - - sub_channel.address_format = CD_MSF_FORMAT; - sub_channel.data_format = CD_TRACK_INFO; - sub_channel.track = 0; - sub_channel.data = &sub_channel_info; - sub_channel.data_len = sizeof(sub_channel_info); - - if (ioctl(cd->fd,CDIOCREADSUBCHANNEL,&sub_channel) != 0) { - return -1; - } - + struct ioc_read_subchannel sub_channel; + struct cd_sub_channel_info sub_channel_info; + + if (cd->fd == -1) { + return -1; + } + + sub_channel.address_format = CD_MSF_FORMAT; + sub_channel.data_format = CD_TRACK_INFO; + sub_channel.track = 0; + sub_channel.data = &sub_channel_info; + sub_channel.data_len = sizeof (sub_channel_info); + + if (ioctl (cd->fd, CDIOCREADSUBCHANNEL, &sub_channel) != 0) { + return -1; + } #ifdef __NetBSD__ - return sub_channel.data->what.track_info.track_number; + return sub_channel.data->what.track_info.track_number; #else - return sub_channel.data->track_number; + return sub_channel.data->track_number; #endif } -gboolean cd_close(struct cd *cd) +gboolean +cd_close (struct cd * cd) { - if (cd->fd == -1) { - return TRUE; - } + if (cd->fd == -1) { + return TRUE; + } - if (close(cd->fd) != 0) { - return FALSE; - } + if (close (cd->fd) != 0) { + return FALSE; + } - cd->fd = -1; + cd->fd = -1; - return TRUE; + return TRUE; } - diff --git a/sys/cdrom/gstcdplayer_ioctl_irix.h b/sys/cdrom/gstcdplayer_ioctl_irix.h index 2f6be35c..fb18c489 100644 --- a/sys/cdrom/gstcdplayer_ioctl_irix.h +++ b/sys/cdrom/gstcdplayer_ioctl_irix.h @@ -22,88 +22,95 @@ #define CDPLAYER(x) ((CDPlayer *)x) #define FD(x) ((int)x) -gboolean cd_init(struct cd *cd,const gchar *device) +gboolean +cd_init (struct cd *cd, const gchar * device) { - CDPLAYER *cdplayer; - CDSTATUS status; - CDTRACKINFO info; - guint i; + CDPLAYER *cdplayer; + CDSTATUS status; + CDTRACKINFO info; + guint i; - cdplayer = CDOpen(device,"r"); + cdplayer = CDOpen (device, "r"); - if (cdplayer == NULL) { - return FALSE; - } + if (cdplayer == NULL) { + return FALSE; + } - cd->fd = FD(cdplayer); + cd->fd = FD (cdplayer); - if (CDgetstatus(cdplayer,&status) == 0) { - CDclose(cdplayer); - cd->fd = 0; - return FALSE; - } + if (CDgetstatus (cdplayer, &status) == 0) { + CDclose (cdplayer); + cd->fd = 0; + return FALSE; + } - for (i = 1; i < status.last; i++) { - if (CDgettrackinfo(cdplayer,i,&info) == 0) { - CDclose(cdplayer); - cd->fd = 0; - return FALSE; - } + for (i = 1; i < status.last; i++) { + if (CDgettrackinfo (cdplayer, i, &info) == 0) { + CDclose (cdplayer); + cd->fd = 0; + return FALSE; + } - cd->tracks[i].minute = info.start_min; - cd->tracks[i].second = info.start_sec; - cd->tracks[i].frame = info.start_frame; + cd->tracks[i].minute = info.start_min; + cd->tracks[i].second = info.start_sec; + cd->tracks[i].frame = info.start_frame; - } + } - /* there is no leadout information */ - + /* there is no leadout information */ - cd->num_tracks = status.last; - return TRUE; + cd->num_tracks = status.last; + + return TRUE; } -gboolean cd_start(struct cd *cd,gint start_track,gint end_track) +gboolean +cd_start (struct cd * cd, gint start_track, gint end_track) { - if (cd->fd == 0) { - return FALSE; - } + if (cd->fd == 0) { + return FALSE; + } + + cd_fix_track_range (cd, &start_track, &end_track); - cd_fix_track_range(cd,&start_track,&end_track); - } -gboolean cd_pause(struct cd *cd) +gboolean +cd_pause (struct cd * cd) { } -gboolean cd_resume(struct cd *cd) +gboolean +cd_resume (struct cd *cd) { } -gboolean cd_stop(struct cd *cd) +gboolean +cd_stop (struct cd *cd) { } /* -1 for error, 0 for not playing, 1 for playing */ -CDStatus cd_status(struct cd *cd) +CDStatus +cd_status (struct cd *cd) { } -gint cd_current_track(struct cd *cd) +gint +cd_current_track (struct cd *cd) { } -gboolean cd_close(struct cd *cd) +gboolean +cd_close (struct cd *cd) { } - diff --git a/sys/cdrom/gstcdplayer_ioctl_solaris.h b/sys/cdrom/gstcdplayer_ioctl_solaris.h index 868fb251..dd91e127 100644 --- a/sys/cdrom/gstcdplayer_ioctl_solaris.h +++ b/sys/cdrom/gstcdplayer_ioctl_solaris.h @@ -17,188 +17,195 @@ * Boston, MA 02111-1307, USA. */ -gboolean cd_init(struct cd *cd,const gchar *device) +gboolean +cd_init (struct cd *cd, const gchar * device) { - struct cdrom_tochdr toc_header; - struct cdrom_tocentry toc_entry; - guint i; - - cd->fd = open(device,O_RDONLY | O_NONBLOCK); - - if (cd->fd == -1) { - return FALSE; - } - - /* get the toc header information */ - if (ioctl(cd->fd,CDROMREADTOCHDR,&toc_header) != 0) { - close(cd->fd); - cd->fd = -1; - return FALSE; - } - - /* read each entry in the toc header */ - for (i = 1; i <= toc_header.cdth_trk1; i++) { - toc_entry.cdte_format = CDROM_MSF; - toc_entry.cdte_track = i; - - if (ioctl(cd->fd,CDROMREADTOCENTRY,&toc_entry) != 0) { - close(cd->fd); - cd->fd = -1; - return FALSE; - } - - cd->tracks[i].minute = toc_entry.cdte_addr.msf.minute; - cd->tracks[i].second = toc_entry.cdte_addr.msf.second; - cd->tracks[i].frame = toc_entry.cdte_addr.msf.frame; - cd->tracks[i].data_track = (toc_entry.cdte_ctrl == CDROM_DATA_TRACK); - } - - /* read the leadout */ - toc_entry.cdte_track = CDROM_LEADOUT; - toc_entry.cdte_format = CDROM_MSF; - if (ioctl(cd->fd,CDROMREADTOCENTRY,&toc_entry) != 0) { - close(cd->fd); - cd->fd = -1; - return FALSE; - } - cd->tracks[LEADOUT].minute = toc_entry.cdte_addr.msf.minute; - cd->tracks[LEADOUT].second = toc_entry.cdte_addr.msf.second; - cd->tracks[LEADOUT].frame = toc_entry.cdte_addr.msf.frame; - - cd->num_tracks = toc_header.cdth_trk1; - - return TRUE; + struct cdrom_tochdr toc_header; + struct cdrom_tocentry toc_entry; + guint i; + + cd->fd = open (device, O_RDONLY | O_NONBLOCK); + + if (cd->fd == -1) { + return FALSE; + } + + /* get the toc header information */ + if (ioctl (cd->fd, CDROMREADTOCHDR, &toc_header) != 0) { + close (cd->fd); + cd->fd = -1; + return FALSE; + } + + /* read each entry in the toc header */ + for (i = 1; i <= toc_header.cdth_trk1; i++) { + toc_entry.cdte_format = CDROM_MSF; + toc_entry.cdte_track = i; + + if (ioctl (cd->fd, CDROMREADTOCENTRY, &toc_entry) != 0) { + close (cd->fd); + cd->fd = -1; + return FALSE; + } + + cd->tracks[i].minute = toc_entry.cdte_addr.msf.minute; + cd->tracks[i].second = toc_entry.cdte_addr.msf.second; + cd->tracks[i].frame = toc_entry.cdte_addr.msf.frame; + cd->tracks[i].data_track = (toc_entry.cdte_ctrl == CDROM_DATA_TRACK); + } + + /* read the leadout */ + toc_entry.cdte_track = CDROM_LEADOUT; + toc_entry.cdte_format = CDROM_MSF; + if (ioctl (cd->fd, CDROMREADTOCENTRY, &toc_entry) != 0) { + close (cd->fd); + cd->fd = -1; + return FALSE; + } + cd->tracks[LEADOUT].minute = toc_entry.cdte_addr.msf.minute; + cd->tracks[LEADOUT].second = toc_entry.cdte_addr.msf.second; + cd->tracks[LEADOUT].frame = toc_entry.cdte_addr.msf.frame; + + cd->num_tracks = toc_header.cdth_trk1; + + return TRUE; } -gboolean cd_start(struct cd *cd,gint start_track,gint end_track) +gboolean +cd_start (struct cd * cd, gint start_track, gint end_track) { - struct cdrom_msf msf; + struct cdrom_msf msf; - if (cd->fd == -1) { - return FALSE; - } + if (cd->fd == -1) { + return FALSE; + } - cd_fix_track_range(cd,&start_track,&end_track); + cd_fix_track_range (cd, &start_track, &end_track); - msf.cdmsf_min0 = cd->tracks[start_track].minute; - msf.cdmsf_sec0 = cd->tracks[start_track].second; - msf.cdmsf_frame0 = cd->tracks[start_track].frame; + msf.cdmsf_min0 = cd->tracks[start_track].minute; + msf.cdmsf_sec0 = cd->tracks[start_track].second; + msf.cdmsf_frame0 = cd->tracks[start_track].frame; - if (end_track == LEADOUT) { - msf.cdmsf_min1 = cd->tracks[end_track].minute; - msf.cdmsf_sec1 = cd->tracks[end_track].second; - msf.cdmsf_frame1 = cd->tracks[end_track].frame; - } else { - msf.cdmsf_min1 = cd->tracks[end_track+1].minute; - msf.cdmsf_sec1 = cd->tracks[end_track+1].second; - msf.cdmsf_frame1 = cd->tracks[end_track+1].frame; - } + if (end_track == LEADOUT) { + msf.cdmsf_min1 = cd->tracks[end_track].minute; + msf.cdmsf_sec1 = cd->tracks[end_track].second; + msf.cdmsf_frame1 = cd->tracks[end_track].frame; + } else { + msf.cdmsf_min1 = cd->tracks[end_track + 1].minute; + msf.cdmsf_sec1 = cd->tracks[end_track + 1].second; + msf.cdmsf_frame1 = cd->tracks[end_track + 1].frame; + } - if (ioctl(cd->fd,CDROMPLAYMSF,&msf) != 0) { - return FALSE; - } + if (ioctl (cd->fd, CDROMPLAYMSF, &msf) != 0) { + return FALSE; + } - return TRUE; + return TRUE; } -gboolean cd_pause(struct cd *cd) +gboolean +cd_pause (struct cd * cd) { - if (cd->fd == -1) { - return FALSE; - } + if (cd->fd == -1) { + return FALSE; + } - if (ioctl(cd->fd,CDROMPAUSE,NULL) != 0) { - return FALSE; - } + if (ioctl (cd->fd, CDROMPAUSE, NULL) != 0) { + return FALSE; + } - return TRUE; + return TRUE; } -gboolean cd_resume(struct cd *cd) +gboolean +cd_resume (struct cd * cd) { - if (cd->fd == -1) { - return FALSE; - } + if (cd->fd == -1) { + return FALSE; + } - if (ioctl(cd->fd,CDROMRESUME,NULL) != 0) { - return FALSE; - } + if (ioctl (cd->fd, CDROMRESUME, NULL) != 0) { + return FALSE; + } - return TRUE; + return TRUE; } -gboolean cd_stop(struct cd *cd) +gboolean +cd_stop (struct cd * cd) { - if (cd->fd == -1) { - return FALSE; - } + if (cd->fd == -1) { + return FALSE; + } - if (ioctl(cd->fd,CDROMSTOP,NULL) != 0) { - return FALSE; - } + if (ioctl (cd->fd, CDROMSTOP, NULL) != 0) { + return FALSE; + } - return TRUE; + return TRUE; } /* -1 for error, 0 for not playing, 1 for playing */ -CDStatus cd_status(struct cd *cd) +CDStatus +cd_status (struct cd * cd) { - struct cdrom_subchnl sub_channel; - - if (cd->fd == -1) { - return -1; - } - - sub_channel.cdsc_format = CDROM_MSF; - - if (ioctl(cd->fd,CDROMSUBCHNL,&sub_channel) != 0) { - return -1; - } - - switch (sub_channel.cdsc_audiostatus) { - case CDROM_AUDIO_COMPLETED: - return CD_COMPLETED; - break; - case CDROM_AUDIO_PLAY: - case CDROM_AUDIO_PAUSED: - return CD_PLAYING; - break; - case CDROM_AUDIO_ERROR: - default: - return CD_ERROR; - } + struct cdrom_subchnl sub_channel; + + if (cd->fd == -1) { + return -1; + } + + sub_channel.cdsc_format = CDROM_MSF; + + if (ioctl (cd->fd, CDROMSUBCHNL, &sub_channel) != 0) { + return -1; + } + + switch (sub_channel.cdsc_audiostatus) { + case CDROM_AUDIO_COMPLETED: + return CD_COMPLETED; + break; + case CDROM_AUDIO_PLAY: + case CDROM_AUDIO_PAUSED: + return CD_PLAYING; + break; + case CDROM_AUDIO_ERROR: + default: + return CD_ERROR; + } } -gint cd_current_track(struct cd *cd) +gint +cd_current_track (struct cd * cd) { - struct cdrom_subchnl sub_channel; + struct cdrom_subchnl sub_channel; - if (cd->fd == -1) { - return -1; - } + if (cd->fd == -1) { + return -1; + } - sub_channel.cdsc_format = CDROM_MSF; + sub_channel.cdsc_format = CDROM_MSF; - if (ioctl(cd->fd,CDROMSUBCHNL,&sub_channel) != 0) { - return -1; - } + if (ioctl (cd->fd, CDROMSUBCHNL, &sub_channel) != 0) { + return -1; + } - return sub_channel.cdsc_trk; + return sub_channel.cdsc_trk; } -gboolean cd_close(struct cd *cd) +gboolean +cd_close (struct cd * cd) { - if (cd->fd == -1) { - return TRUE; - } + if (cd->fd == -1) { + return TRUE; + } - if (close(cd->fd) != 0) { - return FALSE; - } + if (close (cd->fd) != 0) { + return FALSE; + } - cd->fd = -1; + cd->fd = -1; - return TRUE; + return TRUE; } - -- cgit v1.2.1