1 files changed, 148 insertions, 141 deletions

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;
 }
-