banshee r3198 - in trunk/musicbrainz-sharp/src/MusicBrainz: . MusicBrainz
- From: scottp svn gnome org
- To: svn-commits-list gnome org
- Subject: banshee r3198 - in trunk/musicbrainz-sharp/src/MusicBrainz: . MusicBrainz
- Date: Sun, 10 Feb 2008 00:46:46 +0000 (GMT)
Author: scottp
Date: Sun Feb 10 00:46:46 2008
New Revision: 3198
URL: http://svn.gnome.org/viewvc/banshee?rev=3198&view=rev
Log:
* src/MusicBrainz/MusicBrainz/DiscLinux.cs: Fixed linux disc id code.
* src/MusicBrainz/MusicBrainz/DiscWin32.cs: Whitespace.
Modified:
trunk/musicbrainz-sharp/src/MusicBrainz/ChangeLog
trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscLinux.cs
trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscWin32.cs
Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscLinux.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscLinux.cs (original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscLinux.cs Sun Feb 10 00:46:46 2008
@@ -32,69 +32,47 @@
static extern int close(int fd);
[DllImport("libc.so.6", EntryPoint = "ioctl")]
- static extern int get_toc_header(int fd, int request, ref cdrom_tochdr header);
- static int GetTocHeader(int fd, ref cdrom_tochdr header)
+ static extern int read_toc_header(int fd, int request, ref cdrom_tochdr header);
+ static int read_toc_header(int fd, ref cdrom_tochdr header)
{
- return get_toc_header(fd, CDROMREADTOCHDR, ref header);
+ return read_toc_header(fd, CDROMREADTOCHDR, ref header);
}
[DllImport("libc.so.6", EntryPoint = "ioctl")]
- static extern int get_multisession(int fd, int request, ref cdrom_multisession multisession);
- static int GetMultisession(int fd, ref cdrom_multisession multisession)
+ static extern int read_multisession(int fd, int request, ref cdrom_multisession multisession);
+ static int read_multisession(int fd, ref cdrom_multisession multisession)
{
- return get_multisession(fd, CDROMMULTISESSION, ref multisession);
+ return read_multisession(fd, CDROMMULTISESSION, ref multisession);
}
[DllImport("libc.so.6", EntryPoint = "ioctl")]
- static extern int get_toc_entry(int fd, int request, ref cdrom_tocentry entry);
- static int GetTocEntry(int fd, ref cdrom_tocentry entry)
+ static extern int read_toc_entry(int fd, int request, ref cdrom_tocentry entry);
+ static int read_toc_entry(int fd, ref cdrom_tocentry entry)
{
- return get_toc_entry(fd, CDROMREADTOCENTRY, ref entry);
+ return read_toc_entry(fd, CDROMREADTOCENTRY, ref entry);
}
- [StructLayout(LayoutKind.Sequential)]
+ [StructLayout(LayoutKind.Sequential, Pack = 0)]
struct cdrom_tochdr
{
public byte cdth_trk0;
public byte cdth_trk1;
}
- [StructLayout(LayoutKind.Sequential)]
- struct cdrom_msf0
- {
- public byte minute;
- public byte second;
- public byte frame;
- }
-
- [StructLayout(LayoutKind.Explicit)]
- struct cdrom_addr
- {
- [FieldOffset(0)] public cdrom_msf0 msf;
- [FieldOffset(0)] public int lba;
- }
-
- [StructLayout(LayoutKind.Explicit)]
+ [StructLayout(LayoutKind.Sequential, Pack = 0)]
struct cdrom_tocentry
{
- [FieldOffset(0)]
public byte cdte_track;
- [FieldOffset(1)]
- public byte cdte_adr;
- [FieldOffset(5)]
- public byte cdte_ctrl;
- [FieldOffset(6)]
+ private byte adr_ctrl_info;
public byte cdte_format;
- [FieldOffset(7)]
- public cdrom_addr cdte_addr;
- [FieldOffset(11)]
+ public int lba;
public byte cdte_datamode;
}
- [StructLayout(LayoutKind.Sequential)]
+ [StructLayout(LayoutKind.Sequential, Pack = 0)]
struct cdrom_multisession
{
- public cdrom_addr addr;
+ public int lba;
public byte xa_flag;
public byte addr_format;
}
@@ -104,7 +82,7 @@
cdrom_tochdr th = new cdrom_tochdr();
cdrom_multisession ms = new cdrom_multisession();
- int ret = GetTocHeader(fd, ref th);
+ int ret = read_toc_header(fd, ref th);
if(ret < 0)
return ret;
@@ -113,7 +91,7 @@
LastTrack = th.cdth_trk1;
ms.addr_format = CDROM_LBA;
- ret = GetMultisession(fd, ref ms);
+ ret = read_multisession(fd, ref ms);
if(ms.xa_flag != 0)
LastTrack--;
@@ -127,10 +105,10 @@
te.cdte_track = track_number;
te.cdte_format = CDROM_LBA;
- int ret = GetTocEntry(fd, ref te);
+ int ret = read_toc_entry(fd, ref te);
if(ret == 0)
- lba = (ulong)te.cdte_addr.lba;
+ lba = (ulong)te.lba;
return ret;
}
@@ -140,10 +118,10 @@
cdrom_multisession ms = new cdrom_multisession();
ms.addr_format = CDROM_LBA;
- int ret = GetMultisession(fd, ref ms);
+ int ret = read_multisession(fd, ref ms);
if(ms.xa_flag != 0) {
- lba = (ulong)(ms.addr.lba - XA_INTERVAL);
+ lba = (ulong)(ms.lba - XA_INTERVAL);
return ret;
}
Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscWin32.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscWin32.cs (original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscWin32.cs Sun Feb 10 00:46:46 2008
@@ -19,10 +19,15 @@
internal sealed class DiscWin32 : Disc
{
[DllImport("winmm")]
- static extern Int32 mciSendString(String command, StringBuilder buffer, Int32 bufferSize, IntPtr hwndCallback);
+ static extern Int32 mciSendString(String command,
+ StringBuilder buffer,
+ Int32 bufferSize,
+ IntPtr hwndCallback);
[DllImport("winmm")]
- static extern Int32 mciGetErrorString(Int32 errorCode, StringBuilder errorText, Int32 errorTextSize);
+ static extern Int32 mciGetErrorString(Int32 errorCode,
+ StringBuilder errorText,
+ Int32 errorTextSize);
internal DiscWin32(string device)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]