claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Add C++ wrapper routines for MMC commands inside CdioDevice class.

Browse Source 
Some comments/code in sample programs gone over and new onse added for
libcdio++.
This commit is contained in:
rocky
2005-11-14 01:15:33 +00:00
parent 06d3a2e5ac
commit baf2516278
8 changed files with 533 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
example/C++/OO/Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.1 2005/11/10 11:17:15 rocky Exp $
# $Id: Makefile.am,v 1.2 2005/11/14 01:15:33 rocky Exp $
#
# Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
#
@@ -20,7 +20,7 @@
# Sample C++ programs using libcdio++ (with C++ OO wrapper)
############################################################
#
noinst_PROGRAMS = cdtext device eject tracks
noinst_PROGRAMS = cdtext device eject mmc1 mmc2 tracks
INCLUDES = -I$(top_srcdir)/include
@@ -36,6 +36,14 @@ eject_SOURCES = eject.cpp
eject_DEPENDENCIES = $(LIBCDIO_DEPS)
eject_LDADD = $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS)
mmc1_SOURCES = mmc1.cpp
mmc1_DEPENDENCIES = $(LIBCDIO_DEPS)
mmc1_LDADD = $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS)
mmc2_SOURCES = mmc2.cpp
mmc2_DEPENDENCIES = $(LIBCDIO_DEPS)
mmc2_LDADD = $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS)
tracks_SOURCES = tracks.cpp
tracks_LDADD = $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS)

5
example/C++/OO/cdtext.cpp
View File

@@ -1,5 +1,5 @@
/*
$Id: cdtext.cpp,v 1.2 2005/11/11 12:26:57 rocky Exp $
$Id: cdtext.cpp,v 1.3 2005/11/14 01:15:33 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -19,7 +19,8 @@
*/
/* Simple program to list CD-Text info of a Compact Disc using
libcdio. See also corresponding C program of a similar name.
libcdio. An optional drive name can be supplied as an argument.
See also corresponding C program of a similar name.
*/
#ifdef HAVE_CONFIG_H

86
example/C++/OO/mmc1.cpp Normal file
View File

@@ -0,0 +1,86 @@
/*
$Id: mmc1.cpp,v 1.1 2005/11/14 01:15:33 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* Sample program to show use of the MMC interface.
An optional drive name can be supplied as an argument.
This basically the libdio mmc_get_hwinfo() routine.
See also corresponding C and non OO C++ program.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <stdio.h>
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_STRING_H
#include <string.h>
#endif
#include <cdio++/cdio.hpp>
/* Set how long to wait for MMC commands to complete */
#define DEFAULT_TIMEOUT_MS 10000
int
main(int argc, const char *argv[])
{
CdioDevice device;
const char *psz_drive = NULL;
if (argc > 1) psz_drive = argv[1];
if (!device.open(psz_drive)) {
printf("Couldn't find CD\n");
return 1;
} else {
int i_status; /* Result of MMC command */
char buf[36] = { 0, }; /* Place to hold returned data */
mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Buffer */
CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_INQUIRY);
cdb.field[4] = sizeof(buf);
i_status = device.mmcRunCmd(DEFAULT_TIMEOUT_MS, &cdb,
SCSI_MMC_DATA_READ, sizeof(buf), &buf);
if (i_status == 0) {
char psz_vendor[CDIO_MMC_HW_VENDOR_LEN+1];
char psz_model[CDIO_MMC_HW_MODEL_LEN+1];
char psz_rev[CDIO_MMC_HW_REVISION_LEN+1];
memcpy(psz_vendor, buf + 8, sizeof(psz_vendor)-1);
psz_vendor[sizeof(psz_vendor)-1] = '\0';
memcpy(psz_model,
buf + 8 + CDIO_MMC_HW_VENDOR_LEN,
sizeof(psz_model)-1);
psz_model[sizeof(psz_model)-1] = '\0';
memcpy(psz_rev,
buf + 8 + CDIO_MMC_HW_VENDOR_LEN +CDIO_MMC_HW_MODEL_LEN,
sizeof(psz_rev)-1);
psz_rev[sizeof(psz_rev)-1] = '\0';
printf("Vendor: %s\nModel: %s\nRevision: %s\n",
psz_vendor, psz_model, psz_rev);
} else {
printf("Couldn't get INQUIRY data (vendor, model, and revision).\n");
}
}
return 0;
}

15
example/C++/mmc1.cpp
View File

@@ -1,7 +1,7 @@
/*
$Id: mmc1.cpp,v 1.2 2005/03/06 00:03:53 rocky Exp $
$Id: mmc1.cpp,v 1.3 2005/11/14 01:15:33 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,8 +18,10 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* Simple program to show use of SCSI MMC interface. Is basically the
the libdio scsi_mmc_get_hwinfo() routine.
/* Sample program to show use of the MMC interface.
An optional drive name can be supplied as an argument.
This basically the libdio mmc_get_hwinfo() routine.
See also corresponding C and OO C++ program.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -37,8 +39,11 @@ int
main(int argc, const char *argv[])
{
CdIo_t *p_cdio;
const char *psz_drive = NULL;
p_cdio = cdio_open (NULL, DRIVER_UNKNOWN);
if (argc > 1) psz_drive = argv[1];
p_cdio = cdio_open (psz_drive, DRIVER_UNKNOWN);
if (NULL == p_cdio) {
printf("Couldn't find CD\n");