Mercurial > audlegacy-plugins
comparison src/cdaudio-ng/cdaudio-ng.c @ 2453:e3225b9b3e59
Use glib types consistently.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Fri, 14 Mar 2008 13:51:17 +0200 |
parents | 32d4d5f7020b |
children | 853c7686e922 |
comparison
equal
deleted
inserted
replaced
2452:5993021f4dec | 2453:e3225b9b3e59 |
---|---|
65 static gint playing_track = -1; | 65 static gint playing_track = -1; |
66 static dae_params_t *pdae_params = NULL; | 66 static dae_params_t *pdae_params = NULL; |
67 static InputPlayback *pglobalinputplayback = NULL; | 67 static InputPlayback *pglobalinputplayback = NULL; |
68 static GtkWidget *main_menu_item, *playlist_menu_item; | 68 static GtkWidget *main_menu_item, *playlist_menu_item; |
69 static GThread *scan_cd_thread = NULL; | 69 static GThread *scan_cd_thread = NULL; |
70 static int first_trackno_to_add_after_scan = -1; | 70 static gint first_trackno_to_add_after_scan = -1; |
71 static int last_trackno_to_add_after_scan = -1; | 71 static gint last_trackno_to_add_after_scan = -1; |
72 | 72 |
73 static void cdaudio_init(void); | 73 static void cdaudio_init(void); |
74 static void cdaudio_about(void); | 74 static void cdaudio_about(void); |
75 static void cdaudio_configure(void); | 75 static void cdaudio_configure(void); |
76 static gint cdaudio_is_our_file(gchar *filename); | 76 static gint cdaudio_is_our_file(gchar *filename); |
626 scan_cd_threaded(-1, -1); | 626 scan_cd_threaded(-1, -1); |
627 debug("CD changed, rescanning\n"); | 627 debug("CD changed, rescanning\n"); |
628 } | 628 } |
629 } | 629 } |
630 else { | 630 else { |
631 int trackno; | 631 gint trackno; |
632 for (trackno = firsttrackno; trackno <= lasttrackno; trackno++) | 632 for (trackno = firsttrackno; trackno <= lasttrackno; trackno++) |
633 append_track_to_playlist(trackno); | 633 append_track_to_playlist(trackno); |
634 } | 634 } |
635 } | 635 } |
636 | 636 |
980 cddb_track_set_frame_offset(pcddb_track, cdio_get_track_lba(pcdio, trackno)); | 980 cddb_track_set_frame_offset(pcddb_track, cdio_get_track_lba(pcdio, trackno)); |
981 cddb_disc_add_track(pcddb_disc, pcddb_track); | 981 cddb_disc_add_track(pcddb_disc, pcddb_track); |
982 } | 982 } |
983 | 983 |
984 cddb_disc_calc_discid(pcddb_disc); | 984 cddb_disc_calc_discid(pcddb_disc); |
985 unsigned int discid = cddb_disc_get_discid(pcddb_disc); | 985 guint discid = cddb_disc_get_discid(pcddb_disc); |
986 debug("CDDB disc id = %x\n", discid); | 986 debug("CDDB disc id = %x\n", discid); |
987 | 987 |
988 gint matches; | 988 gint matches; |
989 if ((matches = cddb_query(pcddb_conn, pcddb_disc)) == -1) { | 989 if ((matches = cddb_query(pcddb_conn, pcddb_disc)) == -1) { |
990 if (cddb_errno(pcddb_conn) == CDDB_ERR_OK) | 990 if (cddb_errno(pcddb_conn) == CDDB_ERR_OK) |
1016 cdaudio_set_strinfo(&trackinfo[0], | 1016 cdaudio_set_strinfo(&trackinfo[0], |
1017 cddb_disc_get_artist(pcddb_disc), | 1017 cddb_disc_get_artist(pcddb_disc), |
1018 cddb_disc_get_title(pcddb_disc), | 1018 cddb_disc_get_title(pcddb_disc), |
1019 cddb_disc_get_genre(pcddb_disc)); | 1019 cddb_disc_get_genre(pcddb_disc)); |
1020 | 1020 |
1021 int trackno; | 1021 gint trackno; |
1022 for (trackno = firsttrackno; trackno <= lasttrackno; trackno++) { | 1022 for (trackno = firsttrackno; trackno <= lasttrackno; trackno++) { |
1023 cddb_track_t *pcddb_track = cddb_disc_get_track(pcddb_disc, trackno - 1); | 1023 cddb_track_t *pcddb_track = cddb_disc_get_track(pcddb_disc, trackno - 1); |
1024 cdaudio_set_strinfo(&trackinfo[trackno], | 1024 cdaudio_set_strinfo(&trackinfo[trackno], |
1025 cddb_track_get_artist(pcddb_track), | 1025 cddb_track_get_artist(pcddb_track), |
1026 cddb_track_get_title(pcddb_track), | 1026 cddb_track_get_title(pcddb_track), |