tag:old.nabble.com,2006:forum-1704
Nabble - Gnu - Libcdio
2009-11-29T17:55:12Z
Libcdio is the Compact Disc Input and Control library which encapsulates CD-ROM reading and control and can be used in applications wishing to be oblivious of the OS- and device-dependant properties of a CD-ROM. Gnu - Libcdio home is <a href="http://savannah.gnu.org/projects/libcdio/" target="_top" rel="nofollow">here</a>.
tag:old.nabble.com,2006:post-26568561
Re: Question regarding lib/cdio++/cdio.cpp
2009-11-29T17:55:12Z
2009-11-29T17:55:12Z
Thomas Rieck
Thank you.
<br><br>On Thu, Nov 26, 2009 at 6:19 AM, Rocky Bernstein <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568561&i=0" target="_top" rel="nofollow">rocky@...</a>> wrote:
<br><div class='shrinkable-quote'><br>> On Wed, Nov 25, 2009 at 9:22 PM, Thomas Rieck <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568561&i=1" target="_top" rel="nofollow">trieck@...</a>> wrote:
<br>>
<br>> > I have a specific question about lib/cdio++/cdio.cpp.
<br>> > I am unable to compile this file,
<br>>
<br>>
<br>> This doesn't make much sense to me. Generally one doesn't compile that file
<br>> but includes it from inside another file.
<br>>
<br>> because it's looking for <stdint.h>
<br>> >
<br>> definitions.
<br>> >
<br>>
<br>> Hmm. I looked at cdio.cpp and I am not exactly sure what there refers to
<br>> <stdint.h>. For example, I don't see any references to unint32 or
<br>> UINT32_MAX.
<br>>
<br>> >
<br>> > Why doesn't the module contain :
<br>> >
<br>> > #ifdef HAVE_CONFIG_H
<br>> > # include "config.h"
<br>> > #endif
<br>> >
<br>>
<br>> Generally, I don't think it is accepted practice for installed headers to
<br>> refer to something outside of the installed space. That is, generally they
<br>> don't refer to names enclosed in ""; rather include names are enclosed in
<br>> <>. So what we have previously done in libcdio is to put a part of config.h
<br>> which is generated at configuration time, into a file called cdio_config.h.
<br>> Installed headers then refer to this via <cdio/cdio_config.h>.
<br>>
<br>> I'll guess that what you are trying to do is start with an example C++
<br>> program, put it outside of the libcdio source tree and compile it. If so,
<br>> this is a perfectly reasonable thing to do.
<br>>
<br>> And I will guess that in that process you have noticed that the example
<br>> programs all refer to "config.h" which can't be found.
<br>>
<br>> If you want to work off a distributed version of libcdio, change
<br>> #include "config.h"
<br>> to:
<br>> #include <cdio/cdio_config.h>
<br>>
<br>> If you are willing to use the latest git sources to libcdio, I've made
<br>> changes in the example programs and more importantly to the main cdio.h
<br>> header that I think should make it easier for people to start with an
<br>> example program.
<br>>
<br>> In the git sources, by simply including cdio.h it will now pull in
<br>> <cdio/cdio_config.h> via an include that it has for <cdio/types.h>; other
<br>> cdio files, like <cdio/iso9660.h>, do the same.
<br>>
<br>>
<br>> > Thank you for your time.
<br>> >
<br>>
<br>> > Tom Rieck
<br>> >
<br>>
<br></div><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-26528010
Warning: small but potentially major change to cdio.h
2009-11-26T03:26:36Z
2009-11-26T03:26:36Z
r-
In response to a query just posted to libcdio-devel which I guess had to do
<br>with compiling an example C++ program, I've made a small change to cdio.h
<br>but one that may have big consequences.
<br><br><cdio/cdio.h> now includes <cdio/types.h> before referring to the HAVE_...
<br>C preprocessor variables.
<br><br>I think this is the right thing to do, but I'm not completely sure. So if
<br>others want to comment on this please do.
<br>Also I've removed HAVE_CONFIG_H tests from all of the example programs,
<br>since now I think this will be pulled in via <cdio/cdio_config.h>.
<br><br>A last little but potentially large change is to run some of the example
<br>programs in "make check". I am guessing that if the
<br>example programs are not built the test won't get run. I haven't done
<br>thorough testing on this though.
<br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-26527938
Re: Question regarding lib/cdio++/cdio.cpp
2009-11-26T03:19:26Z
2009-11-26T03:19:26Z
r-
On Wed, Nov 25, 2009 at 9:22 PM, Thomas Rieck <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26527938&i=0" target="_top" rel="nofollow">trieck@...</a>> wrote:
<br><br>> I have a specific question about lib/cdio++/cdio.cpp.
<br>> I am unable to compile this file,
<br><br><br>This doesn't make much sense to me. Generally one doesn't compile that file
<br>but includes it from inside another file.
<br><br>because it's looking for <stdint.h>
<br>>
<br>definitions.
<br>>
<br><br>Hmm. I looked at cdio.cpp and I am not exactly sure what there refers to
<br><stdint.h>. For example, I don't see any references to unint32 or
<br>UINT32_MAX.
<br><br>>
<br>> Why doesn't the module contain :
<br>>
<br>> #ifdef HAVE_CONFIG_H
<br>> # include "config.h"
<br>> #endif
<br>>
<br><br>Generally, I don't think it is accepted practice for installed headers to
<br>refer to something outside of the installed space. That is, generally they
<br>don't refer to names enclosed in ""; rather include names are enclosed in
<br><>. So what we have previously done in libcdio is to put a part of config.h
<br>which is generated at configuration time, into a file called cdio_config.h.
<br>Installed headers then refer to this via <cdio/cdio_config.h>.
<br><br>I'll guess that what you are trying to do is start with an example C++
<br>program, put it outside of the libcdio source tree and compile it. If so,
<br>this is a perfectly reasonable thing to do.
<br><br>And I will guess that in that process you have noticed that the example
<br>programs all refer to "config.h" which can't be found.
<br><br>If you want to work off a distributed version of libcdio, change
<br>#include "config.h"
<br>to:
<br>#include <cdio/cdio_config.h>
<br><br>If you are willing to use the latest git sources to libcdio, I've made
<br>changes in the example programs and more importantly to the main cdio.h
<br>header that I think should make it easier for people to start with an
<br>example program.
<br><br>In the git sources, by simply including cdio.h it will now pull in
<br><cdio/cdio_config.h> via an include that it has for <cdio/types.h>; other
<br>cdio files, like <cdio/iso9660.h>, do the same.
<br><br><br>> Thank you for your time.
<br>>
<br><br>> Tom Rieck
<br>>
<br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-26523515
Question regarding lib/cdio++/cdio.cpp
2009-11-25T18:22:31Z
2009-11-25T18:22:31Z
Thomas Rieck
I have a specific question about lib/cdio++/cdio.cpp.
<br>I am unable to compile this file, because it's looking for <stdint.h>
<br>definitions.
<br><br>Why doesn't the module contain :
<br><br>#ifdef HAVE_CONFIG_H
<br># include "config.h"
<br>#endif
<br><br>Thank you for your time.
<br><br>Tom Rieck
<br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-26114237
Re: S_ISLNK and S_ISSOCK error in libcdio-0.82
2009-10-29T07:27:11Z
2009-10-29T07:27:11Z
Rocky Bernstein
Thanks for the information and patch. It has been applied and currently in
<br>the git repository. You might want to double check since sometimes I make a
<br>mistake.
<br><br>The existing tests for S_ISLINK and S_ISSOCK are from a patch supplied by
<br>Mike Frysinger. It was put in, he told me, to support cross compilation. So
<br>I have some concern as to whether this will change that. Anyone care to
<br>comment?
<br><br>2009/10/29 carlo.bramix <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26114237&i=0" target="_top" rel="nofollow">carlo.bramix@...</a>>
<br><div class='shrinkable-quote'><br>> Hello,
<br>> the newest version 0.82 cannot be compiled anymore on Mingw.
<br>> The problem happens because the tests for S_ISLNK and S_ISSOCK macros are
<br>> wrong.
<br>> Into configure script it is used AC_COMPILE_IFELSE instead of
<br>> AC_LINK_IFELSE.
<br>> That's a false test because it does not fail even if those macros are
<br>> unsupported.
<br>> Infact the compiler does not generate an error, it just returns a warning
<br>> like "implicit declaration of function S_ISLNK".
<br>> On Mingw 4.4.0 that warning is not even printed, I had to add -Wall to GCC
<br>> options for getting it.
<br>> Attached patch fixes the problem.
<br>> Since the new version has been just released and this bug blocks the
<br>> compilation on all platforms that do not support S_ISLNK and S_ISSOCK, do
<br>> you think it would be possible to release a quick bugfixed revision?
<br>>
<br>> Sincerely,
<br>>
<br>> Carlo Bramini.
<br>>
<br>>
<br></div><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-26111724
S_ISLNK and S_ISSOCK error in libcdio-0.82
2009-10-29T04:59:34Z
2009-10-29T04:59:34Z
carlo.bramix
Hello,
<br>the newest version 0.82 cannot be compiled anymore on Mingw.
<br>The problem happens because the tests for S_ISLNK and S_ISSOCK macros are wrong.
<br>Into configure script it is used AC_COMPILE_IFELSE instead of AC_LINK_IFELSE.
<br>That's a false test because it does not fail even if those macros are unsupported.
<br>Infact the compiler does not generate an error, it just returns a warning like "implicit declaration of function S_ISLNK".
<br>On Mingw 4.4.0 that warning is not even printed, I had to add -Wall to GCC options for getting it.
<br>Attached patch fixes the problem.
<br>Since the new version has been just released and this bug blocks the compilation on all platforms that do not support S_ISLNK and S_ISSOCK, do you think it would be possible to release a quick bugfixed revision?
<br><br>Sincerely,
<br><br>Carlo Bramini.
<br><br><br />diff -r -u libcdio-0.82-old/configure.ac libcdio-0.82-new/configure.ac
<br>--- libcdio-0.82-old/configure.ac 2009-10-27 11:26:32 +0000
<br>+++ libcdio-0.82-new/configure.ac 2009-10-28 15:04:24 +0000
<br>@@ -217,7 +217,7 @@
<br> ## Check for S_ISSOCK() and S_ISLNK() macros
<br> ##
<br> AC_MSG_CHECKING(for S_ISLNK() macro)
<br>-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
<br>+AC_LINK_IFELSE([AC_LANG_PROGRAM([
<br> #ifdef HAVE_SYS_STAT_H
<br> # include <sys/stat.h>
<br> #endif
<br>@@ -226,7 +226,7 @@
<br> [ AC_MSG_RESULT(no) ])
<br>
<br> AC_MSG_CHECKING([for S_ISSOCK() macro])
<br>-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
<br>+AC_LINK_IFELSE([AC_LANG_PROGRAM([
<br> #ifdef HAVE_SYS_STAT_H
<br> # include <sys/stat.h>
<br> #endif
<br><br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-26020484
Please try out the candidate libcdio debugger release
2009-10-22T20:37:22Z
2009-10-22T20:37:22Z
r-
In preparation for a release around October 27th, please try out the
<br>candidate release tarball
<br><a href="http://bashdb.sourceforge.net/libcdio-0.82git.tar.bz2" target="_top" rel="nofollow">http://bashdb.sourceforge.net/libcdio-0.82git.tar.bz2</a> or what is currently
<br>in Savannah git right now.
<br><br>From the NEWS file for this release:
<br><br>- Remove all uses of CDIO_MIN_DRIVER,
<br> CDIO_MAX_DRIVER, CDIO_MIN_DEVICE_DRIVER or CDIO_MAX_DEVICE_DRIVER.
<br>- FreeBSD get_media_changed fixes
<br>- MingGW/Msys compilation issues
<br>- Add OS/2 driver
<br>- Cross compilations fixes and uclinix is like GNU/Linux
<br>- Numerous other bug fixes
<br><br>Thanks.
<br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-25976510
Re: FreeBSD driver patch
2009-10-20T07:49:36Z
2009-10-20T07:49:36Z
r-
These changes seem reasonable to me, although I don't really understand
<br>patch 1 and don't have a way to test on FreeBSD.
<br><br>So I ask others to look over and comment on. The usual silence after a
<br>reasonable period of time will be taken to mean agreement that this should
<br>be committed and it will be done.
<br><br>I was planning a release around Oct 27, but I also will solicit comments as
<br>to whether this should go into that release or not.
<br><br>On Mon, Oct 19, 2009 at 6:20 PM, Geoff Bailey <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=25976510&i=0" target="_top" rel="nofollow">baileygeoff@...</a>> wrote:
<br><div class='shrinkable-quote'><br>> I have attached a couple of patches that fix the FreeBSD IOCTL interface in
<br>> libcdio.
<br>>
<br>> 1. The patch "patch-lib_driver_FreeBSD_freebsd_ioctl.c" fixes the
<br>> read_audio_sectors_freebsd_ioctl() function.
<br>>
<br>> 2. The patch "patch-lib_driver_FreeBSD_freebsd.c" resets the 'exists'
<br>> variable to true before scanning for ATAPI devices and adds a function to
<br>> set the default access mode. This is required when enumerating devices with
<br>> "cdio_get_devices_with_cap", since one is unable to set the access mode in
<br>> this case and it defaults to CAM.
<br>>
<br>> Since the ATAPI driver is in the GENERIC FreeBSD kernel and the ATPICAM
<br>> driver must be loaded manually, these changes make libcdio work immediately
<br>> upon installation.
<br>>
<br>> Also, my older model drive fails with "xmms2" (when using the CAM
<br>> interface) with "transport failed" but the IOCTL interface works.
<br>>
<br>>
<br></div><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-25561029
Release 0.82 around October 27th?
2009-09-22T07:28:10Z
2009-09-22T07:28:10Z
r-
As seems to be recent custom, I am planning release 0.82 around October
<br>27th.
<br><br>Other than the usual bug fixes, the only change this year the one by Nicolas
<br>Boullis which redoes the driver numbering and removes uses of
<br>CDIO_MIN_DRIVER, CDIO_MAX_DRIVER, CDIO_MIN_DEVICE_DRIVER and
<br>CDIO_MAX_DEVICE_DRIVER.
<br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-24849722
Re: --enable-cpp-progs and removal of exposed driver enumerations
2009-08-06T09:17:55Z
2009-08-06T09:17:55Z
r-
2009/8/6 Stanislav Brabec <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=24849722&i=0" target="_top" rel="nofollow">sbrabec@...</a>>
<br><div class='shrinkable-quote'><br>> Rocky Bernstein wrote:
<br>> > If I recall correctly, the feeling was that packagers wanted smaller
<br>> > distributions and/or don't want the C++ code. This is why
<br>> > --enable-cpp-progs by default is disabled. One of the major proponents
<br>> > of this point of view is Flameeyes.
<br>>
<br>> Packagers are always free to split packages or use --enable-feature/
<br>> --disable-feature to fit their needs.
<br>>
<br>> Common rule of upstream is: enable everything that has all dependencies
<br>> installed and what is mature enough.
<br>>
<br>> Anyway, packaging of libcdio was a nightmare due to several build
<br>> dependency loops.
<br>>
<br>> openSUSE 11.2 builds will use this way:
<br>> 1) build libcdio-mini (minimalistic staging package)
<br>> 2) build libcddb with exclusion of utilities
<br>> 3) build vcdimager using libcdio-mini and libcddb
<br>> 4) build libcdio using vcdimager (that needs libcdio-mini), libcddb
<br>> 5) build libcddb utilities using libcdio
<br>>
<br>> Only build of base system and avahi package are comparably complex.
</div><br><br>Sorry to hear.
<br><br>>
<br>>
<br>> > If you could work up a patch to fix this, that'd be fantastic.
<br>> > Thanks.
<br>>
<br>> I will look at it.
<br><br><br>If you have thoughts about how to reduce the complexity in packaging or
<br>better have a way to set up configuration options to address this that would
<br>be most welcome as well.
<br><br>A Systems Administration principle is relevant here: never ascribe to
<br>maliciousness or willful intent that which can easily be explained by
<br>oversight or ignorance.
<br><div class='shrinkable-quote'><br>>
<br>>
<br>> --
<br>> Best Regards / S pozdravem,
<br>>
<br>> Stanislav Brabec
<br>> software developer
<br>> ---------------------------------------------------------------------
<br>> SUSE LINUX, s. r. o. e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=24849722&i=1" target="_top" rel="nofollow">sbrabec@...</a>
<br>> Lihovarská 1060/12 tel: +420 284 028 966, +49 911 740538747
<br>> 190 00 Praha 9 fax: +420 284 028 951
<br>> Czech Republic <a href="http://www.suse.cz/" target="_top" rel="nofollow">http://www.suse.cz/</a><br>>
<br>>
<br></div><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-24847499
--enable-cpp-progs and removal of exposed driver enumerations
2009-08-06T07:19:10Z
2009-08-06T07:19:10Z
r-
If I recall correctly, the feeling was that packagers wanted smaller
<br>distributions and/or don't want the C++ code. This is why --enable-cpp-progs
<br>by default is disabled. One of the major proponents of this point of
<br>view<<a href="http://blog.flameeyes.eu/2007/11/17/a-bunch-of-silly-c-libraries" target="_top" rel="nofollow">http://blog.flameeyes.eu/2007/11/17/a-bunch-of-silly-c-libraries</a>>is
<br>Flameeyes.
<br><br>But if it is enabled yes, I guess it would be a bug if the pkgconfig files
<br>are not installed.
<br><br>If you could work up a patch to fix this, that'd be fantastic. Thanks.
<br><br>While on the topic of distributions and changes, I should note that the git
<br>repository now has work done by Nicolas Boullis to reduce fture ABI breakage
<br>and corrects an API misfeature.
<br><br>However should I have misrepresented things (and it is not uncommon for me
<br>to get things wrong), I hope others will speak up and correct me.
<br><br>2009/8/6 Stanislav Brabec <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=24847499&i=0" target="_top" rel="nofollow">sbrabec@...</a>>
<br><div class='shrinkable-quote'><br>> Hallo.
<br>>
<br>> I am just packaging libcdio-0.81 and found and interesting problem
<br>> there:
<br>>
<br>> Without --enable-cpp-progs, C++ libraries are built, but C++ library
<br>> pkgconfig files are not installed. I guess it is not the intended
<br>> behavior.
<br>>
<br>> I don't have a patch for it, but I can look into this problem. It seems,
<br>> that --enable-cpp-progs is by default disabled.
<br>>
<br>> --
<br>> Best Regards / S pozdravem,
<br>>
<br>> Stanislav Brabec
<br>> software developer
<br>> ---------------------------------------------------------------------
<br>> SUSE LINUX, s. r. o. e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=24847499&i=1" target="_top" rel="nofollow">sbrabec@...</a>
<br>> Lihovarská 1060/12 tel: +420 284 028 966, +49 911 740538747
<br>> 190 00 Praha 9 fax: +420 284 028 951
<br>> Czech Republic <a href="http://www.suse.cz/" target="_top" rel="nofollow">http://www.suse.cz/</a><br>>
<br>>
<br></div><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-24822942
Re: Re: Moving into office
2009-08-05T01:36:41Z
2009-08-05T01:36:41Z
Burkhard Plaum
Hi,
<br><br>Robert William Fuller wrote:
<br>> I do not know. I will be in on Wednesday. If Luke is there, I will ask
<br>> him.
<br>>
<br>> Rob
<br>>
<br><br>Are you sure this correspondence belongs to a public mailing list?
<br><br>Burkhard
<br><br><br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-24813083
Re: Moving into office
2009-08-04T10:36:44Z
2009-08-04T10:36:44Z
Robert William Fuller
Whoops. This should not have gone here. O well. Sorry!
<br><br>Rob
<br><br>Robert William Fuller wrote:
<div class='shrinkable-quote'><br>> I do not know. I will be in on Wednesday. If Luke is there, I will ask
<br>> him.
<br>>
<br>> Rob
<br>>
<br>> Roman T wrote:
<br>>> Hi Rob,
<br>>> Gotta using this cool email in lieu of webmail which is down.
<br>>> I would be trying to move into your office soon. However, I am not
<br>>> entirely clear about the status of the desk that belonged to the visiting
<br>>> student. Her computer is still there. Do you know if she left by any
<br>>> chance?
<br>>> Roman
<br>>>
<br>>
<br>>
</div><br><br><br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-24813062
Re: Moving into office
2009-08-04T10:36:04Z
2009-08-04T10:36:04Z
Robert William Fuller
I do not know. I will be in on Wednesday. If Luke is there, I will ask
<br>him.
<br><br>Rob
<br><br>Roman T wrote:
<br>> Hi Rob,
<br>> Gotta using this cool email in lieu of webmail which is down.
<br>> I would be trying to move into your office soon. However, I am not
<br>> entirely clear about the status of the desk that belonged to the visiting
<br>> student. Her computer is still there. Do you know if she left by any
<br>> chance?
<br>> Roman
<br>>
<br><br><br><br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-23560221
Release of pycdio and rbcdio possibly May 18
2009-05-15T06:47:52Z
2009-05-15T06:47:52Z
r-
Thomas Vander Stichelehas contributed work to add CDText to the Python
<br>bindings which I've ported over to Ruby bindings as well. Also took the
<br>opportunity to make rbcdio Ruby 1.9 compatibile.
<br><br>So unless folks have thoughts otherwise, I'm planning a release around May
<br>18.
<br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-23297824
Re: Device::Cdio::???? and CD bootloader
2009-04-29T06:46:29Z
2009-04-29T06:46:29Z
Rocky Bernstein-2
Comments in line.
<br><br>On Sun, Apr 26, 2009 at 1:59 PM, Tong Sun <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=23297824&i=0" target="_top" rel="nofollow">suntong@...</a>> wrote:
<br><div class='shrinkable-quote'><br>> Thanks a lot Rocky.
<br>>
<br>> I haven't got around to subscript to <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=23297824&i=1" target="_top" rel="nofollow">libcdio-devel@...</a> and ask the
<br>> question yet, and you've already replied. Thanks.
<br>>
<br>> I'm CCing <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=23297824&i=2" target="_top" rel="nofollow">libcdio-devel@...</a> this time, so that other people can
<br>> benefit as well. Thus, I use full quote to reply. Moreover, for the
<br>> archive, the reason for my question is,
<br>>
<br>> Many .iso files come with size much less than 700M. So it would be a waste
<br>> of
<br>> CD spaces to burn them as-is -- I want to add more files to them (then
<br>> pack them up again as iso) before burning them. So the most important
<br>> step is to extract the CD boot loaders (mainly for Windows based
<br>> bootable .iso images), so as to make it bootable again.
<br>>
<br>> On Sun, Apr 26, 2009 at 10:28 AM, Rocky Bernstein <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=23297824&i=3" target="_top" rel="nofollow">rocky@...</a>> wrote:
<br>> > Device::Cdio is a Perl wrapper around libcdio, which is a library for CD
<br>> and
<br>> > ISO9600 reading and it has provisions for the some of the various
<br>> ISO-9660
<br>> > extensions. If there is something in the "El Torito" extension that
<br>> libcdio
<br>> > doesn't handle libcdio should be corrected.
<br>> >
<br>> > So I believe it possible to read the boot-loader information. Adding more
<br>> > stuff to the end to write a new image is a different problem.
<br>> >
<br>> > example/iso2.pl from the Device::Cdio shows how to read a specific sector
<br>> of
<br>> > an ISO9660 image such as sector 17. Most CDs have just one session so
<br>> this
<br>> > "first" versus "last" session is usually irrelevant. I know in the C
<br>> library
<br>> > there is a way ascertain how many sessions an image has, I'm not sure if
<br>> > that has been made accessible in the Perl library.
<br>>
<br>> Thanks, I took a look at the example/iso2.pl, and find that actually
<br>> the better example is examples/iso3.pl for my case, because iso2.pl
<br>> read from CD-ROM or .cue file, whereas iso3.pl reads from ISO 9660
<br>> image file, which is what I want. Will try...
</div><br><br>Ok. Great.
<br><br><br>>
<br>>
<br>> BTW, what does lsn stands for?
<br><br><br> Check out the glossary
<br><a href="http://www.gnu.org/software/libcdio/libcdio.html#SEC61" target="_top" rel="nofollow">http://www.gnu.org/software/libcdio/libcdio.html#SEC61</a><br><div class='shrinkable-quote'><br>>
<br>>
<br>> > And on the topic of the Perl library, I should say that the Python and
<br>> Ruby
<br>> > libraries have been better maintained (by me) than the Perl library. So
<br>> if
<br>> > you can use either the C (best) Ruby (next best) or Python (3rd best) it
<br>> may
<br>> > be better than Perl.
<br>>
<br>> Hmm.., I don't know Ruby or Python. I prefer Perl because I want to
<br>> write minimum code. How about your iso-read command?
<br>>
</div><br>>
<br>> <a href="http://www.linuxcertif.com/man/1/iso-read/" target="_top" rel="nofollow">http://www.linuxcertif.com/man/1/iso-read/</a><br>>
<br>> Seems it is only file based, instead of sector based reading.
<br><br><br>Yep, it's file based. However if someone wants to submit patches to add
<br>options to make it sector based, I'm amenable to that.
<br><br><div class='shrinkable-quote'><br>>
<br>> Thanks
<br>>
<br>>
<br>> > If you get to the stage of wanting to write back the ISO9660 image, you
<br>> are
<br>> > aware of mkiso9660. vcdimager has C routines for writing CD images as
<br>> well,
<br>> > but someone would have to extract that and turn it into a library much as
<br>> > libcdio was done.
<br>> >
<br>> > Good luck.
<br>> >
<br>> > On Mon, Apr 20, 2009 at 1:36 PM, Rocky Bernstein <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=23297824&i=4" target="_top" rel="nofollow">rocky@...</a>> wrote:
<br>> >>
<br>> >> Just to let you know that I got your email. . . .
<br>> >>
<br>> >> Also you may want to try to post on mailing list: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=23297824&i=5" target="_top" rel="nofollow">libcdio-devel@...</a>
<br>> >>
<br>> >> On Mon, Apr 20, 2009 at 12:37 PM, Tong Sun <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=23297824&i=6" target="_top" rel="nofollow">suntong@...</a>> wrote:
<br>> >>>
<br>> >>> Hi Rocky,
<br>> >>>
<br>> >>> I'm looking for ways to extract the CD boot loaders. Do you know how
<br>> >>> to do it with your Device::Cdio::???? packages?
<br>> >>>
<br>> >>> FYI, I'm looking for ways to extract the CD boot loaders, mainly for
<br>> >>> Windows based bootable .iso images, since I know how to make Linux
<br>> >>> based bootable .iso images. The answer that I got was Windows based:
<br>> >>>
<br>> >>> bbie
<br>> >>> <a href="http://www.nu2.nu/bbie/" target="_top" rel="nofollow">http://www.nu2.nu/bbie/</a><br>> >>>
<br>> >>> Ref:
<br>> >>> <a href="http://www.boot-land.net/forums/index.php?showtopic=6370" target="_top" rel="nofollow">http://www.boot-land.net/forums/index.php?showtopic=6370</a><br>> >>>
<br>> >>> The reason why I need to do it is explained in
<br>> >>> <a href="http://www.boot-land.net/forums/index.php?showtopic=6372" target="_top" rel="nofollow">http://www.boot-land.net/forums/index.php?showtopic=6372</a><br>> >>>
<br>> >>> May .iso files come with size much less than 700M. So it would be a
<br>> waste
<br>> >>> of
<br>> >>> CD spaces to burn them as-is -- I want to add more files to them (then
<br>> >>> pack them up again as iso) before burning them.
<br>> >>>
<br>> >>> Also in the thread, tech details about CD bootloader:
<br>> >>>
<br>> >>> According to "El Torito" Bootable CD-ROM Format Specification,
<br>> >>> <a href="http://en.wikipedia.org/wiki/El_Torito_(CD-ROM_standard" target="_top" rel="nofollow">http://en.wikipedia.org/wiki/El_Torito_(CD-ROM_standard</a>)<<a href="http://en.wikipedia.org/wiki/El_Torito_%28CD-ROM_standard%29" target="_top" rel="nofollow">http://en.wikipedia.org/wiki/El_Torito_%28CD-ROM_standard%29</a>>
<br>> >>>
<br>> >>>
<br>> <a href="http://www.phoenix.com/NR/rdonlyres/98D3219C-9CC9-4DF5-B496-A286D893E36A/0/specscdrom.pdf" target="_top" rel="nofollow">http://www.phoenix.com/NR/rdonlyres/98D3219C-9CC9-4DF5-B496-A286D893E36A/0/specscdrom.pdf</a><br>> >>>
<br>> >>> "The "Boot Record" must reside at sector 11 (17 decimal) in the last
<br>> >>> session
<br>> >>> on the CD."
<br>> >>>
<br>> >>> Thanks for your help.
<br>> >>>
<br>> >>> tong
<br>>
<br></div><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-23191692
Re: Patch for libcdio-0.81 FreeBSD drive lock
2009-04-23T00:28:46Z
2009-04-23T00:28:46Z
r-
Patch applied. Please double check I did this correctly.
<br><br>Thanks
<br><br>On Thu, Apr 23, 2009 at 12:39 AM, John Wehle <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=23191692&i=0" target="_top" rel="nofollow">john@...</a>> wrote:
<br><div class='shrinkable-quote'><br>> A side effect of opening the cdrom device on FreeBSD is it
<br>> locks the drive. This makes cdio_get_media_changed less
<br>> useful and prevents you from being able to switch disks
<br>> when using things such as the audacious media player.
<br>>
<br>> This patch simply unlocks the drive right after it's opened
<br>> prior to opening the cam passthrough device.
<br>>
<br>> -- John Wehle
<br>> ------------------8<------------------------8<------------------------
<br>> --- lib/driver/FreeBSD/freebsd_cam.c.ORIGINAL 2008-04-24
<br>> 02:59:26.000000000 -0400
<br>> +++ lib/driver/FreeBSD/freebsd_cam.c 2009-04-21 02:46:02.000000000 -0400
<br>> @@ -122,6 +122,8 @@ init_freebsd_cam (_img_private_t *p_env)
<br>> return false;
<br>> }
<br>>
<br>> + (void)ioctl(p_env->gen.fd, CDIOCALLOW);
<br>> +
<br>> if (ioctl (p_env->gen.fd, CAMGETPASSTHRU, &p_env->ccb) < 0)
<br>> {
<br>> cdio_warn ("open: %s", strerror (errno));
<br>> -------------------------------------------------------------------------
<br>> | Feith Systems | Voice: 1-215-646-8000 | Email: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=23191692&i=1" target="_top" rel="nofollow">john@...</a> |
<br>> | John Wehle | Fax: 1-215-540-5495 | |
<br>> -------------------------------------------------------------------------
<br>>
<br>>
<br>>
<br>>
<br></div><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-23190164
Patch for libcdio-0.81 FreeBSD drive lock
2009-04-22T21:39:37Z
2009-04-22T21:39:37Z
John Wehle
A side effect of opening the cdrom device on FreeBSD is it
<br>locks the drive. This makes cdio_get_media_changed less
<br>useful and prevents you from being able to switch disks
<br>when using things such as the audacious media player.
<br><br>This patch simply unlocks the drive right after it's opened
<br>prior to opening the cam passthrough device.
<br><br>-- John Wehle
<br>------------------8<------------------------8<------------------------
<br>--- lib/driver/FreeBSD/freebsd_cam.c.ORIGINAL 2008-04-24 02:59:26.000000000 -0400
<br>+++ lib/driver/FreeBSD/freebsd_cam.c 2009-04-21 02:46:02.000000000 -0400
<br>@@ -122,6 +122,8 @@ init_freebsd_cam (_img_private_t *p_env)
<br> return false;
<br> }
<br>
<br>+ (void)ioctl(p_env->gen.fd, CDIOCALLOW);
<br>+
<br> if (ioctl (p_env->gen.fd, CAMGETPASSTHRU, &p_env->ccb) < 0)
<br> {
<br> cdio_warn ("open: %s", strerror (errno));
<br>-------------------------------------------------------------------------
<br>| Feith Systems | Voice: 1-215-646-8000 | Email: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=23190164&i=0" target="_top" rel="nofollow">john@...</a> |
<br>| John Wehle | Fax: 1-215-540-5495 | |
<br>-------------------------------------------------------------------------
<br><br><br><br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-23128550
Re: 44 bit difference
2009-04-19T16:37:51Z
2009-04-19T16:37:51Z
Cuke
yes, sorry! :)
<br><br><blockquote class="quote light-black dark-border-color"><div class="quote light-border-color">
<div class="quote-author" style="font-weight: bold;">Robert William Fuller wrote:</div>
<div class="quote-message shrinkable-quote">So it was a 44 byte difference, not a "44 bit" difference. I might have
<br>guessed something like that if you had said "bytes" instead of "bits" in
<br>the subject. It helps to be very careful when you state a problem. I'm
<br>glad to hear you solved it :-)
<br><br>Cuke wrote:
<br>> Ok so with the help of rocky i found that my program i post you didn't add
<br>> the wav header. So i just add this lines of code after the OUTFILE open:
<br>>
<br>> //Get the track size in bytes and conver
<br>> int bytes= ( i_last_lsn - i_first_lsn + 1 ) * CDIO_CD_FRAMESIZE_RAW;
<br>> cout << "Nr Bytes:" << bytes+44 << endl;
<br>>
<br>> //Open the output file
<br>> ofstream outfile ("temp.wav",ofstream::binary | ofstream::app |
<br>> ofstream::out);
<br>>
<br>> //Waw format header specification
<br>> int waweChunkLength=bytes+44-8;
<br>> int fmtChunkLength=16;
<br>> int compressionCode=1;
<br>> int numberOfChannels=2;
<br>> int sampleRate=44100;
<br>> int blockAlign=44100*2*2;
<br>> int significantBps=4;
<br>> int extraFormatBytes=16;
<br>>
<br>> outfile.write("RIFF",4);
<br>> outfile.write((char*)&waweChunkLength,4);
<br>> outfile.write("WAVEfmt ",8);
<br>> outfile.write((char*)&fmtChunkLength,4);
<br>> outfile.write((char*)&compressionCode,2);
<br>> outfile.write((char*)&numberOfChannels,2);
<br>> outfile.write((char*)&sampleRate,4);
<br>> outfile.write((char*)&blockAlign,4);
<br>> outfile.write((char*)&significantBps,2);
<br>> outfile.write((char*)&extraFormatBytes,2);
<br>> outfile.write("data",4);
<br>> outfile.write((char*)&bytes,4);
<br>>
<br>> //Track Rip
<br>> for ( i_cursor = i_first_lsn; i_cursor <= i_last_lsn; i_cursor ++) {
<br>>
<br>> Bare in mind hwr that the (char *) conversion is platform dependent and that
<br>> this changed doesn't deal with endianness.
<br>> <a href="http://www.nabble.com/file/p23128111/main.cpp" target="_top">http://www.nabble.com/file/p23128111/main.cpp</a> main.cpp i included a working
<br>> c++ source file.
<br><br><br><br>_______________________________________________
<br>Libcdio-help mailing list
<br>Libcdio-help@gnu.org
<br><a href="http://lists.gnu.org/mailman/listinfo/libcdio-help" target="_top" rel="nofollow">http://lists.gnu.org/mailman/listinfo/libcdio-help</a></div>
</div></blockquote>
<p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Help-f1707.html" embed="fixTarget[1707]" target="_top" >Gnu - Libcdio - Help</a></p>
tag:old.nabble.com,2006:post-23128516
Re: 44 bit difference
2009-04-19T16:31:18Z
2009-04-19T16:31:18Z
Robert William Fuller
So it was a 44 byte difference, not a "44 bit" difference. I might have
<br>guessed something like that if you had said "bytes" instead of "bits" in
<br>the subject. It helps to be very careful when you state a problem. I'm
<br>glad to hear you solved it :-)
<br><br>Cuke wrote:
<div class='shrinkable-quote'><br>> Ok so with the help of rocky i found that my program i post you didn't add
<br>> the wav header. So i just add this lines of code after the OUTFILE open:
<br>>
<br>> //Get the track size in bytes and conver
<br>> int bytes= ( i_last_lsn - i_first_lsn + 1 ) * CDIO_CD_FRAMESIZE_RAW;
<br>> cout << "Nr Bytes:" << bytes+44 << endl;
<br>>
<br>> //Open the output file
<br>> ofstream outfile ("temp.wav",ofstream::binary | ofstream::app |
<br>> ofstream::out);
<br>>
<br>> //Waw format header specification
<br>> int waweChunkLength=bytes+44-8;
<br>> int fmtChunkLength=16;
<br>> int compressionCode=1;
<br>> int numberOfChannels=2;
<br>> int sampleRate=44100;
<br>> int blockAlign=44100*2*2;
<br>> int significantBps=4;
<br>> int extraFormatBytes=16;
<br>>
<br>> outfile.write("RIFF",4);
<br>> outfile.write((char*)&waweChunkLength,4);
<br>> outfile.write("WAVEfmt ",8);
<br>> outfile.write((char*)&fmtChunkLength,4);
<br>> outfile.write((char*)&compressionCode,2);
<br>> outfile.write((char*)&numberOfChannels,2);
<br>> outfile.write((char*)&sampleRate,4);
<br>> outfile.write((char*)&blockAlign,4);
<br>> outfile.write((char*)&significantBps,2);
<br>> outfile.write((char*)&extraFormatBytes,2);
<br>> outfile.write("data",4);
<br>> outfile.write((char*)&bytes,4);
<br>>
<br>> //Track Rip
<br>> for ( i_cursor = i_first_lsn; i_cursor <= i_last_lsn; i_cursor ++) {
<br>>
<br>> Bare in mind hwr that the (char *) conversion is platform dependent and that
<br>> this changed doesn't deal with endianness.
<br>> <a href="http://www.nabble.com/file/p23128111/main.cpp" target="_top">http://www.nabble.com/file/p23128111/main.cpp</a> main.cpp i included a working
<br>> c++ source file.
</div><br><br><br>_______________________________________________
<br>Libcdio-help mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=23128516&i=0" target="_top" rel="nofollow">Libcdio-help@...</a>
<br><a href="http://lists.gnu.org/mailman/listinfo/libcdio-help" target="_top" rel="nofollow">http://lists.gnu.org/mailman/listinfo/libcdio-help</a><br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Help-f1707.html" embed="fixTarget[1707]" target="_top" >Gnu - Libcdio - Help</a></p>
tag:old.nabble.com,2006:post-23128111
Re: 44 bit difference
2009-04-19T15:29:46Z
2009-04-19T15:29:46Z
Cuke
Ok so with the help of rocky i found that my program i post you didn't add the wav header. So i just add this lines of code after the OUTFILE open:
<br><br> //Get the track size in bytes and conver
<br> int bytes= ( i_last_lsn - i_first_lsn + 1 ) * CDIO_CD_FRAMESIZE_RAW;
<br> cout << "Nr Bytes:" << bytes+44 << endl;
<br>
<br> //Open the output file
<br> ofstream outfile ("temp.wav",ofstream::binary | ofstream::app | ofstream::out);
<br>
<br> //Waw format header specification
<br> int waweChunkLength=bytes+44-8;
<br> int fmtChunkLength=16;
<br> int compressionCode=1;
<br> int numberOfChannels=2;
<br> int sampleRate=44100;
<br> int blockAlign=44100*2*2;
<br> int significantBps=4;
<br> int extraFormatBytes=16;
<br>
<br> outfile.write("RIFF",4);
<br> outfile.write((char*)&waweChunkLength,4);
<br> outfile.write("WAVEfmt ",8);
<br> outfile.write((char*)&fmtChunkLength,4);
<br> outfile.write((char*)&compressionCode,2);
<br> outfile.write((char*)&numberOfChannels,2);
<br> outfile.write((char*)&sampleRate,4);
<br> outfile.write((char*)&blockAlign,4);
<br> outfile.write((char*)&significantBps,2);
<br> outfile.write((char*)&extraFormatBytes,2);
<br> outfile.write("data",4);
<br> outfile.write((char*)&bytes,4);
<br><br> //Track Rip
<br> for ( i_cursor = i_first_lsn; i_cursor <= i_last_lsn; i_cursor ++) {
<br><br>Bare in mind hwr that the (char *) conversion is platform dependent and that this changed doesn't deal with endianness. <a href="http://old.nabble.com/file/p23128111/main.cpp" target="_top">main.cpp</a> i included a working c++ source file.<p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Help-f1707.html" embed="fixTarget[1707]" target="_top" >Gnu - Libcdio - Help</a></p>
tag:old.nabble.com,2006:post-23082304
Re: 44 bit difference
2009-04-16T10:05:15Z
2009-04-16T10:05:15Z
Cuke
if you need more info i'm here!
<br><blockquote class="quote light-black dark-border-color"><div class="quote light-border-color">
<div class="quote-author" style="font-weight: bold;">Cuke wrote:</div>
<div class="quote-message shrinkable-quote">my extracted audio track differ from the cd-paranoia's one of 44bit.My track isn't played either..this is the i use for extraction. the qdebug() function is just for display debug info in qt project. where i'm mistaking?
<br><br>cdrom_drive_t *d = NULL;
<br> char **ppsz_cd_drives;
<br><br> ppsz_cd_drives = cdio_get_devices_with_cap(NULL, CDIO_FS_AUDIO, false);
<br><br> if (ppsz_cd_drives) {
<br> d=cdda_identify(*ppsz_cd_drives, 1, NULL);
<br> }else{
<br> qDebug() << "Unable to access to a cdrom with audio cd in it";
<br> return;
<br> }
<br><br> cdio_free_device_list(ppsz_cd_drives);
<br><br> if ( !d ) {
<br> qDebug() << "Unable to identify audio CD disc.\n";
<br> return;
<br> }
<br><br> cdda_verbose_set(d, CDDA_MESSAGE_PRINTIT, CDDA_MESSAGE_PRINTIT);
<br><br> if ( 0 != cdda_open(d) ) {
<br> qDebug() << "Unable to open disc.\n";
<br> return;
<br> }
<br><br> cdrom_paranoia_t* p = cdio_paranoia_init(d);
<br> lsn_t i_first_lsn = cdda_disc_firstsector(d);
<br><br> if ( -1 == i_first_lsn ) {
<br> qDebug() << "Trouble getting starting LSN\n";
<br> }
<br> else {
<br> lsn_t i_cursor;
<br> track_t i_track = cdda_sector_gettrack(d, i_first_lsn);
<br> lsn_t i_last_lsn = cdda_track_lastsector(d, i_track);
<br><br> //paranoia_modeset(p, PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP);
<br> paranoia_seek(p, i_first_lsn, SEEK_SET);
<br><br> qDebug() << i_first_lsn << "-" << i_last_lsn;
<br><br> QFile file(tr("outtrack.wav"));
<br> if(!file.open(QIODevice::WriteOnly|QIODevice::Append)){
<br> qDebug() << "impossibile aprire il file di scrittura";
<br> }
<br> for ( i_cursor = i_first_lsn; i_cursor <= i_last_lsn; i_cursor ++) {
<br><br> int16_t *p_readbuf=paranoia_read(p, NULL);
<br> char *psz_err=cdda_errors(d);
<br> char *psz_mes=cdda_messages(d);
<br><br> if (psz_mes || psz_err)
<br> qDebug() << psz_err << psz_mes;
<br> if (psz_err) free(psz_err);
<br> if (psz_mes) free(psz_mes);
<br> if( !p_readbuf ) {
<br> qDebug() << "paranoia read error. Stopping.\n";
<br> break;
<br> }
<br><br> char *temp= (char*) p_readbuf;
<br> file.write(temp,(qint64)CDIO_CD_FRAMESIZE_RAW);
<br> }
<br> file.close();
<br><br><br> qDebug() << i_first_lsn << "\t" << i_last_lsn ;
<br> qDebug() << cdda_track_firstsector(d,i_track);
<br> }
<br> paranoia_free(p);
<br><br> cdda_close(d);
<br><br> return;
</div>
</div></blockquote>
<p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Help-f1707.html" embed="fixTarget[1707]" target="_top" >Gnu - Libcdio - Help</a></p>
tag:old.nabble.com,2006:post-23065170
44 bit difference
2009-04-15T12:06:40Z
2009-04-15T12:06:40Z
Cuke
my extracted audio track differ from the cd-paranoia's one of 44bit.My track isn't played either..this is the i use for extraction. the qdebug() function is just for display debug info in qt project. where i'm mistaking?
<br><br>cdrom_drive_t *d = NULL;
<br> char **ppsz_cd_drives;
<br><br> ppsz_cd_drives = cdio_get_devices_with_cap(NULL, CDIO_FS_AUDIO, false);
<br><br> if (ppsz_cd_drives) {
<br> d=cdda_identify(*ppsz_cd_drives, 1, NULL);
<br> }else{
<br> qDebug() << "Unable to access to a cdrom with audio cd in it";
<br> return;
<br> }
<br><br> cdio_free_device_list(ppsz_cd_drives);
<br><br> if ( !d ) {
<br> qDebug() << "Unable to identify audio CD disc.\n";
<br> return;
<br> }
<br><br> cdda_verbose_set(d, CDDA_MESSAGE_PRINTIT, CDDA_MESSAGE_PRINTIT);
<br><br> if ( 0 != cdda_open(d) ) {
<br> qDebug() << "Unable to open disc.\n";
<br> return;
<br> }
<br><br> cdrom_paranoia_t* p = cdio_paranoia_init(d);
<br> lsn_t i_first_lsn = cdda_disc_firstsector(d);
<br><br> if ( -1 == i_first_lsn ) {
<br> qDebug() << "Trouble getting starting LSN\n";
<br> }
<br> else {
<br> lsn_t i_cursor;
<br> track_t i_track = cdda_sector_gettrack(d, i_first_lsn);
<br> lsn_t i_last_lsn = cdda_track_lastsector(d, i_track);
<br><br> //paranoia_modeset(p, PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP);
<br> paranoia_seek(p, i_first_lsn, SEEK_SET);
<br><br> qDebug() << i_first_lsn << "-" << i_last_lsn;
<br><br> QFile file(tr("outtrack.wav"));
<br> if(!file.open(QIODevice::WriteOnly|QIODevice::Append)){
<br> qDebug() << "impossibile aprire il file di scrittura";
<br> }
<br> for ( i_cursor = i_first_lsn; i_cursor <= i_last_lsn; i_cursor ++) {
<br><br> int16_t *p_readbuf=paranoia_read(p, NULL);
<br> char *psz_err=cdda_errors(d);
<br> char *psz_mes=cdda_messages(d);
<br><br> if (psz_mes || psz_err)
<br> qDebug() << psz_err << psz_mes;
<br> if (psz_err) free(psz_err);
<br> if (psz_mes) free(psz_mes);
<br> if( !p_readbuf ) {
<br> qDebug() << "paranoia read error. Stopping.\n";
<br> break;
<br> }
<br><br> char *temp= (char*) p_readbuf;
<br> file.write(temp,(qint64)CDIO_CD_FRAMESIZE_RAW);
<br> }
<br> file.close();
<br><br><br> qDebug() << i_first_lsn << "\t" << i_last_lsn ;
<br> qDebug() << cdda_track_firstsector(d,i_track);
<br> }
<br> paranoia_free(p);
<br><br> cdda_close(d);
<br><br> return; <p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Help-f1707.html" embed="fixTarget[1707]" target="_top" >Gnu - Libcdio - Help</a></p>
tag:old.nabble.com,2006:post-22612507
Re: Burning functionality
2009-03-19T17:53:15Z
2009-03-19T17:53:15Z
Rocky Bernstein
Many thanks for bringing this to our attention and also, of course,
<br>for writing the software.
<br><br>Since burning capability was requested by rms (the self-proclaimed
<br>chief GNUsense), this has high visibility. So I imagine someone from
<br>FSF or GNU will be contacting you in the near future.
<br><br>Thanks again.
<br><br>2009/3/19 Mario <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=22612507&i=0" target="_top" rel="nofollow">mario.danic@...</a>>:
<div class='shrinkable-quote'><br>> Hello,
<br>>
<br>> my name is Mario Đanić, and I am the founder of libburnia project (
<br>> <a href="http://libburnia-project.org" target="_top" rel="nofollow">http://libburnia-project.org</a>)
<br>> which provides burning-related libraries and drop-in replacement for
<br>> cdrecord. I noticed
<br>> that you want to extend libcdio to support burning, so thought you might
<br>> wanna know about this. Open to
<br>> further discussions and talks.
<br>>
<br>> Cheers,
<br>> M.
<br>>
</div><br><br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-22597808
Burning functionality
2009-03-19T03:57:02Z
2009-03-19T03:57:02Z
Mario Đanić
Hello,
<br><br>my name is Mario Đanić, and I am the founder of libburnia project (
<br><a href="http://libburnia-project.org" target="_top" rel="nofollow">http://libburnia-project.org</a>)
<br>which provides burning-related libraries and drop-in replacement for
<br>cdrecord. I noticed
<br>that you want to extend libcdio to support burning, so thought you might
<br>wanna know about this. Open to
<br>further discussions and talks.
<br><br>Cheers,
<br>M.
<br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-22315783
Re: Windows Java wrapper for libcdio
2009-03-03T11:18:49Z
2009-03-03T11:18:49Z
Mikael Barbeaux
Hello,
<br><br>Thanks for your answer, Rocky.
<br>Unfortunately, after checking XBMC binary packages, I couldn't find any dlls
<br>to libcdio.
<br>But after some searches on Google, I finally found a project that uses
<br>libcdio and made win32 dll from it : it's called Virtual Jaguar. If anyone
<br>are interested about libcdio.dll, you can find it there :
<br><a href="http://www.xs4all.nl/~shalafi/" target="_top" rel="nofollow">http://www.xs4all.nl/~shalafi/</a><br><br>Enjoy,
<br>M.
<br><br>2009/3/1 Rocky Bernstein <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=22315783&i=0" target="_top" rel="nofollow">rocky@...</a>>
<br><div class='shrinkable-quote'><br>> XBMC MEDIA CENTER <a href="http://xbmc.org/" target="_top" rel="nofollow">http://xbmc.org/</a> has I think a windows DLL and an (old?)
<br>> version of libcdio that compiles with a number of Microsoft compilers.
<br>>
<br>> Good luck!
<br>>
<br>> On Sun, Mar 1, 2009 at 4:18 AM, Mikael Barbeaux <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=22315783&i=1" target="_top" rel="nofollow">mbarbeaux@...</a>>
<br>> wrote:
<br>>
<br>> > Hello to everyone,
<br>> >
<br>> > Recently I worked on a project that aims to build a CD-DA player in Java.
<br>> > Actually it's impossible using purely Java to access the CD-ROM layer, so
<br>> I
<br>> > decided to use a wrapper to libcdio in order to make it.
<br>> > It works very well on Linux and MacOSX. But I tried to use it under
<br>> > Windows,
<br>> > and that's quite harder... I began to use Cygwin (which I know well) to
<br>> > compile libcdio : it worked, but I obtained a static library. When
<br>> > converting it into a static dll library and then use it in Java,
<br>> something
<br>> > wrong happen. So I gave up that solution, as the dll must be packaged
<br>> with
<br>> > cygwin ones.
<br>> > I tried to use MinGW to compile libcdio, but I must admit that even if
<br>> > MinGW
<br>> > looks promising, it's totally crap and user unfriendly.
<br>> >
<br>> > My question is: is there any libcdio windows binary packages ? All I need
<br>> > is
<br>> > a shared dll library in order to use it under Windows with Java.
<br>> > I tried to look projects which uses libcdio, such as VLC or mplayer, but
<br>> I
<br>> > couldn't find any libcdio windows library.
<br>> > Any idea ? Or a good tutorial about using MinGW to compile libcdio ?
<br>> > Or perhaps there are other way to compile libcdio under Windows ?
<br>> >
<br>> > Thanks for your help,
<br>> > M.
<br>> >
<br>>
</div><br><br><br>--
<br>Barbeaux Mikael
<br>Ingénieur SI - Spécialité J2EE
<br>---------------------------------------------------------
<br>Ippon Technologies
<br>3 rue Bellanger
<br>92300 LEVALLOIS PERRET
<br><br>Tél: 01.60.53.82.01 (client PROVERA)
<br>Port: 06.18.85.00.73
<br>www.ippon.fr
<br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-22271589
Re: Windows Java wrapper for libcdio
2009-03-01T02:26:33Z
2009-03-01T02:26:33Z
r-
XBMC MEDIA CENTER <a href="http://xbmc.org/" target="_top" rel="nofollow">http://xbmc.org/</a> has I think a windows DLL and an (old?)
<br>version of libcdio that compiles with a number of Microsoft compilers.
<br><br>Good luck!
<br><br>On Sun, Mar 1, 2009 at 4:18 AM, Mikael Barbeaux <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=22271589&i=0" target="_top" rel="nofollow">mbarbeaux@...</a>> wrote:
<br><div class='shrinkable-quote'><br>> Hello to everyone,
<br>>
<br>> Recently I worked on a project that aims to build a CD-DA player in Java.
<br>> Actually it's impossible using purely Java to access the CD-ROM layer, so I
<br>> decided to use a wrapper to libcdio in order to make it.
<br>> It works very well on Linux and MacOSX. But I tried to use it under
<br>> Windows,
<br>> and that's quite harder... I began to use Cygwin (which I know well) to
<br>> compile libcdio : it worked, but I obtained a static library. When
<br>> converting it into a static dll library and then use it in Java, something
<br>> wrong happen. So I gave up that solution, as the dll must be packaged with
<br>> cygwin ones.
<br>> I tried to use MinGW to compile libcdio, but I must admit that even if
<br>> MinGW
<br>> looks promising, it's totally crap and user unfriendly.
<br>>
<br>> My question is: is there any libcdio windows binary packages ? All I need
<br>> is
<br>> a shared dll library in order to use it under Windows with Java.
<br>> I tried to look projects which uses libcdio, such as VLC or mplayer, but I
<br>> couldn't find any libcdio windows library.
<br>> Any idea ? Or a good tutorial about using MinGW to compile libcdio ?
<br>> Or perhaps there are other way to compile libcdio under Windows ?
<br>>
<br>> Thanks for your help,
<br>> M.
<br>>
<br></div><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-22271139
Windows Java wrapper for libcdio
2009-03-01T01:18:32Z
2009-03-01T01:18:32Z
Mikael Barbeaux
Hello to everyone,
<br><br>Recently I worked on a project that aims to build a CD-DA player in Java.
<br>Actually it's impossible using purely Java to access the CD-ROM layer, so I
<br>decided to use a wrapper to libcdio in order to make it.
<br>It works very well on Linux and MacOSX. But I tried to use it under Windows,
<br>and that's quite harder... I began to use Cygwin (which I know well) to
<br>compile libcdio : it worked, but I obtained a static library. When
<br>converting it into a static dll library and then use it in Java, something
<br>wrong happen. So I gave up that solution, as the dll must be packaged with
<br>cygwin ones.
<br>I tried to use MinGW to compile libcdio, but I must admit that even if MinGW
<br>looks promising, it's totally crap and user unfriendly.
<br><br>My question is: is there any libcdio windows binary packages ? All I need is
<br>a shared dll library in order to use it under Windows with Java.
<br>I tried to look projects which uses libcdio, such as VLC or mplayer, but I
<br>couldn't find any libcdio windows library.
<br>Any idea ? Or a good tutorial about using MinGW to compile libcdio ?
<br>Or perhaps there are other way to compile libcdio under Windows ?
<br><br>Thanks for your help,
<br>M.
<br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-22132538
Re: making the @copying visible in the HTML manual
2009-02-20T19:47:02Z
2009-02-20T19:47:02Z
r-
I've applied the patch you suggest in git. Although the patch applied
<br>somewhat cleanly and I think I see the effect, please double-check that I've
<br>done this correctly.
<br><br>Thanks.
<br><br>On Wed, Feb 18, 2009 at 1:50 AM, Jesse W <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=22132538&i=0" target="_top" rel="nofollow">jessw@...</a>> wrote:
<br><div class='shrinkable-quote'><br>> I noticed that the libcdio manual, like many of the other GNU manuals,
<br>> doesn't display its license grant (@copying in texinfo) in the rendered
<br>> HTML. For clarity, it would be better to make it visible. I've just
<br>> been working with the Emacs project (
<br>> <a href="http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=1988" target="_top" rel="nofollow">http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=1988</a> ) on
<br>> this issue, and the manintainer, Karl, suggested I work though the list
<br>> of other GNU projects as well. Below is a patch to fix this. Let me know
<br>> if I can be of any other help, or if I should send this elsewhere, or
<br>> in another format.
<br>>
<br>> Jesse Weinstein
<br>>
<br>> *** /Users/jesse/Desktop/libcdio.texi.orig Tue Feb 17 22:44:54 2009
<br>> --- /Users/jesse/Desktop/libcdio.texi Tue Feb 17 22:45:27 2009
<br>> ***************
<br>> *** 61,68 ****
<br>> @node Top
<br>> @top GNU @value{libcdio}
<br>>
<br>> ! This manual documents @value{libcdio}, the GNU CD Input and Control
<br>> ! Library.
<br>>
<br>> @menu
<br>> * History:: How this came about
<br>> --- 61,67 ----
<br>> @node Top
<br>> @top GNU @value{libcdio}
<br>>
<br>> ! @insertcopying
<br>>
<br>> @menu
<br>> * History:: How this came about
<br>>
<br>>
<br>>
<br>>
<br></div><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-22086914
making the @copying visible in the HTML manual
2009-02-17T22:50:43Z
2009-02-17T22:50:43Z
Jesse Weinstein
I noticed that the libcdio manual, like many of the other GNU manuals,
<br>doesn't display its license grant (@copying in texinfo) in the rendered
<br>HTML. For clarity, it would be better to make it visible. I've just
<br>been working with the Emacs project (
<br><a href="http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=1988" target="_top" rel="nofollow">http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=1988</a> ) on
<br>this issue, and the manintainer, Karl, suggested I work though the list
<br>of other GNU projects as well. Below is a patch to fix this. Let me
<br>know
<br>if I can be of any other help, or if I should send this elsewhere, or
<br>in another format.
<br><br>Jesse Weinstein
<br><br>*** /Users/jesse/Desktop/libcdio.texi.orig Tue Feb 17 22:44:54 2009
<br>--- /Users/jesse/Desktop/libcdio.texi Tue Feb 17 22:45:27 2009
<br>***************
<br>*** 61,68 ****
<br> @node Top
<br> @top GNU @value{libcdio}
<br><br>! This manual documents @value{libcdio}, the GNU CD Input and Control
<br>! Library.
<br><br> @menu
<br> * History:: How this came about
<br>--- 61,67 ----
<br> @node Top
<br> @top GNU @value{libcdio}
<br><br>! @insertcopying
<br><br> @menu
<br> * History:: How this came about
<br><br><br><br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-22019525
Re: [PATCH] OS/2 support
2009-02-14T19:40:06Z
2009-02-14T19:40:06Z
KO Myung-Hun
Hi/2.
<br><br>Rocky Bernstein wrote:
<div class='shrinkable-quote'><br>> The iconv.m4 file that is used comes from the gettext version 0.17 package.
<br>> I checked and it is exactly the same as in that source distribution with no
<br>> modifications. Is it possible you are not using the latest version of
<br>> gettext?
<br>>
<br>> Gettext claims to compile out of the box for OS/2. If you are using the
<br>> latest version of gettext and still think there is an error in that m4 file,
<br>> you should file a report in that package.
<br>>
<br>> See the gettext's README for where to send your comments and bug reports.
<br>>
<br>> In the event that the bug is acknowledged by gettext but somehow libcdio is
<br>> to release before gettext, we add soon-to-be-released m4 file form gettext.
<br>> But failing that I don't think it wise to change libcdio's copy of iconv.m4.
<br>>
<br>>
<br>>
</div><br>Ok. I'll try that.
<br><br>But I have a question. Do you have HAVE_ICONV defined in config.h when
<br>launching 'autogen.sh' ?
<br><br>If iconv.m4 is wrong, you should also have HAVE_ICONV undefined.
<br><br>Otherwise, there seems to be a problem in other place.
<br><br>--
<br>KO Myung-Hun
<br><br>Using Mozilla SeaMonkey 1.1.14
<br>Under OS/2 Warp 4 for Korean with FixPak #15
<br>On AMD ThunderBird 1 GHz with 512 MB RAM
<br><br>Korean OS/2 User Community : <a href="http://www.ecomstation.co.kr" target="_top" rel="nofollow">http://www.ecomstation.co.kr</a><br><br><br><br><br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-22013589
Re: Re: [PATCH] OS/2 support
2009-02-14T07:12:40Z
2009-02-14T07:12:40Z
r-
The iconv.m4 file that is used comes from the gettext version 0.17 package.
<br>I checked and it is exactly the same as in that source distribution with no
<br>modifications. Is it possible you are not using the latest version of
<br>gettext?
<br><br>Gettext claims to compile out of the box for OS/2. If you are using the
<br>latest version of gettext and still think there is an error in that m4 file,
<br>you should file a report in that package.
<br><br>See the gettext's README for where to send your comments and bug reports.
<br><br>In the event that the bug is acknowledged by gettext but somehow libcdio is
<br>to release before gettext, we add soon-to-be-released m4 file form gettext.
<br>But failing that I don't think it wise to change libcdio's copy of iconv.m4.
<br><br><br>On Sat, Feb 14, 2009 at 6:37 AM, KO Myung-Hun <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=22013589&i=0" target="_top" rel="nofollow">komh@...</a>> wrote:
<br><div class='shrinkable-quote'><br>> Hi/2.
<br>>
<br>> Rocky Bernstein wrote:
<br>>
<br>>> Sorry for the delay. The OS2 patches should now be in the libcdio git
<br>>> repository.
<br>>>
<br>>> I had some problems applying the patch. (Patch wants the original listed
<br>>> first, not second and it would have been helpful to attach this as a
<br>>> separate file).
<br>>>
<br>>> I have no way to check whether these changes work. So please double check
<br>>> my
<br>>> work. (I often make mistakes ;-)
<br>>>
<br>>>
<br>>>
<br>>
<br>> I've checked and it works fine. Thanks. ^^
<br>>
<br>> But I think m4/iconv.m4 should be modified.
<br>>
<br>> returning 1 means error, so it should be checked with '(size_t)(-1)' not
<br>> '0'.
<br>>
<br>> --
<br>> KO Myung-Hun
<br>>
<br>> Using Mozilla SeaMonkey 1.1.14
<br>> Under OS/2 Warp 4 for Korean with FixPak #15
<br>> On AMD ThunderBird 1 GHz with 512 MB RAM
<br>>
<br>> Korean OS/2 User Community : <a href="http://www.ecomstation.co.kr" target="_top" rel="nofollow">http://www.ecomstation.co.kr</a><br>>
<br>>
<br>>
<br>> diff -buNr m4/iconv.m4.org m4/iconv.m4
<br>> --- m4/iconv.m4.org 2009-02-14 15:29:42.000000000 +0900
<br>> +++ m4/iconv.m4 2009-02-14 20:21:50.000000000 +0900
<br>> @@ -83,7 +83,7 @@
<br>> size_t res = iconv (cd_utf8_to_88591,
<br>> (char **) &inptr, &inbytesleft,
<br>> &outptr, &outbytesleft);
<br>> - if (res == 0)
<br>> + if (res == (size_t)(-1))
<br>> return 1;
<br>> }
<br>> }
<br>>
<br>>
<br></div><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-22011803
Re: [PATCH] OS/2 support
2009-02-14T03:37:02Z
2009-02-14T03:37:02Z
KO Myung-Hun
Hi/2.
<br><br>Rocky Bernstein wrote:
<div class='shrinkable-quote'><div class='shrinkable-quote'><br>> Sorry for the delay. The OS2 patches should now be in the libcdio git
<br>> repository.
<br>>
<br>> I had some problems applying the patch. (Patch wants the original listed
<br>> first, not second and it would have been helpful to attach this as a
<br>> separate file).
<br>>
<br>> I have no way to check whether these changes work. So please double check my
<br>> work. (I often make mistakes ;-)
<br>>
<br>>
</div></div>I've checked and it works fine. Thanks. ^^
<br><br>But I think m4/iconv.m4 should be modified.
<br><br>returning 1 means error, so it should be checked with '(size_t)(-1)' not
<br>'0'.
<br><br>--
<br>KO Myung-Hun
<br><br>Using Mozilla SeaMonkey 1.1.14
<br>Under OS/2 Warp 4 for Korean with FixPak #15
<br>On AMD ThunderBird 1 GHz with 512 MB RAM
<br><br>Korean OS/2 User Community : <a href="http://www.ecomstation.co.kr" target="_top" rel="nofollow">http://www.ecomstation.co.kr</a><br><br><br><br />diff -buNr m4/iconv.m4.org m4/iconv.m4
<br>--- m4/iconv.m4.org 2009-02-14 15:29:42.000000000 +0900
<br>+++ m4/iconv.m4 2009-02-14 20:21:50.000000000 +0900
<br>@@ -83,7 +83,7 @@
<br> size_t res = iconv (cd_utf8_to_88591,
<br> (char **) &inptr, &inbytesleft,
<br> &outptr, &outbytesleft);
<br>- if (res == 0)
<br>+ if (res == (size_t)(-1))
<br> return 1;
<br> }
<br> }
<br><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>
tag:old.nabble.com,2006:post-21897913
Re: [PATCH] OS/2 support
2009-02-08T02:59:10Z
2009-02-08T02:59:10Z
r-
Sorry for the delay. The OS2 patches should now be in the libcdio git
<br>repository.
<br><br>I had some problems applying the patch. (Patch wants the original listed
<br>first, not second and it would have been helpful to attach this as a
<br>separate file).
<br><br>I have no way to check whether these changes work. So please double check my
<br>work. (I often make mistakes ;-)
<br><br>Thanks.
<br><br>On Mon, Jan 12, 2009 at 8:31 AM, KO Myung-Hun <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=21897913&i=0" target="_top" rel="nofollow">komh@...</a>> wrote:
<br><div class='shrinkable-quote'><br>> Hi/2.
<br>>
<br>> These patches add a OS/2 driver for libcdio-0.81.
<br>>
<br>> Review, please.
<br>>
<br>> --
<br>> KO Myung-Hun
<br>>
<br>> Using Mozilla SeaMonkey 1.1.14
<br>> Under OS/2 Warp 4 for Korean with FixPak #15
<br>> On AMD ThunderBird 1 GHz with 512 MB RAM
<br>>
<br>> Korean OS/2 User Community : <a href="http://www.ecomstation.co.kr" target="_top" rel="nofollow">http://www.ecomstation.co.kr</a><br>>
<br>>
<br>>
<br>> diff -buNr configure.ac.org configure.ac
<br>> --- configure.ac.org 2008-10-26 23:48:24.000000000 +0900
<br>> +++ configure.ac 2009-01-09 02:09:10.000000000 +0900
<br>> @@ -529,6 +529,13 @@
<br>> # LIBS="$LIBS -lcam"
<br>> cd_drivers="${cd_drivers}, NetBSD "
<br>> ;;
<br>> + os2*)
<br>> + AC_DEFINE([HAVE_OS2_CDROM], [1],
<br>> + [Define 1 if you have OS/2 CD-ROM support])
<br>> + LT_NO_UNDEFINED="-no-undefined"
<br>> + LDFLAGS="$LDFLAGS -Zbin-files"
<br>> + cd_drivers="${cd_drivers}, OS2 "
<br>> + ;;
<br>> *)
<br>> AC_MSG_WARN([Don't have OS CD-reading support for ${host_os}...])
<br>> AC_MSG_WARN([Will use generic support.])
<br>> @@ -563,6 +570,7 @@
<br>> AC_SUBST(HAVE_LINUX_CDROM)
<br>> AC_SUBST(HAVE_SOLARIS_CDROM)
<br>> AC_SUBST(HAVE_WIN32_CDROM)
<br>> +AC_SUBST(HAVE_OS2_CDROM)
<br>>
<br>> LIBCDIO_SOURCE_PATH="`pwd`"
<br>> AC_DEFINE_UNQUOTED(LIBCDIO_SOURCE_PATH, "$LIBCDIO_SOURCE_PATH",
<br>> diff -buNr include/cdio/device.h.org include/cdio/device.h
<br>> --- include/cdio/device.h.org 2008-03-27 18:28:36.000000000 +0900
<br>> +++ include/cdio/device.h 2009-01-12 22:05:00.000000000 +0900
<br>> @@ -159,6 +159,7 @@
<br>> DRIVER_OSX, /**< Apple OSX Driver */
<br>> DRIVER_WIN32, /**< Microsoft Windows Driver. Includes ASPI and
<br>> ioctl access. */
<br>> + DRIVER_OS2, /**< OS/2 Driver */
<br>> DRIVER_NETBSD, /**< NetBSD Driver. */
<br>> DRIVER_CDRDAO, /**< cdrdao format CD image. This is listed
<br>> before BIN/CUE, to make the code prefer cdrdao
<br>> @@ -810,6 +811,44 @@
<br>>
<br>> char **cdio_get_devices_win32(void);
<br>>
<br>> + /*! Set up CD-ROM for reading using the IBM OS/2 driver. The
<br>> + device_name is the some sort of device name.
<br>> +
<br>> + NULL is returned on error or there is no OS/2 driver.
<br>> +
<br>> + In some situations of drivers or OS's we can't find a CD device if
<br>> + there is no media in it and it is possible for this routine to return
<br>> + NULL even though there may be a hardware CD-ROM.
<br>> +
<br>> + @see cdio_open_cd, cdio_open
<br>> + */
<br>> + CdIo_t * cdio_open_os2 (const char *psz_source);
<br>> +
<br>> + /*! Set up CD-ROM for reading using the IBM OS/2 driver. The
<br>> + device_name is the some sort of device name.
<br>> +
<br>> + NULL is returned on error or there is no OS/2 driver.
<br>> +
<br>> + @see cdio_open_cd, cdio_open
<br>> + */
<br>> + CdIo_t * cdio_open_am_os2 (const char *psz_source,
<br>> + const char *psz_access_mode);
<br>> +
<br>> + /*! Return a string containing the default device name that the
<br>> + OS/2 driver would use when none is specified. A scan is made
<br>> + for CD-ROM drives with CDs in them.
<br>> +
<br>> + In some situations of drivers or OS's we can't find a CD device if
<br>> + there is no media in it and it is possible for this routine to return
<br>> + NULL even though there may be a hardware CD-ROM.
<br>> + */
<br>> + char * cdio_get_default_device_os2(void);
<br>> +
<br>> + /*! Return a list of all of the CD-ROM devices that the OS/2 driver
<br>> + can find.
<br>> + */
<br>> + char **cdio_get_devices_os2(void);
<br>> +
<br>> /*! Set up CD-ROM for reading using the Nero driver. The
<br>> device_name is the some sort of device name.
<br>>
<br>> diff -buNr lib/cdda_interface/common_interface.h.orglib/cdda_interface/common_interface.h
<br>> --- lib/cdda_interface/common_interface.h.org 2008-04-23
<br>> 23:59:52.000000000 +0900
<br>> +++ lib/cdda_interface/common_interface.h 2009-01-09
<br>> 01:59:08.000000000 +0900
<br>> @@ -28,7 +28,7 @@
<br>> #include <cdio/types.h>
<br>> #include "low_interface.h"
<br>>
<br>> -#if defined(HAVE_LSTAT) && !defined(HAVE_WIN32_CDROM)
<br>> +#if defined(HAVE_LSTAT) && !defined(HAVE_WIN32_CDROM) &&
<br>> !defined(HAVE_OS2_CDROM)
<br>> /* Define this if the CD-ROM device is a file in the filesystem
<br>> that can be lstat'd
<br>> */
<br>> diff -buNr lib/driver/cdio_private.h.org lib/driver/cdio_private.h
<br>> --- lib/driver/cdio_private.h.org 2008-04-23 23:59:52.000000000
<br>> +0900
<br>> +++ lib/driver/cdio_private.h 2009-01-12 22:05:42.000000000 +0900
<br>> @@ -488,6 +488,7 @@
<br>> driver_return_code_t close_tray_osx (const char *psz_drive);
<br>> driver_return_code_t close_tray_solaris (const char *psz_drive);
<br>> driver_return_code_t close_tray_win32 (const char *psz_drive);
<br>> + driver_return_code_t close_tray_os2 (const char *psz_drive);
<br>>
<br>> bool cdio_have_netbsd(void);
<br>> CdIo_t * cdio_open_netbsd (const char *psz_source);
<br>> @@ -531,6 +532,10 @@
<br>> True if Microsoft Windows driver is available. */
<br>> bool cdio_have_win32 (void);
<br>>
<br>> + /*! DEPRICATED: use cdio_have_driver().
<br>> + True if IBM OS/2 driver is available. */
<br>> + bool cdio_have_os2 (void);
<br>> +
<br>> /*! True if Nero driver is available. */
<br>> bool cdio_have_nrg (void);
<br>>
<br>> diff -buNr lib/driver/device.c.org lib/driver/device.c
<br>> --- lib/driver/device.c.org 2008-04-23 23:59:52.000000000 +0900
<br>> +++ lib/driver/device.c 2009-01-09 01:59:08.000000000 +0900
<br>> @@ -71,6 +71,8 @@
<br>> const driver_id_t cdio_os_driver = DRIVER_SOLARIS;
<br>> #elif HAVE_DARWIN_WIN32
<br>> const driver_id_t cdio_os_driver = DRIVER_WIN32;
<br>> +#elif HAVE_OS2_CDROM
<br>> +const driver_id_t cdio_os_driver = DRIVER_OS2;
<br>> #else
<br>> const driver_id_t cdio_os_driver = DRIVER_UNKNOWN;
<br>> #endif
<br>> @@ -213,6 +215,19 @@
<br>> &close_tray_win32
<br>> },
<br>>
<br>> + {DRIVER_OS2,
<br>> + CDIO_SRC_IS_DEVICE_MASK|CDIO_SRC_IS_NATIVE_MASK|CDIO_SRC_IS_SCSI_MASK,
<br>> + "OS2",
<br>> + "IBM OS/2 driver",
<br>> + &cdio_have_os2,
<br>> + &cdio_open_os2,
<br>> + &cdio_open_am_os2,
<br>> + &cdio_get_default_device_os2,
<br>> + &cdio_is_device_os2,
<br>> + &cdio_get_devices_os2,
<br>> + &close_tray_os2
<br>> + },
<br>> +
<br>> {DRIVER_CDRDAO,
<br>> CDIO_SRC_IS_DISK_IMAGE_MASK,
<br>> "CDRDAO",
<br>> @@ -939,6 +954,7 @@
<br>> case DRIVER_SOLARIS:
<br>> case DRIVER_WIN32:
<br>> case DRIVER_OSX:
<br>> + case DRIVER_OS2:
<br>> case DRIVER_NRG:
<br>> case DRIVER_BINCUE:
<br>> case DRIVER_CDRDAO:
<br>> diff -buNr lib/driver/generic.h.org lib/driver/generic.h
<br>> --- lib/driver/generic.h.org 2008-04-23 23:59:52.000000000 +0900
<br>> +++ lib/driver/generic.h 2009-01-09 02:26:50.000000000 +0900
<br>> @@ -134,6 +134,12 @@
<br>> */
<br>> bool cdio_is_device_win32(const char *source_name);
<br>>
<br>> + /*!
<br>> + Return true if source_name could be a device containing a CD-ROM on
<br>> + OS/2
<br>> + */
<br>> + bool cdio_is_device_os2(const char *source_name);
<br>> +
<br>>
<br>> /*!
<br>> Return true if source_name could be a device containing a CD-ROM on
<br>> diff -buNr lib/driver/Makefile.am.org lib/driver/Makefile.am
<br>> --- lib/driver/Makefile.am.org 2008-10-19 18:25:30.000000000 +0900
<br>> +++ lib/driver/Makefile.am 2009-01-06 12:42:40.000000000 +0900
<br>> @@ -90,6 +90,7 @@
<br>> MSWindows/win32.h \
<br>> netbsd.c \
<br>> osx.c \
<br>> + os2.c \
<br>> read.c \
<br>> sector.c \
<br>> solaris.c \
<br>> diff -buNr lib/driver/os2.c.org lib/driver/os2.c
<br>> --- lib/driver/os2.c.org 2009-01-09 23:57:26.000000000 +0900
<br>> +++ lib/driver/os2.c 2009-01-11 17:49:36.000000000 +0900
<br>> @@ -0,0 +1,1554 @@
<br>> +/*
<br>> + $Id: os2.c,v 1.30 2008/04/21 18:30:21 karl Exp $
<br>> +
<br>> + Copyright (C) 2009 KO Myung-Hun <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=21897913&i=1" target="_top" rel="nofollow">komh@...</a>>
<br>> +
<br>> + This program is free software: you can redistribute it and/or modify
<br>> + it under the terms of the GNU General Public License as published by
<br>> + the Free Software Foundation, either version 3 of the License, or
<br>> + (at your option) any later version.
<br>> +
<br>> + This program is distributed in the hope that it will be useful,
<br>> + but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>> + GNU General Public License for more details.
<br>> +
<br>> + You should have received a copy of the GNU General Public License
<br>> + along with this program. If not, see <<a href="http://www.gnu.org/licenses/" target="_top" rel="nofollow">http://www.gnu.org/licenses/</a>>.
<br>> +*/
<br>> +
<br>> +/* This file contains OS/2-specific code using the DosDevIOCtl
<br>> + access method.
<br>> +*/
<br>> +
<br>> +#ifdef HAVE_CONFIG_H
<br>> +# include "config.h"
<br>> +#endif
<br>> +
<br>> +static const char _rcsid[] = "$Id: os2.c,v 1.30 2008/04/21 18:30:21 karl
<br>> Exp $";
<br>> +
<br>> +#include <cdio/cdio.h>
<br>> +#include <cdio/sector.h>
<br>> +#include <cdio/util.h>
<br>> +#include <cdio/mmc.h>
<br>> +#include "cdio_assert.h"
<br>> +#include "cdio_private.h"
<br>> +
<br>> +#include <string.h>
<br>> +
<br>> +#ifdef HAVE_OS2_CDROM
<br>> +
<br>> +#define INCL_DOS
<br>> +#define INCL_DOSDEVIOCTL
<br>> +#include <os2.h>
<br>> +
<br>> +#include <ctype.h>
<br>> +
<br>> +
<br>> +typedef struct {
<br>> + lsn_t lsn_start;
<br>> + UCHAR uc_adr;
<br>> + UCHAR uc_control;
<br>> +} toc_t;
<br>> +
<br>> +typedef enum {
<br>> + _AM_NONE,
<br>> + _AM_OS2,
<br>> +} access_mode_t;
<br>> +
<br>> +typedef struct {
<br>> + /* Things common to all drivers like this.
<br>> + This must be first. */
<br>> + generic_img_private_t gen;
<br>> +
<br>> + access_mode_t access_mode;
<br>> +
<br>> + /* Track information */
<br>> + toc_t toc[CDIO_CD_MAX_TRACKS + 1]; /* 1 more for leadout */
<br>> + int i_first_track;
<br>> + int i_last_track;
<br>> +
<br>> + /* Some of the more OS specific things. */
<br>> + HFILE h_cd;
<br>> + BYTE uc_drive;
<br>> +} _img_private_t;
<br>> +
<br>> +#pragma pack(1)
<br>> +
<br>> +static track_format_t
<br>> +get_track_format_os2(const _img_private_t *p_env, track_t i_track);
<br>> +
<br>> +static bool read_toc_os2 (void *p_user_data);
<br>> +
<br>> +static int
<br>> +run_mmc_cmd_os2( void *p_user_data, unsigned int i_timeout_ms,
<br>> + unsigned int i_cdb, const mmc_cdb_t *p_cdb,
<br>> + cdio_mmc_direction_t e_direction,
<br>> + unsigned int i_buf, /*in/out*/ void *p_buf );
<br>> +
<br>> +/*!
<br>> + Set the volume of an audio CD.
<br>> +
<br>> + @param p_cdio the CD object to be acted upon.
<br>> +
<br>> +*/
<br>> +static driver_return_code_t
<br>> +audio_get_volume_os2 (void *p_user_data,
<br>> + /*out*/ cdio_audio_volume_t *p_volume)
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> +
<br>> + struct {
<br>> + UCHAR auch_sign[4];
<br>> + } s_param = {{'C', 'D', '0', '1'}};
<br>> +
<br>> + struct {
<br>> + struct {
<br>> + BYTE uc_in_ch;
<br>> + BYTE uc_vol;
<br>> + } as_out_ch[4];
<br>> + } s_data;
<br>> +
<br>> + ULONG ul_param_len;
<br>> + ULONG ul_data_len;
<br>> + ULONG rc;
<br>> + int i;
<br>> +
<br>> + rc = DosDevIOCtl(
<br>> + p_env->h_cd, IOCTL_CDROMAUDIO, CDROMAUDIO_GETCHANNEL,
<br>> + &s_param, sizeof( s_param ), &ul_param_len,
<br>> + &s_data, sizeof( s_data ), &ul_data_len );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("audio_get_volume_os2 : DosDevIOCtl(GETCHANNEL) = 0x%lx\n",
<br>> rc );
<br>> +
<br>> + return DRIVER_OP_ERROR;
<br>> + }
<br>> +
<br>> + for( i = 0; i < 4; i++ )
<br>> + p_volume->level[ i ] = s_data.as_out_ch[ i ].uc_vol;
<br>> +
<br>> + return DRIVER_OP_SUCCESS;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Pause playing CD through analog output
<br>> +
<br>> + @param p_cdio the CD object to be acted upon.
<br>> +*/
<br>> +static driver_return_code_t
<br>> +audio_pause_os2 (void *p_user_data)
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> +
<br>> + struct {
<br>> + UCHAR auch_sign[4];
<br>> + } s_param = {{'C', 'D', '0', '1'}};
<br>> +
<br>> + ULONG ul_param_len;
<br>> + ULONG ul_data_len;
<br>> + ULONG rc;
<br>> +
<br>> + rc = DosDevIOCtl(
<br>> + p_env->h_cd, IOCTL_CDROMAUDIO, CDROMAUDIO_STOPAUDIO,
<br>> + &s_param, sizeof( s_param ), &ul_param_len,
<br>> + NULL, 0, &ul_data_len );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("audio_pause_os2 : DosDevIOCtl(STOPAUDIO) = 0x%lx\n", rc );
<br>> +
<br>> + return DRIVER_OP_ERROR;
<br>> + }
<br>> +
<br>> + return DRIVER_OP_SUCCESS;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Playing CD through analog output at the given MSF.
<br>> +
<br>> + @param p_cdio the CD object to be acted upon.
<br>> +*/
<br>> +static driver_return_code_t
<br>> +audio_play_msf_os2 (void *p_user_data, msf_t *p_start_msf, msf_t
<br>> *p_end_msf)
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> +
<br>> + struct {
<br>> + UCHAR auch_sign[4];
<br>> + BYTE uc_access_mode;
<br>> + BYTE uc_start_msf_f;
<br>> + BYTE uc_start_msf_s;
<br>> + BYTE uc_start_msf_m;
<br>> + BYTE uc_start_msf_reserved;
<br>> + BYTE uc_end_msf_f;
<br>> + BYTE uc_end_msf_s;
<br>> + BYTE uc_end_msf_m;
<br>> + BYTE uc_end_msf_reserved;
<br>> + } s_param = {
<br>> + .auch_sign = {'C', 'D', '0', '1'},
<br>> + .uc_access_mode = 01, /* use MSF format */
<br>> + };
<br>> +
<br>> + ULONG ul_param_len;
<br>> + ULONG ul_data_len;
<br>> + ULONG rc;
<br>> +
<br>> + s_param.uc_start_msf_m = cdio_from_bcd8(p_start_msf->m);
<br>> + s_param.uc_start_msf_s = cdio_from_bcd8(p_start_msf->s);
<br>> + s_param.uc_start_msf_f = cdio_from_bcd8(p_start_msf->f);
<br>> +
<br>> + s_param.uc_end_msf_m = cdio_from_bcd8(p_end_msf->m);
<br>> + s_param.uc_end_msf_s = cdio_from_bcd8(p_end_msf->s);
<br>> + s_param.uc_end_msf_f = cdio_from_bcd8(p_end_msf->f);
<br>> +
<br>> + rc = DosDevIOCtl(
<br>> + p_env->h_cd, IOCTL_CDROMAUDIO, CDROMAUDIO_PLAYAUDIO,
<br>> + &s_param, sizeof( s_param ), &ul_param_len,
<br>> + NULL, 0, &ul_data_len );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("audio_play_msf_os2 : DosDevIOCtl(PLAYAUDIO) = 0x%lx\n", rc
<br>> );
<br>> +
<br>> + return DRIVER_OP_ERROR;
<br>> + }
<br>> +
<br>> + return DRIVER_OP_SUCCESS;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Read Audio Subchannel information
<br>> +
<br>> + @param p_cdio the CD object to be acted upon.
<br>> +
<br>> +*/
<br>> +static driver_return_code_t
<br>> +audio_read_subchannel_os2 (void *p_user_data,
<br>> + cdio_subchannel_t *p_subchannel)
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> +
<br>> + struct {
<br>> + UCHAR auch_sign[4];
<br>> + } s_param = {{'C', 'D', '0', '1'}};
<br>> +
<br>> + struct {
<br>> + BYTE uc_control_and_adr;
<br>> + BYTE uc_track_number; /* in BCD */
<br>> + BYTE uc_index; /* in BCD */
<br>> + BYTE uc_running_time_in_track_m;
<br>> + BYTE uc_running_time_in_track_s;
<br>> + BYTE uc_running_time_in_track_f;
<br>> + BYTE uc_reserved;
<br>> + BYTE uc_running_time_on_disk_m;
<br>> + BYTE uc_running_time_on_disk_s;
<br>> + BYTE uc_running_time_on_disk_f;
<br>> + } s_data_subchannel_q;
<br>> +
<br>> + struct {
<br>> + USHORT us_audio_status_bits;
<br>> + ULONG ul_start_msf;
<br>> + ULONG ul_end_msf;
<br>> + } s_data_audio_status;
<br>> +
<br>> + ULONG ul_data_device_status;
<br>> + ULONG ul_param_len;
<br>> + ULONG ul_data_len;
<br>> + ULONG rc;
<br>> +
<br>> + rc = DosDevIOCtl(
<br>> + p_env->h_cd, IOCTL_CDROMAUDIO, CDROMAUDIO_GETSUBCHANNELQ,
<br>> + &s_param, sizeof( s_param ), &ul_param_len,
<br>> + &s_data_subchannel_q, sizeof( s_data_subchannel_q ),
<br>> &ul_data_len );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("audio_read_subchannel_os2 : DosDevIOCtl(GETSUBCHANNELQ) =
<br>> 0x%lx\n", rc );
<br>> +
<br>> + return DRIVER_OP_ERROR;
<br>> + }
<br>> +
<br>> + rc = DosDevIOCtl(
<br>> + p_env->h_cd, IOCTL_CDROMAUDIO, CDROMAUDIO_GETAUDIOSTATUS,
<br>> + &s_param, sizeof( s_param ), &ul_param_len,
<br>> + &s_data_audio_status, sizeof( s_data_audio_status ),
<br>> &ul_data_len );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("audio_read_subchannel_os2 : DosDevIOCtl(GETAUDIOSTATUS) =
<br>> 0x%lx\n", rc );
<br>> +
<br>> + return DRIVER_OP_ERROR;
<br>> + }
<br>> +
<br>> + rc = DosDevIOCtl(
<br>> + p_env->h_cd, IOCTL_CDROMDISK, CDROMDISK_DEVICESTATUS,
<br>> + &s_param, sizeof( s_param ), &ul_param_len,
<br>> + &ul_data_device_status, sizeof( ul_data_device_status ),
<br>> &ul_data_len );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("audio_read_subchannel_os2 : DosDevIOCtl(DEVICESTATUS) =
<br>> 0x%lx\n", rc );
<br>> +
<br>> + return DRIVER_OP_ERROR;
<br>> + }
<br>> +
<br>> + p_subchannel->track =
<br>> cdio_from_bcd8(s_data_subchannel_q.uc_track_number);
<br>> + p_subchannel->index = cdio_from_bcd8(s_data_subchannel_q.uc_index);
<br>> +
<br>> + p_subchannel->abs_addr.m =
<br>> cdio_to_bcd8(s_data_subchannel_q.uc_running_time_on_disk_m);
<br>> + p_subchannel->abs_addr.s =
<br>> cdio_to_bcd8(s_data_subchannel_q.uc_running_time_on_disk_s);
<br>> + p_subchannel->abs_addr.f =
<br>> cdio_to_bcd8(s_data_subchannel_q.uc_running_time_on_disk_f);
<br>> + p_subchannel->rel_addr.m =
<br>> cdio_to_bcd8(s_data_subchannel_q.uc_running_time_in_track_m);
<br>> + p_subchannel->rel_addr.s =
<br>> cdio_to_bcd8(s_data_subchannel_q.uc_running_time_in_track_s);
<br>> + p_subchannel->rel_addr.f =
<br>> cdio_to_bcd8(s_data_subchannel_q.uc_running_time_in_track_f);
<br>> +
<br>> + p_subchannel->address = s_data_subchannel_q.uc_control_and_adr
<br>> & 0x0F;
<br>> + p_subchannel->control = ( s_data_subchannel_q.uc_control_and_adr >> 4 )
<br>> & 0x0F;
<br>> +
<br>> + if( ul_data_device_status & 0x1000 )
<br>> + p_subchannel->audio_status = CDIO_MMC_READ_SUB_ST_PLAY;
<br>> + else if( s_data_audio_status.us_audio_status_bits & 1 )
<br>> + p_subchannel->audio_status = CDIO_MMC_READ_SUB_ST_PAUSED;
<br>> + else if( s_data_audio_status.ul_start_msf == 0 &&
<br>> + s_data_audio_status.ul_end_msf == 0 )
<br>> + p_subchannel->audio_status = CDIO_MMC_READ_SUB_ST_NO_STATUS;
<br>> + else
<br>> + p_subchannel->audio_status = CDIO_MMC_READ_SUB_ST_COMPLETED;
<br>> +
<br>> + return DRIVER_OP_SUCCESS;
<br>> +}
<br>> +
<br>> + /*!
<br>> + Resume playing an audio CD.
<br>> +
<br>> + @param p_cdio the CD object to be acted upon.
<br>> +
<br>> + */
<br>> +static driver_return_code_t
<br>> +audio_resume_os2 (void *p_user_data)
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> +
<br>> + struct {
<br>> + UCHAR auch_sign[4];
<br>> + } s_param = {{'C', 'D', '0', '1'}};
<br>> +
<br>> + ULONG ul_param_len;
<br>> + ULONG ul_data_len;
<br>> + ULONG rc;
<br>> +
<br>> + rc = DosDevIOCtl(
<br>> + p_env->h_cd, IOCTL_CDROMAUDIO, CDROMAUDIO_RESUMEAUDIO,
<br>> + &s_param, sizeof( s_param ), &ul_param_len,
<br>> + NULL, 0, &ul_data_len );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("audio_resume_os2 : DosDevIOCtl(RESUMEAUDIO) = 0x%lx\n", rc
<br>> );
<br>> +
<br>> + return DRIVER_OP_ERROR;
<br>> + }
<br>> +
<br>> + return DRIVER_OP_SUCCESS;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Set the volume of an audio CD.
<br>> +
<br>> + @param p_cdio the CD object to be acted upon.
<br>> +
<br>> +*/
<br>> +static driver_return_code_t
<br>> +audio_set_volume_os2 ( void *p_user_data, cdio_audio_volume_t *p_volume)
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> +
<br>> + struct {
<br>> + UCHAR auch_sign[4];
<br>> + } s_param = {{'C', 'D', '0', '1'}};
<br>> +
<br>> + struct {
<br>> + struct {
<br>> + BYTE uc_in_ch;
<br>> + BYTE uc_vol;
<br>> + } as_out_ch[4];
<br>> + } s_data;
<br>> +
<br>> + ULONG ul_param_len;
<br>> + ULONG ul_data_len;
<br>> + ULONG rc;
<br>> + int i;
<br>> +
<br>> + /* first retrive current input ch. */
<br>> + rc = DosDevIOCtl(
<br>> + p_env->h_cd, IOCTL_CDROMAUDIO, CDROMAUDIO_GETCHANNEL,
<br>> + &s_param, sizeof( s_param ), &ul_param_len,
<br>> + &s_data, sizeof( s_data ), &ul_data_len );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("audio_set_volume_os2 : DosDevIOCtl(GETCHANNEL) = 0x%lx\n",
<br>> rc );
<br>> +
<br>> + return DRIVER_OP_ERROR;
<br>> + }
<br>> +
<br>> + for( i = 0; i < 4; i++ )
<br>> + s_data.as_out_ch[ i ].uc_vol = p_volume->level[ i ];
<br>> +
<br>> + /* now set volumes */
<br>> + rc = DosDevIOCtl(
<br>> + p_env->h_cd, IOCTL_CDROMAUDIO, CDROMAUDIO_SETCHANNELCTRL,
<br>> + &s_param, sizeof( s_param ), &ul_param_len,
<br>> + &s_data, sizeof( s_data ), &ul_data_len );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("audio_set_volume_os2 : DosDevIOCtl(SETCHANNELCTRL) =
<br>> 0x%lx\n", rc );
<br>> +
<br>> + return DRIVER_OP_ERROR;
<br>> + }
<br>> +
<br>> + return DRIVER_OP_SUCCESS;
<br>> +}
<br>> +
<br>> +static driver_return_code_t
<br>> +audio_stop_os2 (void *p_user_data)
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> +
<br>> + struct {
<br>> + UCHAR auch_sign[4];
<br>> + } s_param = {{'C', 'D', '0', '1'}};
<br>> +
<br>> + ULONG ul_param_len;
<br>> + ULONG ul_data_len;
<br>> + ULONG rc;
<br>> +
<br>> + rc = DosDevIOCtl(
<br>> + p_env->h_cd, IOCTL_CDROMAUDIO, CDROMAUDIO_STOPAUDIO,
<br>> + &s_param, sizeof( s_param ), &ul_param_len,
<br>> + NULL, 0, &ul_data_len );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("audio_stop_os2 : DosDevIOCtl(STOPAUDIO) = 0x%lx\n", rc );
<br>> +
<br>> + return DRIVER_OP_ERROR;
<br>> + }
<br>> +
<br>> + return DRIVER_OP_SUCCESS;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Get disc type associated with cd object.
<br>> +*/
<br>> +static discmode_t
<br>> +dvd_discmode_os2 (_img_private_t *p_env)
<br>> +{
<br>> + discmode_t discmode=CDIO_DISC_MODE_NO_INFO;
<br>> + driver_return_code_t rc;
<br>> +
<br>> + /* See if this is a DVD. */
<br>> + cdio_dvd_struct_t dvd; /* DVD READ STRUCT for layer 0. */
<br>> +
<br>> + dvd.physical.type = CDIO_DVD_STRUCT_PHYSICAL;
<br>> + dvd.physical.layer_num = 0;
<br>> +
<br>> + rc = mmc_get_dvd_struct_physical_private (p_env, &run_mmc_cmd_os2,
<br>> + &dvd);
<br>> +
<br>> + if (DRIVER_OP_SUCCESS == rc) {
<br>> + switch(dvd.physical.layer[0].book_type) {
<br>> + case CDIO_DVD_BOOK_DVD_ROM: return CDIO_DISC_MODE_DVD_ROM;
<br>> + case CDIO_DVD_BOOK_DVD_RAM: return CDIO_DISC_MODE_DVD_RAM;
<br>> + case CDIO_DVD_BOOK_DVD_R: return CDIO_DISC_MODE_DVD_R;
<br>> + case CDIO_DVD_BOOK_DVD_RW: return CDIO_DISC_MODE_DVD_RW;
<br>> + case CDIO_DVD_BOOK_DVD_PR: return CDIO_DISC_MODE_DVD_PR;
<br>> + case CDIO_DVD_BOOK_DVD_PRW: return CDIO_DISC_MODE_DVD_PRW;
<br>> + default: return CDIO_DISC_MODE_DVD_OTHER;
<br>> + }
<br>> + }
<br>> + return discmode;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Get disc type associated with the cd object.
<br>> +*/
<br>> +static discmode_t
<br>> +get_discmode_os2(void *p_user_data)
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> +
<br>> + track_t i_track;
<br>> + discmode_t discmode;
<br>> +
<br>> + if (!p_env) return CDIO_DISC_MODE_ERROR;
<br>> +
<br>> + discmode = dvd_discmode_os2(p_env);
<br>> +
<br>> + if (CDIO_DISC_MODE_NO_INFO != discmode) return discmode;
<br>> +
<br>> + if (!p_env->gen.toc_init) read_toc_os2 (p_env);
<br>> +
<br>> + if (!p_env->gen.toc_init) return CDIO_DISC_MODE_ERROR;
<br>> +
<br>> + for (i_track = p_env->gen.i_first_track;
<br>> + i_track < p_env->gen.i_first_track + p_env->gen.i_tracks ;
<br>> + i_track ++) {
<br>> + track_format_t track_fmt=get_track_format_os2(p_env, i_track);
<br>> +
<br>> + switch(track_fmt) {
<br>> + case TRACK_FORMAT_AUDIO:
<br>> + switch(discmode) {
<br>> + case CDIO_DISC_MODE_NO_INFO:
<br>> + discmode = CDIO_DISC_MODE_CD_DA;
<br>> + break;
<br>> + case CDIO_DISC_MODE_CD_DA:
<br>> + case CDIO_DISC_MODE_CD_MIXED:
<br>> + case CDIO_DISC_MODE_ERROR:
<br>> + /* No change*/
<br>> + break;
<br>> + default:
<br>> + discmode = CDIO_DISC_MODE_CD_MIXED;
<br>> + }
<br>> + break;
<br>> + case TRACK_FORMAT_XA:
<br>> + switch(discmode) {
<br>> + case CDIO_DISC_MODE_NO_INFO:
<br>> + discmode = CDIO_DISC_MODE_CD_XA;
<br>> + break;
<br>> + case CDIO_DISC_MODE_CD_XA:
<br>> + case CDIO_DISC_MODE_CD_MIXED:
<br>> + case CDIO_DISC_MODE_ERROR:
<br>> + /* No change*/
<br>> + break;
<br>> + default:
<br>> + discmode = CDIO_DISC_MODE_CD_MIXED;
<br>> + }
<br>> + break;
<br>> + case TRACK_FORMAT_DATA:
<br>> + switch(discmode) {
<br>> + case CDIO_DISC_MODE_NO_INFO:
<br>> + discmode = CDIO_DISC_MODE_CD_DATA;
<br>> + break;
<br>> + case CDIO_DISC_MODE_CD_DATA:
<br>> + case CDIO_DISC_MODE_CD_MIXED:
<br>> + case CDIO_DISC_MODE_ERROR:
<br>> + /* No change*/
<br>> + break;
<br>> + default:
<br>> + discmode = CDIO_DISC_MODE_CD_MIXED;
<br>> + }
<br>> + break;
<br>> + case TRACK_FORMAT_ERROR:
<br>> + default:
<br>> + discmode = CDIO_DISC_MODE_ERROR;
<br>> + }
<br>> + }
<br>> + return discmode;
<br>> +}
<br>> +
<br>> +#define CDROMDISK_EXECMD 0x7A
<br>> +
<br>> +/* 0, if transfer data to device, 1, if transfer data from device */
<br>> +#define EX_DIRECTION_IN 0x0001
<br>> +/* 0, if don't check playing audio, 1, if device plays audio return error
<br>> */
<br>> +#define EX_PLAYING_CHK 0x0002
<br>> +
<br>> +/*!
<br>> + Run a SCSI MMC command.
<br>> +
<br>> + env private CD structure
<br>> + i_timeout_ms time in milliseconds we will wait for the command
<br>> + to complete. If this value is -1, use the default
<br>> + time-out value.
<br>> + p_buf Buffer for data, both sending and receiving
<br>> + i_buf Size of buffer
<br>> + e_direction direction the transfer is to go.
<br>> + cdb CDB bytes. All values that are needed should be set on
<br>> + input. We'll figure out what the right CDB length should
<br>> be.
<br>> +
<br>> + Return 0 if command completed successfully.
<br>> + */
<br>> +static int
<br>> +run_mmc_cmd_os2( void *p_user_data, unsigned int i_timeout_ms,
<br>> + unsigned int i_cdb, const mmc_cdb_t *p_cdb,
<br>> + cdio_mmc_direction_t e_direction,
<br>> + unsigned int i_buf, /*in/out*/ void *p_buf )
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> +
<br>> + struct {
<br>> + UCHAR auch_sign[4]; // 'CD01'
<br>> + USHORT us_data_length; // length of the Data Packet
<br>> + USHORT us_cmd_length; // length of the Command Buffer
<br>> + USHORT us_flags; // flags
<br>> + BYTE auc_cmd_buffer[16]; // Command Buffer for SCSI command
<br>> + } s_param = {
<br>> + .auch_sign = {'C', 'D', '0', '1'},
<br>> + };
<br>> +
<br>> + ULONG ul_param_len;
<br>> + ULONG ul_data_len;
<br>> + ULONG rc;
<br>> +
<br>> + s_param.us_data_length = i_buf;
<br>> + s_param.us_cmd_length = i_cdb;
<br>> + s_param.us_flags =
<br>> + ( e_direction == SCSI_MMC_DATA_READ ) ? EX_DIRECTION_IN : 0;
<br>> +
<br>> + memcpy( s_param.auc_cmd_buffer, p_cdb, i_cdb );
<br>> +
<br>> + rc = DosDevIOCtl(
<br>> + p_env->h_cd, IOCTL_CDROMDISK, CDROMDISK_EXECMD,
<br>> + &s_param, sizeof( s_param ), &ul_param_len,
<br>> + p_buf, i_buf, &ul_data_len );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("run_mmc_cmd_os2 : DosDevIOCtl(EXECMD) = 0x%lx\n", rc );
<br>> +
<br>> + return DRIVER_OP_ERROR;
<br>> + }
<br>> +
<br>> + return DRIVER_OP_SUCCESS;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Initialize CD device.
<br>> + */
<br>> +static bool
<br>> +init_os2 (void *p_user_data)
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> +
<br>> + ULONG ul_action;
<br>> + ULONG rc;
<br>> +
<br>> + if (p_env->gen.init) {
<br>> + cdio_warn ("init called more than once");
<br>> + return false;
<br>> + }
<br>> +
<br>> + /* Initializations */
<br>> + p_env->h_cd = 0;
<br>> +
<br>> + rc = DosOpen((PSZ)p_env->gen.source_name, &p_env->h_cd,
<br>> + &ul_action, 0, FILE_NORMAL,
<br>> + OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_FAIL_IF_NEW,
<br>> + OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE |
<br>> OPEN_FLAGS_DASD,
<br>> + NULL );
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("init_os2 : DosOpen(%s) = %ld\n", p_env->gen.source_name, rc
<br>> );
<br>> +
<br>> + return false;
<br>> + }
<br>> +
<br>> + p_env->uc_drive = toupper( p_env->gen.source_name[ 0 ]) - 'A';
<br>> +
<br>> + p_env->gen.init = true;
<br>> + p_env->gen.toc_init = false;
<br>> + p_env->gen.b_cdtext_init = false;
<br>> + p_env->gen.b_cdtext_error = false;
<br>> + p_env->gen.fd = p_env->h_cd;
<br>> +
<br>> + return true;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Release and free resources associated with cd.
<br>> + */
<br>> +static void
<br>> +free_os2 (void *p_user_data)
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> +
<br>> + if( !p_env )
<br>> + return;
<br>> +
<br>> + free (p_env->gen.source_name);
<br>> +
<br>> + if( p_env->h_cd )
<br>> + DosClose( p_env->h_cd );
<br>> +
<br>> + free (p_env);
<br>> +
<br>> +}
<br>> +
<br>> +/*!
<br>> + Reads i_blocks of audio sectors from cd device into p_data starting
<br>> + from i_lsn.
<br>> + Returns DRIVER_OP_SUCCESS if no error.
<br>> + */
<br>> +static int
<br>> +read_audio_sectors_os2 (void *p_user_data, void *p_buf, lsn_t i_lsn,
<br>> + unsigned int i_blocks)
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> +
<br>> + struct
<br>> + {
<br>> + UCHAR auch_sign[ 4 ];
<br>> + BYTE uc_addr_mode;
<br>> + USHORT us_sectors;
<br>> + ULONG ul_start_sector;
<br>> + BYTE uc_reserved;
<br>> + BYTE uc_interleaved_size;
<br>> + } s_param = {
<br>> + .auch_sign = {'C', 'D', '0', '1'},
<br>> + .uc_addr_mode = 0, /* use LBA format */
<br>> + };
<br>> +
<br>> + ULONG ul_param_len;
<br>> + ULONG ul_data_len;
<br>> + ULONG rc;
<br>> +
<br>> + s_param.us_sectors = i_blocks;
<br>> + s_param.ul_start_sector = i_lsn;
<br>> +
<br>> + rc = DosDevIOCtl(
<br>> + p_env->h_cd, IOCTL_CDROMDISK, CDROMDISK_READLONG,
<br>> + &s_param, sizeof( s_param ), &ul_param_len,
<br>> + p_buf, CDIO_CD_FRAMESIZE_RAW * i_blocks, &ul_data_len );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("read_audio_sectors_os2 : DosDevIOCtl(READLONG) = 0x%lx\n",
<br>> rc );
<br>> +
<br>> + return DRIVER_OP_ERROR;
<br>> + }
<br>> +
<br>> + return DRIVER_OP_SUCCESS;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Reads a single raw sector using the DosDevIOCtl method into
<br>> + data starting from lsn. Returns 0 if no error.
<br>> + */
<br>> +static int
<br>> +read_raw_sector (_img_private_t *p_env, void *p_buf, lsn_t lsn)
<br>> +{
<br>> + struct
<br>> + {
<br>> + UCHAR auch_sign[ 4 ];
<br>> + BYTE uc_addr_mode;
<br>> + USHORT us_sectors;
<br>> + ULONG ul_start_sector;
<br>> + BYTE uc_reserved;
<br>> + BYTE uc_interleaved_size;
<br>> + } s_param = {
<br>> + .auch_sign = {'C', 'D', '0', '1'},
<br>> + .uc_addr_mode = 0, /* use LBA format */
<br>> + .us_sectors = 1,
<br>> + };
<br>> +
<br>> + ULONG ul_param_len;
<br>> + ULONG ul_data_len;
<br>> + ULONG rc;
<br>> +
<br>> + s_param.ul_start_sector = lsn;
<br>> +
<br>> + rc = DosDevIOCtl(
<br>> + p_env->h_cd, IOCTL_CDROMDISK, CDROMDISK_READLONG,
<br>> + &s_param, sizeof( s_param ), &ul_param_len,
<br>> + p_buf, CDIO_CD_FRAMESIZE_RAW, &ul_data_len );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("read_raw_sector : DosDevIOCtl(READLONG) = 0x%lx\n", rc );
<br>> +
<br>> + return DRIVER_OP_ERROR;
<br>> + }
<br>> +
<br>> + return DRIVER_OP_SUCCESS;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Reads a single mode1 sector from cd device into data starting from
<br>> + lsn. Returns 0 if no error.
<br>> + */
<br>> +static int
<br>> +read_mode1_sector_os2 (void *p_user_data, void *p_buf, lsn_t lsn,
<br>> + bool b_form2)
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> + char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
<br>> + int ret = read_raw_sector (p_env, buf, lsn);
<br>> +
<br>> + if ( 0 != ret) return ret;
<br>> +
<br>> + memcpy (p_buf,
<br>> + buf + CDIO_CD_SYNC_SIZE+CDIO_CD_HEADER_SIZE,
<br>> + b_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE);
<br>> +
<br>> + return 0;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Reads nblocks of mode1 sectors from cd device into data starting
<br>> + from lsn.
<br>> + Returns 0 if no error.
<br>> + */
<br>> +static int
<br>> +read_mode1_sectors_os2 (void *p_user_data, void *p_buf, lsn_t lsn,
<br>> + bool b_form2, unsigned int nblocks)
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> + int i;
<br>> + int retval;
<br>> +
<br>> + for (i = 0; i < nblocks; i++) {
<br>> + if (b_form2) {
<br>> + retval = read_mode1_sector_os2 (
<br>> + p_env, ((char *)p_buf) +
<br>> + (M2RAW_SECTOR_SIZE * i),
<br>> + lsn + i, true);
<br>> + if ( retval ) return retval;
<br>> + } else {
<br>> + char buf[M2RAW_SECTOR_SIZE] = { 0, };
<br>> + if ( (retval = read_mode1_sector_os2 (p_env, buf, lsn + i, false)) )
<br>> + return retval;
<br>> +
<br>> + memcpy (((char *)p_buf) + (CDIO_CD_FRAMESIZE * i),
<br>> + buf, CDIO_CD_FRAMESIZE);
<br>> + }
<br>> + }
<br>> + return 0;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Reads a single mode2 sector from cd device into data starting
<br>> + from lsn. Returns 0 if no error.
<br>> + */
<br>> +static int
<br>> +read_mode2_sector_os2 (void *p_user_data, void *data, lsn_t lsn,
<br>> + bool b_form2)
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> + char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
<br>> + int ret = read_raw_sector (p_env, buf, lsn);
<br>> +
<br>> + if ( 0 != ret) return ret;
<br>> +
<br>> + memcpy (data,
<br>> + buf + CDIO_CD_SYNC_SIZE + CDIO_CD_XA_HEADER,
<br>> + b_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE);
<br>> +
<br>> + return 0;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Reads nblocks of mode2 sectors from cd device into data starting
<br>> + from lsn.
<br>> + Returns 0 if no error.
<br>> + */
<br>> +static int
<br>> +read_mode2_sectors_os2 (void *p_user_data, void *data, lsn_t lsn,
<br>> + bool b_form2, unsigned int i_blocks)
<br>> +{
<br>> + int i;
<br>> + int retval;
<br>> + unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE :
<br>> CDIO_CD_FRAMESIZE;
<br>> +
<br>> + for (i = 0; i < i_blocks; i++) {
<br>> + if ( (retval = read_mode2_sector_os2 (p_user_data,
<br>> + ((char *)data) + (blocksize * i),
<br>> + lsn + i, b_form2)) )
<br>> + return retval;
<br>> + }
<br>> + return 0;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Return the size of the CD in logical block address (LBA) units.
<br>> + */
<br>> +static lsn_t
<br>> +get_disc_last_lsn_os2 (void *p_user_data)
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> +
<br>> + struct {
<br>> + UCHAR auch_sign[4];
<br>> + } s_param = {{'C', 'D', '0', '1'}};
<br>> +
<br>> + ULONG ul_data_volume_size;
<br>> + ULONG ul_param_len;
<br>> + ULONG ul_data_len;
<br>> + ULONG rc;
<br>> +
<br>> + rc = DosDevIOCtl(
<br>> + p_env->h_cd, IOCTL_CDROMDISK, CDROMDISK_GETVOLUMESIZE,
<br>> + &s_param, sizeof( s_param ), &ul_param_len,
<br>> + &ul_data_volume_size, sizeof( ul_data_volume_size ),
<br>> &ul_data_len );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("get_disc_last_lsn_os2 : DosDevIOCtl(GETVOLUMESIZE) =
<br>> 0x%lx\n", rc );
<br>> +
<br>> + return CDIO_INVALID_LSN;
<br>> + }
<br>> +
<br>> + return ul_data_volume_size;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Set the key "arg" to "value" in source device.
<br>> +*/
<br>> +static int
<br>> +set_arg_os2 (void *p_user_data, const char key[], const char value[])
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> +
<br>> + if (!strcmp (key, "source"))
<br>> + {
<br>> + if (!value)
<br>> + return DRIVER_OP_ERROR;
<br>> +
<br>> + free (p_env->gen.source_name);
<br>> + p_env->gen.source_name = strdup (value);
<br>> + }
<br>> + else if (!strcmp (key, "access-mode"))
<br>> + {
<br>> + if (!strcmp(value, "OS2"))
<br>> + p_env->access_mode = _AM_OS2;
<br>> + else
<br>> + cdio_warn ("unknown access type: %s. ignored.", value);
<br>> + }
<br>> + else
<br>> + return DRIVER_OP_ERROR;
<br>> +
<br>> + return DRIVER_OP_SUCCESS;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Read and cache the CD's Track Table of Contents and track info.
<br>> + Return true if successful or false if an error.
<br>> +*/
<br>> +static bool
<br>> +read_toc_os2 (void *p_user_data)
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> +
<br>> + struct {
<br>> + UCHAR auch_sign[4];
<br>> + } s_param_disk = {{'C', 'D', '0', '1'}};
<br>> +
<br>> + struct {
<br>> + BYTE uc_first_track;
<br>> + BYTE uc_last_track;
<br>> + ULONG ul_lead_out_addr; /* in MSF */
<br>> + } s_data_disk;
<br>> +
<br>> + struct {
<br>> + UCHAR auch_sign[4];
<br>> + BYTE uc_track;
<br>> + } s_param_track = {
<br>> + .auch_sign = {'C', 'D', '0', '1'},
<br>> + };
<br>> +
<br>> + struct {
<br>> + ULONG ul_track_addr; /* in MSF */
<br>> + BYTE uc_control_and_adr;
<br>> + } s_data_track;
<br>> +
<br>> + ULONG ul_param_len;
<br>> + ULONG ul_data_len;
<br>> + ULONG rc;
<br>> + int i_track;
<br>> +
<br>> + rc = DosDevIOCtl(
<br>> + p_env->h_cd, IOCTL_CDROMAUDIO, CDROMAUDIO_GETAUDIODISK,
<br>> + &s_param_disk, sizeof( s_param_disk ), &ul_param_len,
<br>> + &s_data_disk, sizeof( s_data_disk ), &ul_data_len );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("read_toc_os2 : DosDevIOCtl(GETAUDIODISK) = 0x%lx\n", rc );
<br>> +
<br>> + return false;
<br>> + }
<br>> +
<br>> + p_env->gen.i_first_track = s_data_disk.uc_first_track;
<br>> + p_env->gen.i_tracks = s_data_disk.uc_last_track -
<br>> s_data_disk.uc_first_track + 1;
<br>> +
<br>> + p_env->i_first_track = s_data_disk.uc_first_track;
<br>> + p_env->i_last_track = s_data_disk.uc_last_track;
<br>> +
<br>> + for( i_track = p_env->i_first_track; i_track <= p_env->i_last_track;
<br>> i_track++ )
<br>> + {
<br>> + s_param_track.uc_track = i_track;
<br>> +
<br>> + rc = DosDevIOCtl(
<br>> + p_env->h_cd, IOCTL_CDROMAUDIO, CDROMAUDIO_GETAUDIOTRACK,
<br>> + &s_param_track, sizeof( s_param_track ), &ul_param_len,
<br>> + &s_data_track, sizeof( s_data_track ), &ul_data_len );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("read_toc_os2 : DosDevIOCtl(GETAUDIOTRACK) = 0x%lx\n", rc
<br>> );
<br>> +
<br>> + return false;
<br>> + }
<br>> +
<br>> + p_env->toc[i_track].lsn_start =
<br>> + cdio_lba_to_lsn( cdio_msf3_to_lba(
<br>> + ( s_data_track.ul_track_addr >> 16 ) & 0xFF,
<br>> + ( s_data_track.ul_track_addr >> 8 ) & 0xFF,
<br>> + s_data_track.ul_track_addr & 0xFF ));
<br>> +
<br>> + p_env->toc[i_track].uc_adr = s_data_track.uc_control_and_adr
<br>> & 0x0F;
<br>> + p_env->toc[i_track].uc_control = ( s_data_track.uc_control_and_adr >>
<br>> 4 ) & 0x0F;
<br>> +
<br>> + p_env->gen.track_flags[i_track].preemphasis =
<br>> + p_env->toc[i_track].uc_control & 0x01
<br>> + ? CDIO_TRACK_FLAG_TRUE : CDIO_TRACK_FLAG_FALSE;
<br>> +
<br>> + p_env->gen.track_flags[i_track].copy_permit =
<br>> + p_env->toc[i_track].uc_control & 0x02
<br>> + ? CDIO_TRACK_FLAG_TRUE : CDIO_TRACK_FLAG_FALSE;
<br>> +
<br>> + p_env->gen.track_flags[i_track].channels =
<br>> + p_env->toc[i_track].uc_control & 0x08 ? 4 : 2;
<br>> + }
<br>> +
<br>> + /* store lead out info */
<br>> + p_env->toc[p_env->i_last_track + 1].lsn_start =
<br>> + cdio_lba_to_lsn( cdio_msf3_to_lba(
<br>> + ( s_data_disk.ul_lead_out_addr >> 16 ) & 0xFF,
<br>> + ( s_data_disk.ul_lead_out_addr >> 8 ) & 0xFF,
<br>> + s_data_disk.ul_lead_out_addr & 0xFF ));
<br>> +
<br>> + p_env->gen.toc_init = true;
<br>> +
<br>> + return true;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Eject media.
<br>> + */
<br>> +static driver_return_code_t
<br>> +eject_media_os2 (void *p_user_data)
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> +
<br>> + struct {
<br>> + BYTE uc_cmd_info;
<br>> + BYTE uc_drive;
<br>> + } s_param;
<br>> +
<br>> + ULONG ul_param_len;
<br>> + ULONG ul_data_len;
<br>> + ULONG rc;
<br>> +
<br>> + s_param.uc_cmd_info = 2;
<br>> + s_param.uc_drive = p_env->uc_drive;
<br>> +
<br>> + rc = DosDevIOCtl(
<br>> + ( HFILE )-1, IOCTL_DISK, DSK_UNLOCKEJECTMEDIA,
<br>> + &s_param, sizeof( s_param ), &ul_param_len,
<br>> + NULL, 0, &ul_data_len );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("eject_media_os2 : DosDevIOCtl(UNLOCKEJECTMEDIA) = 0x%lx\n",
<br>> rc );
<br>> +
<br>> + return DRIVER_OP_ERROR;
<br>> + }
<br>> +
<br>> + return DRIVER_OP_SUCCESS;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Return the value associated with the key "arg".
<br>> +*/
<br>> +static const char *
<br>> +get_arg_os2 (void *p_user_data, const char key[])
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> +
<br>> + if (!strcmp (key, "source")) {
<br>> + return p_env->gen.source_name;
<br>> + } else if (!strcmp (key, "access-mode")) {
<br>> + switch (p_env->access_mode) {
<br>> + case _AM_OS2:
<br>> + return "OS2";
<br>> + case _AM_NONE:
<br>> + return "no access method";
<br>> + }
<br>> + }
<br>> + return NULL;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Return the media catalog number MCN.
<br>> +
<br>> + Note: string is malloc'd so caller should free() then returned
<br>> + string when done with it.
<br>> +
<br>> + */
<br>> +static char *
<br>> +_cdio_get_mcn (const void *p_user_data) {
<br>> + const _img_private_t *p_env = p_user_data;
<br>> + return mmc_get_mcn( p_env->gen.cdio );
<br>> +}
<br>> +
<br>> +/*!
<br>> + Get the format (XA, DATA, AUDIO) of a track.
<br>> +*/
<br>> +static track_format_t
<br>> +get_track_format_os2(const _img_private_t *p_env, track_t i_track)
<br>> +{
<br>> + /* This is pretty much copied from the "badly broken" cdrom_count_tracks
<br>> + in linux/cdrom.c.
<br>> + */
<br>> +
<br>> + if (p_env->toc[i_track].uc_control & 0x04) {
<br>> + if (p_env->toc[i_track].uc_adr == 0x10)
<br>> + return TRACK_FORMAT_CDI;
<br>> + else if (p_env->toc[i_track].uc_adr == 0x20)
<br>> + return TRACK_FORMAT_XA;
<br>> + else
<br>> + return TRACK_FORMAT_DATA;
<br>> + } else
<br>> + return TRACK_FORMAT_AUDIO;
<br>> +}
<br>> +
<br>> +/*!
<br>> + Get format of track.
<br>> +*/
<br>> +static track_format_t
<br>> +_cdio_get_track_format(void *p_obj, track_t i_track)
<br>> +{
<br>> + _img_private_t *p_env = p_obj;
<br>> +
<br>> + if ( !p_env )
<br>> + return TRACK_FORMAT_ERROR;
<br>> +
<br>> + if (!p_env->gen.toc_init)
<br>> + if (!read_toc_os2 (p_env))
<br>> + return TRACK_FORMAT_ERROR;
<br>> +
<br>> + if ( i_track < p_env->gen.i_first_track
<br>> + || i_track >= p_env->gen.i_tracks + p_env->gen.i_first_track )
<br>> + return TRACK_FORMAT_ERROR;
<br>> +
<br>> + return get_track_format_os2(p_env, i_track);
<br>> +}
<br>> +
<br>> +/*!
<br>> + Return true if we have XA data (green, mode2 form1) or
<br>> + XA data (green, mode2 form2). That is track begins:
<br>> + sync - header - subheader
<br>> + 12 4 - 8
<br>> +
<br>> + FIXME: there's gotta be a better design for this and get_track_format?
<br>> +*/
<br>> +static bool
<br>> +_cdio_get_track_green(void *p_obj, track_t i_track)
<br>> +{
<br>> + _img_private_t *p_env = p_obj;
<br>> +
<br>> + switch (_cdio_get_track_format(p_env, i_track)) {
<br>> + case TRACK_FORMAT_XA:
<br>> + return true;
<br>> + case TRACK_FORMAT_ERROR:
<br>> + case TRACK_FORMAT_CDI:
<br>> + case TRACK_FORMAT_AUDIO:
<br>> + return false;
<br>> + case TRACK_FORMAT_DATA:
<br>> + default:
<br>> + break;
<br>> + }
<br>> +
<br>> + /* FIXME: Dunno if this is the right way, but it's what
<br>> + I was using in cd-info for a while.
<br>> + */
<br>> + return ((p_env->toc[i_track].uc_control & 2) != 0);
<br>> +}
<br>> +
<br>> +/*!
<br>> + Return the starting MSF (minutes/secs/frames) for track number
<br>> + i_tracks in obj. Track numbers start at 1.
<br>> + The "leadout" track is specified either by
<br>> + using i_tracks LEADOUT_TRACK or the total tracks+1.
<br>> + False is returned if there is no track entry.
<br>> +*/
<br>> +static bool
<br>> +_cdio_get_track_msf(void *p_user_data, track_t i_tracks, msf_t *p_msf)
<br>> +{
<br>> + _img_private_t *p_env = p_user_data;
<br>> +
<br>> + if (!p_msf)
<br>> + return false;
<br>> +
<br>> + if (!p_env->gen.toc_init)
<br>> + if (!read_toc_os2 (p_env))
<br>> + return false;
<br>> +
<br>> + if (i_tracks == CDIO_CDROM_LEADOUT_TRACK)
<br>> + i_tracks = p_env->gen.i_tracks+1;
<br>> +
<br>> + if (i_tracks > p_env->gen.i_tracks+1 || i_tracks == 0) {
<br>> + return false;
<br>> + } else {
<br>> + cdio_lsn_to_msf(p_env->toc[i_tracks].lsn_start, p_msf);
<br>> + return true;
<br>> + }
<br>> +}
<br>> +
<br>> +#endif /* HAVE_OS2_CDROM */
<br>> +
<br>> +/*!
<br>> + Return an array of strings giving possible CD devices.
<br>> + */
<br>> +char **
<br>> +cdio_get_devices_os2 (void)
<br>> +{
<br>> +#ifndef HAVE_OS2_CDROM
<br>> + return NULL;
<br>> +#else
<br>> + char **drives = NULL;
<br>> + unsigned int num_drives=0;
<br>> +
<br>> + struct {
<br>> + BYTE uc_cmd_info;
<br>> + BYTE uc_drive;
<br>> + } s_param;
<br>> +
<br>> + struct {
<br>> + struct {
<br>> + USHORT us_bytes_per_sector;
<br>> + BYTE uc_sectors_per_cluster;
<br>> + USHORT us_reserved_sectors;
<br>> + BYTE uc_number_of_fats;
<br>> + USHORT us_root_dir_entries;
<br>> + USHORT us_total_sectors;
<br>> + BYTE uc_media_descriptor;
<br>> + USHORT us_sectors_per_fat;
<br>> + USHORT us_sectors_per_track;
<br>> + USHORT us_number_of_heads;
<br>> + ULONG ul_hidden_sectors;
<br>> + ULONG ul_large_total_sectors;
<br>> + BYTE auc_reserved[6];
<br>> + } s_ebpb;
<br>> +
<br>> + USHORT us_cylinders;
<br>> + BYTE uc_dev_type;
<br>> + USHORT us_dev_attr;
<br>> + } s_data;
<br>> +
<br>> + ULONG ul_param_len;
<br>> + ULONG ul_data_len;
<br>> + UCHAR uc_drive;
<br>> + char sz_drive_str[ 3 ] = "X:";
<br>> + ULONG rc;
<br>> +
<br>> + /* Scan the system for CD-ROM drives.
<br>> + */
<br>> +
<br>> + for( uc_drive = 0; uc_drive < 26; uc_drive++ )
<br>> + {
<br>> + s_param.uc_cmd_info = 0;
<br>> + s_param.uc_drive = uc_drive;
<br>> +
<br>> + rc = DosDevIOCtl(
<br>> + ( HFILE )-1, IOCTL_DISK, DSK_GETDEVICEPARAMS,
<br>> + &s_param, sizeof( s_param ), &ul_param_len,
<br>> + &s_data, sizeof( s_data ), &ul_data_len );
<br>> +
<br>> + if( rc )
<br>> + continue;
<br>> +
<br>> + switch( s_data.s_ebpb.uc_media_descriptor )
<br>> + {
<br>> + case 4 : /* CD-R */
<br>> + case 128 + 4 : /* CD-R but cannot be written */
<br>> + case 5 : /* CD-ROM */
<br>> + case 128 + 5 : /* CD-ROM but cannot be written */
<br>> + case 6 : /* DVD-ROM */
<br>> + case 128 + 6 : /* DVD-ROM but cannot be written */
<br>> + case 7 : /* DVD-RAM */
<br>> + case 128 + 7 : /* DVD-RAM but cannot be written */
<br>> + case 8 : /* CD-RW */
<br>> + case 128 + 8 : /* CD-RW but cannot be written */
<br>> + case 9 : /* DVD-R */
<br>> + case 128 + 9 : /* DVD-R but cannot be written */
<br>> + case 10 : /* DVD-RW */
<br>> + case 128 + 10 : /* DVD-RW but cannot be written */
<br>> + case 11 : /* DVD+RW */
<br>> + case 128 + 11 : /* DVD+RW but cannot be written */
<br>> + sz_drive_str[0] = 'A' + uc_drive;
<br>> + cdio_add_device_list(&drives, strdup(sz_drive_str), &num_drives);
<br>> + break;
<br>> + }
<br>> + }
<br>> +
<br>> + cdio_add_device_list(&drives, NULL, &num_drives);
<br>> + return drives;
<br>> +#endif /*HAVE_OS2_CDROM*/
<br>> +}
<br>> +
<br>> +#define IOCTL_CDROMDISK2 0x82
<br>> +
<br>> +#define CDROMDISK2_DRIVELETTERS 0x60
<br>> +
<br>> +/*!
<br>> + Return a string containing the default CD device if none is specified.
<br>> + if CdIo is NULL (we haven't initialized a specific device driver),
<br>> + then find a suitable one and return the default device for that.
<br>> +
<br>> + NULL is returned if we couldn't get a default device.
<br>> +*/
<br>> +char *
<br>> +cdio_get_default_device_os2(void)
<br>> +{
<br>> +#ifdef HAVE_OS2_CDROM
<br>> + struct {
<br>> + USHORT us_drive_count;
<br>> + USHORT us_drive_first;
<br>> + } s_drive_letters;
<br>> +
<br>> + HFILE h_cd2;
<br>> + ULONG ul_action;
<br>> + ULONG ul_param_len;
<br>> + ULONG ul_data_len;
<br>> + char sz_drive_str[ 3 ] = "X:";
<br>> + ULONG rc;
<br>> +
<br>> + rc = DosOpen((PSZ)"CD-ROM2$", &h_cd2, &ul_action, 0, FILE_NORMAL,
<br>> + OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_FAIL_IF_NEW,
<br>> + OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE,
<br>> + NULL );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("cdio_get_default_device_os2 : DosOpen(CD-ROM2$) = %ld\n",
<br>> rc );
<br>> +
<br>> + return NULL;
<br>> + }
<br>> +
<br>> + rc = DosDevIOCtl(
<br>> + h_cd2, IOCTL_CDROMDISK2, CDROMDISK2_DRIVELETTERS,
<br>> + NULL, 0, &ul_param_len,
<br>> + &s_drive_letters, sizeof( s_drive_letters ), &ul_data_len );
<br>> +
<br>> + DosClose( h_cd2 );
<br>> +
<br>> + if( rc )
<br>> + {
<br>> + cdio_warn("cdio_get_default_device_os2 : DosDevIOCtl(DRIVELETTERS) =
<br>> 0x%lx\n", rc );
<br>> +
<br>> + return NULL;
<br>> + }
<br>> +
<br>> + if( s_drive_letters.us_drive_count == 0 )
<br>> + return NULL;
<br>> +
<br>> + sz_drive_str[0] = 'A' + s_drive_letters.us_drive_first;
<br>> +
<br>> + return strdup( sz_drive_str );
<br>> +#else
<br>> + return NULL;
<br>> +#endif
<br>> +}
<br>> +
<br>> +/*!
<br>> + Return true if source_name could be a device containing a CD-ROM.
<br>> +*/
<br>> +bool
<br>> +cdio_is_device_os2(const char *source_name)
<br>> +{
<br>> + if (!source_name)
<br>> + return false;
<br>> +
<br>> +#ifdef HAVE_OS2_CDROM
<br>> + return (isalpha(source_name[0]) &&
<br>> + source_name[1] == ':' &&
<br>> + source_name[2] == '\0');
<br>> +#else
<br>> + return false;
<br>> +#endif
<br>> +}
<br>> +
<br>> +/*!
<br>> + Close tray on CD-ROM.
<br>> +
<br>> + @param p_user_data the CD object to be acted upon.
<br>> +
<br>> +*/
<br>> +driver_return_code_t
<br>> +close_tray_os2 (const char *psz_os2_drive)
<br>> +{
<br>> +#ifdef HAVE_OS2_CDROM
<br>> + struct {
<br>> + BYTE uc_cmd_info;
<br>> + BYTE uc_drive;
<br>> + } s_param;
<br>> +
<br>> + ULONG ul_param_len;
<br>> + ULONG ul_data_len;
<br>> + ULONG rc;
<br>> +
<br>> + s_param.uc_cmd_info = 3;
<br>> + s_param.uc_drive = toupper(psz_os2_drive[0]) - 'A';
<br>> +
<br>> + rc = DosDevIOCtl(
<br>> + ( HFILE )-1, IOCTL_DISK, DSK_UNLOCKEJECTMEDIA,
<br>> + &s_param, sizeof( s_param ), &ul_param_len,
<br>> + NULL, 0, &ul_data_len );
<br>> +
<br>> + if( rc && rc != 99 /* device in use */ )
<br>> + {
<br>> + cdio_warn("close_tray_os2 : DosDevIOCtl(UNLOCKEJECTMEDIA) = 0x%lx\n",
<br>> rc );
<br>> +
<br>> + return DRIVER_OP_ERROR;
<br>> + }
<br>> +
<br>> + return DRIVER_OP_SUCCESS;
<br>> +#else
<br>> + return DRIVER_OP_UNSUPPORTED;
<br>> +#endif /* HAVE_OS2_CDROM */
<br>> +}
<br>> +
<br>> +/*!
<br>> + Initialization routine. This is the only thing that doesn't
<br>> + get called via a function pointer. In fact *we* are the
<br>> + ones to set that up.
<br>> + */
<br>> +CdIo_t *
<br>> +cdio_open_os2 (const char *psz_orig_source)
<br>> +{
<br>> +
<br>> +#ifdef HAVE_OS2_CDROM
<br>> + CdIo_t *ret;
<br>> + _img_private_t *_data;
<br>> + char *psz_source;
<br>> +
<br>> + cdio_funcs_t _funcs;
<br>> +
<br>> + memset( &_funcs, 0, sizeof(_funcs) );
<br>> +
<br>> + _funcs.audio_get_volume = audio_get_volume_os2;
<br>> + _funcs.audio_pause = audio_pause_os2;
<br>> + _funcs.audio_play_msf = audio_play_msf_os2;
<br>> +#if 0
<br>> + _funcs.audio_play_track_index = audio_play_track_index_os2;
<br>> +#endif
<br>> + _funcs.audio_read_subchannel = audio_read_subchannel_os2;
<br>> + _funcs.audio_resume = audio_resume_os2;
<br>> + _funcs.audio_set_volume = audio_set_volume_os2;
<br>> + _funcs.audio_stop = audio_stop_os2;
<br>> + _funcs.eject_media = eject_media_os2;
<br>> + _funcs.free = free_os2;
<br>> + _funcs.get_arg = get_arg_os2;
<br>> +#if 0
<br>> + _funcs.get_blocksize = get_blocksize_os2;
<br>> +#endif
<br>> + _funcs.get_cdtext = get_cdtext_generic;
<br>> + _funcs.get_default_device = cdio_get_default_device_os2;
<br>> + _funcs.get_devices = cdio_get_devices_os2;
<br>> + _funcs.get_disc_last_lsn = get_disc_last_lsn_os2;
<br>> + _funcs.get_discmode = get_discmode_os2;
<br>> + _funcs.get_drive_cap = get_drive_cap_mmc;
<br>> + _funcs.get_first_track_num = get_first_track_num_generic;
<br>> + _funcs.get_hwinfo = NULL;
<br>> +#if 0
<br>> + _funcs.get_last_session = get_last_session_os2;
<br>> +#endif
<br>> + _funcs.get_media_changed = get_media_changed_mmc;
<br>> + _funcs.get_mcn = _cdio_get_mcn;
<br>> + _funcs.get_num_tracks = get_num_tracks_generic;
<br>> + _funcs.get_track_channels = get_track_channels_generic;
<br>> + _funcs.get_track_copy_permit = get_track_copy_permit_generic;
<br>> + _funcs.get_track_format = _cdio_get_track_format;
<br>> + _funcs.get_track_green = _cdio_get_track_green;
<br>> + _funcs.get_track_lba = NULL; /* This could be done if need be.
<br>> */
<br>> +#if 0
<br>> + _funcs.get_track_pregap_lba = get_track_pregap_lba_os2;
<br>> + _funcs.get_track_isrc = get_track_isrc_os2;
<br>> +#endif
<br>> + _funcs.get_track_msf = _cdio_get_track_msf;
<br>> + _funcs.get_track_preemphasis = get_track_preemphasis_generic;
<br>> + _funcs.lseek = cdio_generic_lseek;
<br>> + _funcs.read = cdio_generic_read;
<br>> + _funcs.read_audio_sectors = read_audio_sectors_os2;
<br>> + _funcs.read_data_sectors = read_data_sectors_mmc;
<br>> + _funcs.read_mode1_sector = read_mode1_sector_os2;
<br>> + _funcs.read_mode1_sectors = read_mode1_sectors_os2;
<br>> + _funcs.read_mode2_sector = read_mode2_sector_os2;
<br>> + _funcs.read_mode2_sectors = read_mode2_sectors_os2;
<br>> + _funcs.read_toc = read_toc_os2;
<br>> + _funcs.run_mmc_cmd = run_mmc_cmd_os2;
<br>> + _funcs.set_arg = set_arg_os2;
<br>> + _funcs.set_blocksize = set_blocksize_mmc;
<br>> + _funcs.set_speed = set_drive_speed_mmc;
<br>> +
<br>> + _data = calloc(1, sizeof (_img_private_t));
<br>> + _data->access_mode = _AM_OS2;
<br>> + _data->gen.init = false;
<br>> + _data->gen.fd = -1;
<br>> +
<br>> + if (NULL == psz_orig_source) {
<br>> + psz_source=cdio_get_default_device_os2();
<br>> + if (NULL == psz_source) return NULL;
<br>> + set_arg_os2(_data, "source", psz_source);
<br>> + free(psz_source);
<br>> + } else {
<br>> + if (cdio_is_device_os2(psz_orig_source))
<br>> + set_arg_os2(_data, "source", psz_orig_source);
<br>> + else {
<br>> + /* The below would be okay if all device drivers worked this way. */
<br>> +#if 0
<br>> + cdio_info ("source %s is a not a device", psz_orig_source);
<br>> +#endif
<br>> + free(_data);
<br>> + return NULL;
<br>> + }
<br>> + }
<br>> +
<br>> + ret = cdio_new ((void *)_data, &_funcs);
<br>> + if (ret == NULL) return NULL;
<br>> +
<br>> + ret->driver_id = DRIVER_OS2;
<br>> +
<br>> + if (init_os2(_data))
<br>> + return ret;
<br>> + else {
<br>> + free_os2 (_data);
<br>> + return NULL;
<br>> + }
<br>> +#else
<br>> + return NULL;
<br>> +#endif /* HAVE_OS2_CDROM */
<br>> +
<br>> +}
<br>> +
<br>> +/*!
<br>> + Initialization routine. This is the only thing that doesn't
<br>> + get called via a function pointer. In fact *we* are the
<br>> + ones to set that up.
<br>> + */
<br>> +CdIo_t *
<br>> +cdio_open_am_os2 (const char *psz_source_name, const char
<br>> *psz_access_mode)
<br>> +{
<br>> +
<br>> + if (psz_access_mode != NULL)
<br>> + cdio_warn ("there is only one access mode for OS/2. Arg %s ignored",
<br>> + psz_access_mode);
<br>> + return cdio_open_os2(psz_source_name);
<br>> +}
<br>> +
<br>> +bool
<br>> +cdio_have_os2 (void)
<br>> +{
<br>> +#ifdef HAVE_OS2_CDROM
<br>> + return true;
<br>> +#else
<br>> + return false;
<br>> +#endif /* HAVE_OS2_CDROM */
<br>> +}
<br>> +
<br>> +
<br>> diff -buNr src/util.c.org src/util.c
<br>> --- src/util.c.org 2008-04-15 10:22:12.000000000 +0900
<br>> +++ src/util.c 2009-01-09 01:59:12.000000000 +0900
<br>> @@ -160,7 +160,7 @@
<br>> char *
<br>> fillout_device_name(const char *device_name)
<br>> {
<br>> -#if defined(HAVE_WIN32_CDROM)
<br>> +#if defined(HAVE_WIN32_CDROM) || defined(HAVE_OS2_CDROM)
<br>> return strdup(device_name);
<br>> #else
<br>> unsigned int prefix_len = strlen(DEV_PREFIX);
<br>>
<br>>
<br></div><p>From forum: <a href="http://old.nabble.com/Gnu---Libcdio---Dev-f1706.html" embed="fixTarget[1706]" target="_top" >Gnu - Libcdio - Dev</a></p>