X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8482f24cfc00645607f8526fde38d39e0dcaa63..9ead8387d02667092186a7dd2671bacbd010406a:/contrib/src/mmedia/cdunix.cpp diff --git a/contrib/src/mmedia/cdunix.cpp b/contrib/src/mmedia/cdunix.cpp index 5a8f42de61..17fab7bac5 100644 --- a/contrib/src/mmedia/cdunix.cpp +++ b/contrib/src/mmedia/cdunix.cpp @@ -8,9 +8,6 @@ // CVS Id: $Id$ // License: wxWindows license //////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "cdunix.h" -#endif #include "wx/wxprec.h" @@ -22,6 +19,8 @@ #pragma hdrstop #endif +#if HAVE_KNOWN_CDROM_INTERFACE + // --------------------------------------------------------------------------- // MMedia headers // --------------------------------------------------------------------------- @@ -55,7 +54,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCDAudioLinux, wxCDAudio) wxCDAudioLinux::wxCDAudioLinux() : wxCDAudio(), m_fd(-1) { - OpenDevice("/dev/cdrom"); + OpenDevice(wxT("/dev/cdrom")); } wxCDAudioLinux::wxCDAudioLinux(const wxString& dev_name) @@ -78,7 +77,7 @@ void wxCDAudioLinux::OpenDevice(const wxString& dev_name) struct cdrom_tocentry entry, old_entry; struct cdrom_tochdr diskinf; struct cdrom_msf0 *msf = &entry.cdte_addr.msf, - *old_msf = &old_entry.cdte_addr.msf; + *old_msf = &old_entry.cdte_addr.msf; wxCDtime *the_track; wxCDtime tot_tm; wxUint8 nb_tracks, i; @@ -216,3 +215,5 @@ wxCDAudio::CDtoc& wxCDAudioLinux::GetToc() { return *m_toc; } + +#endif