* Dotted filenames for package cdrom

This commit is contained in:
Michaël Van Canneyt 2023-03-06 14:58:00 +01:00
parent 00439969ce
commit 96d1f229b5
21 changed files with 106 additions and 1 deletions

View File

@ -0,0 +1,3 @@
unit System.CdRom.Cddb;
{$DEFINE FPC_DOTTEDUNITS}
{$i fpcddb.pp}

View File

@ -0,0 +1,3 @@
unit System.CdRom.DiscId;
{$DEFINE FPC_DOTTEDUNITS}
{$i discid.pp}

View File

@ -0,0 +1,3 @@
unit System.CdRom.Linux;
{$DEFINE FPC_DOTTEDUNITS}
{$i lincd.pp}

View File

@ -0,0 +1,3 @@
unit System.CdRom.Major;
{$DEFINE FPC_DOTTEDUNITS}
{$i major.pp}

View File

@ -0,0 +1,3 @@
unit System.CdRom.ScsiDefs;
{$DEFINE FPC_DOTTEDUNITS}
{$i scsidefs.pp}

View File

@ -0,0 +1,3 @@
unit System.CdRom.Windows.Aspi32;
{$DEFINE FPC_DOTTEDUNITS}
{$i wnaspi32.pp}

View File

@ -0,0 +1,3 @@
unit System.CdRom.Windows.IoCtl;
{$DEFINE FPC_DOTTEDUNITS}
{$i cdromioctl.pp}

View File

@ -0,0 +1,3 @@
unit System.CdRom.Windows;
{$DEFINE FPC_DOTTEDUNITS}
{$i wincd.pp}

View File

@ -0,0 +1,3 @@
unit System.CdRom;
{$DEFINE FPC_DOTTEDUNITS}
{$i cdrom.pp}

View File

@ -0,0 +1,11 @@
src/fpcddb.pp=namespaced/System.CdRom.Cddb.pp
{s*:src/}=namespaced/
{i+:src/}
src/wincd.pp=namespaced/System.CdRom.Windows.pp
src/cdrom.pp=namespaced/System.CdRom.pp
src/scsidefs.pp=namespaced/System.CdRom.ScsiDefs.pp
src/major.pp=namespaced/System.CdRom.Major.pp
src/lincd.pp=namespaced/System.CdRom.Linux.pp
src/cdromioctl.pp=namespaced/System.CdRom.Windows.IoCtl.pp
src/wnaspi32.pp=namespaced/System.CdRom.Windows.Aspi32.pp
src/discid.pp=namespaced/System.CdRom.DiscId.pp

View File

@ -11,7 +11,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
**********************************************************************} **********************************************************************}
{$IFNDEF FPC_DOTTEDUNITS}
unit cdrom; unit cdrom;
{$ENDIF}
{$mode objfpc} {$mode objfpc}
{$h+} {$h+}

View File

@ -1,8 +1,14 @@
{$IFNDEF FPC_DOTTEDUNITS}
unit cdromioctl; unit cdromioctl;
{$ENDIF FPC_DOTTEDUNITS}
{$mode objfpc} {$mode objfpc}
interface interface
{$IFDEF FPC_DOTTEDUNITS}
uses WinApi.Windows;
{$ELSE FPC_DOTTEDUNITS}
uses windows; uses windows;
{$ENDIF FPC_DOTTEDUNITS}
{ {
Automatically converted by H2Pas 0.99.15 from cdromioctl.h Automatically converted by H2Pas 0.99.15 from cdromioctl.h

View File

@ -1,7 +1,14 @@
{$IFDEF FPC_DOTTEDUNITS}
uses
UnixApi.Base,
UnixApi.Unix,
System.CdRom.Linux;
{$ELSE}
uses uses
baseunix, baseunix,
unix, unix,
lincd; lincd;
{$ENDIF}
Function ReadCDTOC(Device : AnsiString; Var CDTOC : Array of TTocEntry) : Integer; Function ReadCDTOC(Device : AnsiString; Var CDTOC : Array of TTocEntry) : Integer;

View File

@ -1,5 +1,8 @@
{$IFDEF FPC_DOTTEDUNITS}
uses System.CdRom.Windows;
{$ELSE}
uses wincd; uses wincd;
{$ENDIF}
Function ReadCDTOC(Device : AnsiString; Var CDTOC : Array of TTocEntry) : Integer; Function ReadCDTOC(Device : AnsiString; Var CDTOC : Array of TTocEntry) : Integer;

View File

@ -12,13 +12,19 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
**********************************************************************} **********************************************************************}
{$IFNDEF FPC_DOTTEDUNITS}
unit discid; unit discid;
{$ENDIF FPC_DOTTEDUNITS}
{$mode objfpc} {$mode objfpc}
interface interface
{$IFDEF FPC_DOTTEDUNITS}
uses System.CdRom,System.SysUtils;
{$ELSE FPC_DOTTEDUNITS}
uses cdrom,sysutils; uses cdrom,sysutils;
{$ENDIF FPC_DOTTEDUNITS}
Function CDDBDiscID(Const CDTOC : Array of TTocEntry; Count : Integer) : integer ; Function CDDBDiscID(Const CDTOC : Array of TTocEntry; Count : Integer) : integer ;
Function GetCDDBQueryString(Const Tracks : Array of TTocEntry; Count : Integer) : AnsiString; Function GetCDDBQueryString(Const Tracks : Array of TTocEntry; Count : Integer) : AnsiString;

