iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compile fixes for BSD - I hope!

Browse Source 
BUG: 254
This commit is contained in:
craig.p.drummond
2013-07-11 18:34:46 +00:00
committed by craig.p.drummond
parent 854d56d5dc
commit 776e342a36
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
devices/cddb.cpp
View File

@@ -38,6 +38,7 @@
#include <sys/ioctl.h>
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <sys/cdio.h>
#include <arpa/inet.h>
#elif defined(__linux__)
#include <linux/cdrom.h>
#endif
@@ -157,8 +158,8 @@ void Cddb::readDisc()
if (0==ioctl(fd, CDIOREADTOCENTRY, &te)) {
cddb_track_t *track = cddb_track_new();
if (track) {
cddb_track_set_frame_offset(track, te.cdte_addr.lba + SECONDS_TO_FRAMES(2));
cddb_track_set_title(track, te.cdte_ctrl&CDROM_DATA_TRACK ? dataTrack().toUtf8().constData() : unknown.constData());
cddb_track_set_frame_offset(track, te.entry.addr.lba + SECONDS_TO_FRAMES(2));
cddb_track_set_title(track, te.entry.control&0x04 ? dataTrack().toUtf8().constData() : unknown.constData());
cddb_track_set_artist(track, unknown.constData());
cddb_disc_add_track(disc, track);
}

3
devices/musicbrainz.cpp
View File

@@ -54,6 +54,7 @@
#include <sys/ioctl.h>
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <sys/cdio.h>
#include <arpa/inet.h>
#elif defined(__linux__)
#include <linux/cdrom.h>
#endif
@@ -170,7 +171,7 @@ void MusicBrainz::readDisc()
for (int i=th.starting_track; i<=th.ending_track; i++) {
te.track = i;
if (0==ioctl(fd, CDIOREADTOCENTRY, &te)) {
tracks.append(Track(te.cdte_addr.lba + secondsToFrames(2), te.cdte_ctrl&CDROM_DATA_TRACK));
tracks.append(Track(te.entry.addr.lba + secondsToFrames(2), te.entry.control&0x04));
}
}
te.track = 0xAA;