View File

@ -24,14 +24,21 @@
} }
{$IFNDEF FPC_DOTTEDUNITS}
unit fpcddb; unit fpcddb;
{$ENDIF FPC_DOTTEDUNITS}
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
interface interface
{$IFDEF FPC_DOTTEDUNITS}
uses
System.Classes, System.SysUtils;
{$ELSE FPC_DOTTEDUNITS}
uses uses
Classes, SysUtils; Classes, SysUtils;
{$ENDIF FPC_DOTTEDUNITS}
Type Type
TCDDisk = Class; TCDDisk = Class;

View File

@ -11,15 +11,23 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
**********************************************************************} **********************************************************************}
{$IFNDEF FPC_DOTTEDUNITS}
unit lincd; unit lincd;
{$ENDIF FPC_DOTTEDUNITS}
{$mode objfpc} {$mode objfpc}
interface interface
{$IFDEF FPC_DOTTEDUNITS}
uses
UnixApi.Base,
UnixApi.Unix;
{$ELSE FPC_DOTTEDUNITS}
uses uses
baseunix, baseunix,
unix; unix;
{$ENDIF FPC_DOTTEDUNITS}
{ --------------------------------------------------------------------- { ---------------------------------------------------------------------
cdrom.h header translation. cdrom.h header translation.
@ -721,7 +729,11 @@ Function DetectCd : AnsiString;
implementation implementation
{$IFDEF FPC_DOTTEDUNITS}
uses System.CDROM.Major,System.SysUtils;
{$ELSE FPC_DOTTEDUNITS}
uses major,sysutils; uses major,sysutils;
{$ENDIF FPC_DOTTEDUNITS}
{ --------------------------------------------------------------------- { ---------------------------------------------------------------------
Functions from cdrom.h translation. Functions from cdrom.h translation.

View File

@ -1,4 +1,6 @@
{$IFNDEF FPC_DOTTEDUNITS}
unit major; unit major;
{$ENDIF FPC_DOTTEDUNITS}
interface interface
{ {

View File

@ -1,4 +1,6 @@
{$IFNDEF FPC_DOTTEDUNITS}
unit scsidefs; unit scsidefs;
{$ENDIF FPC_DOTTEDUNITS}
interface interface

View File

@ -1,13 +1,19 @@
{ {
} }
{$IFNDEF FPC_DOTTEDUNITS}
unit WinCD; unit WinCD;
{$ENDIF FPC_DOTTEDUNITS}
{$mode objfpc} {$mode objfpc}
{$h+} {$h+}
interface interface
{$IFDEF FPC_DOTTEDUNITS}
uses WinApi.Windows,System.SysUtils;
{$ELSE FPC_DOTTEDUNITS}
uses Windows,SysUtils; uses Windows,SysUtils;
{$ENDIF FPC_DOTTEDUNITS}
Type Type
TCDAccessMethod = (camNone,camASPI,camSPTI,camIOCTL); TCDAccessMethod = (camNone,camASPI,camSPTI,camIOCTL);
@ -39,7 +45,11 @@ Function GetNumDrives : Integer;
implementation implementation
{$IFDEF FPC_DOTTEDUNITS}
uses System.CdRom.Windows.IoCtl, System.CdRom.Windows.Aspi32, System.CdRom.ScsiDefs;
{$ELSE FPC_DOTTEDUNITS}
uses cdromioctl,wnaspi32,scsidefs; uses cdromioctl,wnaspi32,scsidefs;
{$ENDIF FPC_DOTTEDUNITS}
Var Var
CurrentAccessMethod : TCDAccessMethod; CurrentAccessMethod : TCDAccessMethod;

View File

@ -1,10 +1,16 @@
{$IFNDEF FPC_DOTTEDUNITS}
unit wnaspi32; unit wnaspi32;
{$ENDIF FPC_DOTTEDUNITS}
{$mode objfpc} {$mode objfpc}
interface interface
{$IFDEF FPC_DOTTEDUNITS}
uses WinApi.Windows;
{$ELSE FPC_DOTTEDUNITS}
uses Windows; uses Windows;
{$ENDIF FPC_DOTTEDUNITS}
type type
LPSRB = Pointer; LPSRB = Pointer;
@ -218,7 +224,11 @@ procedure UnloadASPI;
implementation implementation
{$IFDEF FPC_DOTTEDUNITS}
uses System.DynLibs;
{$ELSE FPC_DOTTEDUNITS}
uses dynlibs; uses dynlibs;
{$ENDIF FPC_DOTTEDUNITS}
const const
HWNASPI : TLibHandle = 0; HWNASPI : TLibHandle = 0;