rbcdio 0.04 → 0.05
Sign up to get free protection for your applications and to get access to all the features.
- data/ChangeLog +68 -0
- data/Makefile.am +6 -0
- data/Makefile.in +78 -37
- data/README +2 -3
- data/Rakefile +71 -154
- data/VERSION +1 -1
- data/config.guess +57 -50
- data/config.sub +51 -16
- data/configure +1182 -1459
- data/configure.ac +1 -1
- data/ext/cdio/Makefile +59 -87
- data/ext/cdio/extconf.rb +17 -14
- data/ext/cdio/rubycdio_wrap.c +101 -70
- data/ext/iso9660/Makefile +59 -87
- data/ext/iso9660/extconf.rb +14 -12
- data/ext/iso9660/rubyiso9660_wrap.c +87 -56
- data/install-sh +3 -2
- data/missing +29 -20
- data/test/isocopy.rb +32 -28
- metadata +15 -7
data/configure.ac
CHANGED
@@ -18,7 +18,7 @@
|
|
18
18
|
## Note: the version number (the 2nd parameter in AC_INIT)
|
19
19
|
## is picked up inside the Python debugger script.
|
20
20
|
|
21
|
-
AC_INIT([rbcdio],[0.
|
21
|
+
AC_INIT([rbcdio],[0.05],[libcdio-rubycdio-devel@gnu.org])
|
22
22
|
|
23
23
|
AC_REVISION([$Id: configure.ac,v 1.8 2008/09/22 20:26:24 rocky Exp $])dnl
|
24
24
|
|
data/ext/cdio/Makefile
CHANGED
@@ -4,83 +4,67 @@ SHELL = /bin/sh
|
|
4
4
|
#### Start of system configuration section. ####
|
5
5
|
|
6
6
|
srcdir = .
|
7
|
-
topdir = /usr/
|
8
|
-
hdrdir =
|
9
|
-
|
10
|
-
VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
|
11
|
-
prefix = $(DESTDIR)/usr/local
|
12
|
-
rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
|
7
|
+
topdir = /usr/lib/ruby/1.8/i486-linux
|
8
|
+
hdrdir = $(topdir)
|
9
|
+
VPATH = $(srcdir):$(topdir):$(hdrdir)
|
13
10
|
exec_prefix = $(prefix)
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
vendordir = $(rubylibprefix)/vendor_ruby
|
18
|
-
sitedir = $(rubylibprefix)/site_ruby
|
19
|
-
mandir = $(datarootdir)/man
|
20
|
-
localedir = $(datarootdir)/locale
|
21
|
-
libdir = $(exec_prefix)/lib
|
11
|
+
prefix = $(DESTDIR)/usr
|
12
|
+
sharedstatedir = $(prefix)/com
|
13
|
+
mandir = $(prefix)/share/man
|
22
14
|
psdir = $(docdir)
|
23
|
-
pdfdir = $(docdir)
|
24
|
-
dvidir = $(docdir)
|
25
|
-
htmldir = $(docdir)
|
26
|
-
infodir = $(datarootdir)/info
|
27
|
-
docdir = $(datarootdir)/doc/$(PACKAGE)
|
28
15
|
oldincludedir = $(DESTDIR)/usr/include
|
16
|
+
localedir = $(datarootdir)/locale
|
17
|
+
bindir = $(exec_prefix)/bin
|
18
|
+
libexecdir = $(prefix)/lib/ruby1.8
|
19
|
+
sitedir = $(DESTDIR)/usr/local/lib/site_ruby
|
20
|
+
htmldir = $(docdir)
|
21
|
+
vendorarchdir = $(vendorlibdir)/$(sitearch)
|
29
22
|
includedir = $(prefix)/include
|
30
|
-
|
31
|
-
|
32
|
-
sysconfdir = $(
|
33
|
-
|
34
|
-
datarootdir = $(prefix)/share
|
35
|
-
libexecdir = $(exec_prefix)/libexec
|
23
|
+
infodir = $(prefix)/share/info
|
24
|
+
vendorlibdir = $(vendordir)/$(ruby_version)
|
25
|
+
sysconfdir = $(DESTDIR)/etc
|
26
|
+
libdir = $(exec_prefix)/lib
|
36
27
|
sbindir = $(exec_prefix)/sbin
|
37
|
-
|
38
|
-
|
28
|
+
rubylibdir = $(libdir)/ruby/$(ruby_version)
|
29
|
+
docdir = $(datarootdir)/doc/$(PACKAGE)
|
30
|
+
dvidir = $(docdir)
|
31
|
+
vendordir = $(libdir)/ruby/vendor_ruby
|
32
|
+
datarootdir = $(prefix)/share
|
33
|
+
pdfdir = $(docdir)
|
39
34
|
archdir = $(rubylibdir)/$(arch)
|
40
|
-
sitelibdir = $(sitedir)/$(ruby_version)
|
41
35
|
sitearchdir = $(sitelibdir)/$(sitearch)
|
42
|
-
|
43
|
-
|
36
|
+
datadir = $(datarootdir)
|
37
|
+
localstatedir = $(DESTDIR)/var
|
38
|
+
sitelibdir = $(sitedir)/$(ruby_version)
|
44
39
|
|
45
40
|
CC = gcc
|
46
|
-
|
47
|
-
LIBRUBY = $(LIBRUBY_A)
|
41
|
+
LIBRUBY = $(LIBRUBY_SO)
|
48
42
|
LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
|
49
|
-
LIBRUBYARG_SHARED = -
|
50
|
-
LIBRUBYARG_STATIC = -
|
51
|
-
OUTFLAG = -o
|
52
|
-
COUTFLAG = -o
|
43
|
+
LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
|
44
|
+
LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
|
53
45
|
|
54
46
|
RUBY_EXTCONF_H =
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
warnflags = -Wall -Wno-unused-parameter -Wno-parentheses -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings
|
59
|
-
CFLAGS = -fPIC $(cflags)
|
60
|
-
INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
|
61
|
-
DEFS =
|
47
|
+
CFLAGS = -fPIC -fno-strict-aliasing -g -g -O2 -fPIC $(cflags) -I/usr/local/include
|
48
|
+
INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
|
49
|
+
DEFS = -D_FILE_OFFSET_BITS=64
|
62
50
|
CPPFLAGS = $(DEFS) $(cppflags)
|
63
|
-
CXXFLAGS = $(CFLAGS)
|
64
|
-
ldflags = -L.
|
51
|
+
CXXFLAGS = $(CFLAGS)
|
52
|
+
ldflags = -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic -L/usr/local/lib -lcdio -lm
|
65
53
|
dldflags =
|
66
54
|
archflag =
|
67
55
|
DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
|
68
56
|
LDSHARED = $(CC) -shared
|
69
|
-
LDSHAREDXX = $(CXX) -shared
|
70
57
|
AR = ar
|
71
58
|
EXEEXT =
|
72
59
|
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
ruby = /usr/local/bin/ruby
|
60
|
+
RUBY_INSTALL_NAME = ruby1.8
|
61
|
+
RUBY_SO_NAME = ruby1.8
|
62
|
+
arch = i486-linux
|
63
|
+
sitearch = i486-linux
|
64
|
+
ruby_version = 1.8
|
65
|
+
ruby = /usr/bin/ruby1.8
|
80
66
|
RUBY = $(ruby)
|
81
67
|
RM = rm -f
|
82
|
-
RM_RF = $(RUBY) -run -e rm -- -rf
|
83
|
-
RMDIRS = $(RUBY) -run -e rmdir -- -p
|
84
68
|
MAKEDIRS = mkdir -p
|
85
69
|
INSTALL = /usr/bin/install -c
|
86
70
|
INSTALL_PROG = $(INSTALL) -m 0755
|
@@ -92,18 +76,17 @@ COPY = cp
|
|
92
76
|
preload =
|
93
77
|
|
94
78
|
libpath = . $(libdir)
|
95
|
-
LIBPATH = -L. -L$(libdir)
|
79
|
+
LIBPATH = -L. -L$(libdir)
|
96
80
|
DEFFILE =
|
97
81
|
|
98
82
|
CLEANFILES = mkmf.log
|
99
83
|
DISTCLEANFILES =
|
100
|
-
DISTCLEANDIRS =
|
101
84
|
|
102
85
|
extout =
|
103
86
|
extout_prefix =
|
104
87
|
target_prefix =
|
105
|
-
LOCAL_LIBS =
|
106
|
-
LIBS =
|
88
|
+
LOCAL_LIBS =
|
89
|
+
LIBS = $(LIBRUBYARG_SHARED) -lpthread -lrt -ldl -lcrypt -lm -lc
|
107
90
|
SRCS = rubycdio_wrap.c
|
108
91
|
OBJS = rubycdio_wrap.o
|
109
92
|
TARGET = rubycdio
|
@@ -115,38 +98,27 @@ BINDIR = $(bindir)
|
|
115
98
|
RUBYCOMMONDIR = $(sitedir)$(target_prefix)
|
116
99
|
RUBYLIBDIR = $(sitelibdir)$(target_prefix)
|
117
100
|
RUBYARCHDIR = $(sitearchdir)$(target_prefix)
|
118
|
-
HDRDIR = $(rubyhdrdir)/ruby$(target_prefix)
|
119
|
-
ARCHHDRDIR = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
|
120
101
|
|
121
102
|
TARGET_SO = $(DLLIB)
|
122
|
-
CLEANLIBS = $(TARGET).so
|
123
|
-
CLEANOBJS = *.o
|
124
|
-
|
125
|
-
all:
|
126
|
-
static:
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
clean-rb-default::
|
131
|
-
clean-rb::
|
132
|
-
clean-so::
|
133
|
-
clean: clean-so clean-rb-default clean-rb
|
103
|
+
CLEANLIBS = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
|
104
|
+
CLEANOBJS = *.o *.a *.s[ol] *.pdb *.exp *.bak
|
105
|
+
|
106
|
+
all: $(DLLIB)
|
107
|
+
static: $(STATIC_LIB)
|
108
|
+
|
109
|
+
clean:
|
134
110
|
@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
|
135
111
|
|
136
|
-
distclean
|
137
|
-
distclean-rb::
|
138
|
-
distclean-so::
|
139
|
-
distclean: clean distclean-so distclean-rb-default distclean-rb
|
112
|
+
distclean: clean
|
140
113
|
@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
|
141
114
|
@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
|
142
|
-
@-$(RMDIRS) $(DISTCLEANDIRS)
|
143
115
|
|
144
|
-
realclean:
|
116
|
+
realclean: distclean
|
145
117
|
install: install-so install-rb
|
146
118
|
|
147
119
|
install-so: $(RUBYARCHDIR)
|
148
120
|
install-so: $(RUBYARCHDIR)/$(DLLIB)
|
149
|
-
$(RUBYARCHDIR)/$(DLLIB): $(
|
121
|
+
$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
|
150
122
|
$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
|
151
123
|
install-rb: pre-install-rb install-rb-default
|
152
124
|
install-rb-default: pre-install-rb-default
|
@@ -162,24 +134,24 @@ site-install-rb: install-rb
|
|
162
134
|
.SUFFIXES: .c .m .cc .cxx .cpp .C .o
|
163
135
|
|
164
136
|
.cc.o:
|
165
|
-
$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS)
|
137
|
+
$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
|
166
138
|
|
167
139
|
.cxx.o:
|
168
|
-
$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS)
|
140
|
+
$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
|
169
141
|
|
170
142
|
.cpp.o:
|
171
|
-
$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS)
|
143
|
+
$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
|
172
144
|
|
173
145
|
.C.o:
|
174
|
-
$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS)
|
146
|
+
$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
|
175
147
|
|
176
148
|
.c.o:
|
177
|
-
$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS)
|
149
|
+
$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
|
178
150
|
|
179
151
|
$(DLLIB): $(OBJS) Makefile
|
180
|
-
@-$(RM)
|
152
|
+
@-$(RM) $@
|
181
153
|
$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
|
182
154
|
|
183
155
|
|
184
156
|
|
185
|
-
$(OBJS):
|
157
|
+
$(OBJS): ruby.h defines.h
|
data/ext/cdio/extconf.rb
CHANGED
@@ -1,17 +1,20 @@
|
|
1
1
|
require 'mkmf'
|
2
2
|
dir_config('rubycdio')
|
3
|
-
require
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
3
|
+
require 'rbconfig'
|
4
|
+
|
5
|
+
config_file = File.join(File.dirname(__FILE__), 'config_options')
|
6
|
+
load config_file if File.exist?(config_file)
|
7
|
+
|
8
|
+
$LDFLAGS = [
|
9
|
+
$LDFLAGS,
|
10
|
+
ENV['LDFLAGS'],
|
11
|
+
`pkg-config libcdio --libs`.strip
|
12
|
+
].join(' ')
|
13
|
+
|
14
|
+
$CFLAGS = [
|
15
|
+
$CFLAGS,
|
16
|
+
ENV['CFLAGS'],
|
17
|
+
`pkg-config libcdio --cflags`.strip
|
18
|
+
].join(' ')
|
19
|
+
|
17
20
|
create_makefile('rubycdio')
|
data/ext/cdio/rubycdio_wrap.c
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
/* ----------------------------------------------------------------------------
|
2
2
|
* This file was automatically generated by SWIG (http://www.swig.org).
|
3
|
-
* Version 1.3.
|
3
|
+
* Version 1.3.40
|
4
4
|
*
|
5
5
|
* This file is not intended to be easily readable and contains a number of
|
6
6
|
* coding conventions designed to improve portability and efficiency. Do not make
|
@@ -9,6 +9,7 @@
|
|
9
9
|
* ----------------------------------------------------------------------------- */
|
10
10
|
|
11
11
|
#define SWIGRUBY
|
12
|
+
|
12
13
|
/* -----------------------------------------------------------------------------
|
13
14
|
* This section contains generic SWIG labels for method/variable
|
14
15
|
* declarations/attributes, and other compiler dependent labels.
|
@@ -230,7 +231,7 @@
|
|
230
231
|
/* -----------------------------------------------------------------------------
|
231
232
|
* swigrun.swg
|
232
233
|
*
|
233
|
-
* This file contains generic
|
234
|
+
* This file contains generic C API SWIG runtime support for pointer
|
234
235
|
* type checking.
|
235
236
|
* ----------------------------------------------------------------------------- */
|
236
237
|
|
@@ -249,11 +250,11 @@
|
|
249
250
|
|
250
251
|
/*
|
251
252
|
You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
|
252
|
-
creating a static or dynamic library from the
|
253
|
-
In 99.9% of the cases,
|
253
|
+
creating a static or dynamic library from the SWIG runtime code.
|
254
|
+
In 99.9% of the cases, SWIG just needs to declare them as 'static'.
|
254
255
|
|
255
|
-
But only do this if
|
256
|
-
with your compiler or
|
256
|
+
But only do this if strictly necessary, ie, if you have problems
|
257
|
+
with your compiler or suchlike.
|
257
258
|
*/
|
258
259
|
|
259
260
|
#ifndef SWIGRUNTIME
|
@@ -280,14 +281,14 @@
|
|
280
281
|
/*
|
281
282
|
Flags/methods for returning states.
|
282
283
|
|
283
|
-
The
|
284
|
+
The SWIG conversion methods, as ConvertPtr, return and integer
|
284
285
|
that tells if the conversion was successful or not. And if not,
|
285
286
|
an error code can be returned (see swigerrors.swg for the codes).
|
286
287
|
|
287
288
|
Use the following macros/flags to set or process the returning
|
288
289
|
states.
|
289
290
|
|
290
|
-
In old
|
291
|
+
In old versions of SWIG, code such as the following was usually written:
|
291
292
|
|
292
293
|
if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
|
293
294
|
// success code
|
@@ -295,7 +296,7 @@
|
|
295
296
|
//fail code
|
296
297
|
}
|
297
298
|
|
298
|
-
Now you can be more explicit
|
299
|
+
Now you can be more explicit:
|
299
300
|
|
300
301
|
int res = SWIG_ConvertPtr(obj,vptr,ty.flags);
|
301
302
|
if (SWIG_IsOK(res)) {
|
@@ -304,7 +305,7 @@
|
|
304
305
|
// fail code
|
305
306
|
}
|
306
307
|
|
307
|
-
|
308
|
+
which is the same really, but now you can also do
|
308
309
|
|
309
310
|
Type *ptr;
|
310
311
|
int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags);
|
@@ -322,7 +323,7 @@
|
|
322
323
|
|
323
324
|
I.e., now SWIG_ConvertPtr can return new objects and you can
|
324
325
|
identify the case and take care of the deallocation. Of course that
|
325
|
-
|
326
|
+
also requires SWIG_ConvertPtr to return new result values, such as
|
326
327
|
|
327
328
|
int SWIG_ConvertPtr(obj, ptr,...) {
|
328
329
|
if (<obj is ok>) {
|
@@ -340,7 +341,7 @@
|
|
340
341
|
|
341
342
|
Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
|
342
343
|
more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the
|
343
|
-
|
344
|
+
SWIG errors code.
|
344
345
|
|
345
346
|
Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
|
346
347
|
allows to return the 'cast rank', for example, if you have this
|
@@ -354,9 +355,8 @@
|
|
354
355
|
fooi(1) // cast rank '0'
|
355
356
|
|
356
357
|
just use the SWIG_AddCast()/SWIG_CheckState()
|
358
|
+
*/
|
357
359
|
|
358
|
-
|
359
|
-
*/
|
360
360
|
#define SWIG_OK (0)
|
361
361
|
#define SWIG_ERROR (-1)
|
362
362
|
#define SWIG_IsOK(r) (r >= 0)
|
@@ -381,7 +381,6 @@
|
|
381
381
|
#define SWIG_DelTmpMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r)
|
382
382
|
#define SWIG_IsTmpObj(r) (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK))
|
383
383
|
|
384
|
-
|
385
384
|
/* Cast-Rank Mode */
|
386
385
|
#if defined(SWIG_CASTRANK_MODE)
|
387
386
|
# ifndef SWIG_TypeRank
|
@@ -404,8 +403,6 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
|
|
404
403
|
#endif
|
405
404
|
|
406
405
|
|
407
|
-
|
408
|
-
|
409
406
|
#include <string.h>
|
410
407
|
|
411
408
|
#ifdef __cplusplus
|
@@ -502,40 +499,58 @@ SWIG_TypeCompare(const char *nb, const char *tb) {
|
|
502
499
|
}
|
503
500
|
|
504
501
|
|
505
|
-
/* think of this as a c++ template<> or a scheme macro */
|
506
|
-
#define SWIG_TypeCheck_Template(comparison, ty) \
|
507
|
-
if (ty) { \
|
508
|
-
swig_cast_info *iter = ty->cast; \
|
509
|
-
while (iter) { \
|
510
|
-
if (comparison) { \
|
511
|
-
if (iter == ty->cast) return iter; \
|
512
|
-
/* Move iter to the top of the linked list */ \
|
513
|
-
iter->prev->next = iter->next; \
|
514
|
-
if (iter->next) \
|
515
|
-
iter->next->prev = iter->prev; \
|
516
|
-
iter->next = ty->cast; \
|
517
|
-
iter->prev = 0; \
|
518
|
-
if (ty->cast) ty->cast->prev = iter; \
|
519
|
-
ty->cast = iter; \
|
520
|
-
return iter; \
|
521
|
-
} \
|
522
|
-
iter = iter->next; \
|
523
|
-
} \
|
524
|
-
} \
|
525
|
-
return 0
|
526
|
-
|
527
502
|
/*
|
528
503
|
Check the typename
|
529
504
|
*/
|
530
505
|
SWIGRUNTIME swig_cast_info *
|
531
506
|
SWIG_TypeCheck(const char *c, swig_type_info *ty) {
|
532
|
-
|
507
|
+
if (ty) {
|
508
|
+
swig_cast_info *iter = ty->cast;
|
509
|
+
while (iter) {
|
510
|
+
if (strcmp(iter->type->name, c) == 0) {
|
511
|
+
if (iter == ty->cast)
|
512
|
+
return iter;
|
513
|
+
/* Move iter to the top of the linked list */
|
514
|
+
iter->prev->next = iter->next;
|
515
|
+
if (iter->next)
|
516
|
+
iter->next->prev = iter->prev;
|
517
|
+
iter->next = ty->cast;
|
518
|
+
iter->prev = 0;
|
519
|
+
if (ty->cast) ty->cast->prev = iter;
|
520
|
+
ty->cast = iter;
|
521
|
+
return iter;
|
522
|
+
}
|
523
|
+
iter = iter->next;
|
524
|
+
}
|
525
|
+
}
|
526
|
+
return 0;
|
533
527
|
}
|
534
528
|
|
535
|
-
/*
|
529
|
+
/*
|
530
|
+
Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
|
531
|
+
*/
|
536
532
|
SWIGRUNTIME swig_cast_info *
|
537
|
-
SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *
|
538
|
-
|
533
|
+
SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) {
|
534
|
+
if (ty) {
|
535
|
+
swig_cast_info *iter = ty->cast;
|
536
|
+
while (iter) {
|
537
|
+
if (iter->type == from) {
|
538
|
+
if (iter == ty->cast)
|
539
|
+
return iter;
|
540
|
+
/* Move iter to the top of the linked list */
|
541
|
+
iter->prev->next = iter->next;
|
542
|
+
if (iter->next)
|
543
|
+
iter->next->prev = iter->prev;
|
544
|
+
iter->next = ty->cast;
|
545
|
+
iter->prev = 0;
|
546
|
+
if (ty->cast) ty->cast->prev = iter;
|
547
|
+
ty->cast = iter;
|
548
|
+
return iter;
|
549
|
+
}
|
550
|
+
iter = iter->next;
|
551
|
+
}
|
552
|
+
}
|
553
|
+
return 0;
|
539
554
|
}
|
540
555
|
|
541
556
|
/*
|
@@ -823,6 +838,15 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
|
|
823
838
|
#ifdef read
|
824
839
|
# undef read
|
825
840
|
#endif
|
841
|
+
#ifdef bind
|
842
|
+
# undef bind
|
843
|
+
#endif
|
844
|
+
#ifdef close
|
845
|
+
# undef close
|
846
|
+
#endif
|
847
|
+
#ifdef connect
|
848
|
+
# undef connect
|
849
|
+
#endif
|
826
850
|
|
827
851
|
|
828
852
|
/* Ruby 1.7 defines NUM2LL(), LL2NUM() and ULL2NUM() macros */
|
@@ -1790,7 +1814,7 @@ static VALUE mRubycdio;
|
|
1790
1814
|
#define SWIG_RUBY_THREAD_END_BLOCK
|
1791
1815
|
|
1792
1816
|
|
1793
|
-
#define SWIGVERSION
|
1817
|
+
#define SWIGVERSION 0x010340
|
1794
1818
|
#define SWIG_VERSION SWIGVERSION
|
1795
1819
|
|
1796
1820
|
|
@@ -2063,7 +2087,14 @@ SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
|
|
2063
2087
|
#ifdef __cplusplus
|
2064
2088
|
extern "C" {
|
2065
2089
|
#endif
|
2090
|
+
|
2091
|
+
// Ruby 1.9 changed the file name of this header
|
2092
|
+
#ifdef HAVE_RUBY_IO_H
|
2093
|
+
#include "ruby/io.h"
|
2094
|
+
#else
|
2066
2095
|
#include "rubyio.h"
|
2096
|
+
#endif
|
2097
|
+
|
2067
2098
|
#ifdef __cplusplus
|
2068
2099
|
}
|
2069
2100
|
#endif
|
@@ -2723,7 +2754,7 @@ fail:
|
|
2723
2754
|
audio_stop(cdio)->status
|
2724
2755
|
Stop playing an audio CD..
|
2725
2756
|
*/
|
2726
|
-
swig_class
|
2757
|
+
swig_class SwigClassBuf_triple_t;
|
2727
2758
|
|
2728
2759
|
|
2729
2760
|
/*
|
@@ -5308,7 +5339,7 @@ Find out if media has changed since the last call.
|
|
5308
5339
|
Return 1 if media has changed since last call, 0 if not. Error
|
5309
5340
|
return codes are the same as driver_return_code_t.
|
5310
5341
|
*/
|
5311
|
-
swig_class
|
5342
|
+
swig_class SwigClassHWInfo_t;
|
5312
5343
|
|
5313
5344
|
|
5314
5345
|
/*
|
@@ -6255,19 +6286,19 @@ SWIGEXPORT void Init_rubycdio(void) {
|
|
6255
6286
|
rb_define_const(mRubycdio, "READ_MODE_M2F1", SWIG_From_long((long)(CDIO_READ_MODE_M2F1)));
|
6256
6287
|
rb_define_const(mRubycdio, "READ_MODE_M2F2", SWIG_From_long((long)(CDIO_READ_MODE_M2F2)));
|
6257
6288
|
|
6258
|
-
|
6259
|
-
SWIG_TypeClientData(SWIGTYPE_p_Buf_triple_t, (void *) &
|
6260
|
-
rb_define_alloc_func(
|
6261
|
-
rb_define_method(
|
6262
|
-
rb_define_method(
|
6263
|
-
rb_define_method(
|
6264
|
-
rb_define_method(
|
6265
|
-
rb_define_method(
|
6266
|
-
rb_define_method(
|
6267
|
-
rb_define_method(
|
6268
|
-
|
6269
|
-
|
6270
|
-
|
6289
|
+
SwigClassBuf_triple_t.klass = rb_define_class_under(mRubycdio, "Buf_triple_t", rb_cObject);
|
6290
|
+
SWIG_TypeClientData(SWIGTYPE_p_Buf_triple_t, (void *) &SwigClassBuf_triple_t);
|
6291
|
+
rb_define_alloc_func(SwigClassBuf_triple_t.klass, _wrap_Buf_triple_t_allocate);
|
6292
|
+
rb_define_method(SwigClassBuf_triple_t.klass, "initialize", _wrap_new_Buf_triple_t, -1);
|
6293
|
+
rb_define_method(SwigClassBuf_triple_t.klass, "data=", _wrap_Buf_triple_t_data_set, -1);
|
6294
|
+
rb_define_method(SwigClassBuf_triple_t.klass, "data", _wrap_Buf_triple_t_data_get, -1);
|
6295
|
+
rb_define_method(SwigClassBuf_triple_t.klass, "size=", _wrap_Buf_triple_t_size_set, -1);
|
6296
|
+
rb_define_method(SwigClassBuf_triple_t.klass, "size", _wrap_Buf_triple_t_size_get, -1);
|
6297
|
+
rb_define_method(SwigClassBuf_triple_t.klass, "drc=", _wrap_Buf_triple_t_drc_set, -1);
|
6298
|
+
rb_define_method(SwigClassBuf_triple_t.klass, "drc", _wrap_Buf_triple_t_drc_get, -1);
|
6299
|
+
SwigClassBuf_triple_t.mark = 0;
|
6300
|
+
SwigClassBuf_triple_t.destroy = (void (*)(void *)) free_Buf_triple_t;
|
6301
|
+
SwigClassBuf_triple_t.trackObjects = 0;
|
6271
6302
|
rb_define_module_function(mRubycdio, "lseek", _wrap_lseek, -1);
|
6272
6303
|
rb_define_module_function(mRubycdio, "read_cd", _wrap_read_cd, -1);
|
6273
6304
|
rb_define_module_function(mRubycdio, "read_sectors", _wrap_read_sectors, -1);
|
@@ -6454,17 +6485,17 @@ SWIGEXPORT void Init_rubycdio(void) {
|
|
6454
6485
|
rb_define_module_function(mRubycdio, "tocfile?", _wrap_tocfileq___, -1);
|
6455
6486
|
rb_define_module_function(mRubycdio, "get_media_changed", _wrap_get_media_changed, -1);
|
6456
6487
|
|
6457
|
-
|
6458
|
-
SWIG_TypeClientData(SWIGTYPE_p_HWInfo_t, (void *) &
|
6459
|
-
rb_define_alloc_func(
|
6460
|
-
rb_define_method(
|
6461
|
-
rb_define_method(
|
6462
|
-
rb_define_method(
|
6463
|
-
rb_define_method(
|
6464
|
-
rb_define_method(
|
6465
|
-
|
6466
|
-
|
6467
|
-
|
6488
|
+
SwigClassHWInfo_t.klass = rb_define_class_under(mRubycdio, "HWInfo_t", rb_cObject);
|
6489
|
+
SWIG_TypeClientData(SWIGTYPE_p_HWInfo_t, (void *) &SwigClassHWInfo_t);
|
6490
|
+
rb_define_alloc_func(SwigClassHWInfo_t.klass, _wrap_HWInfo_t_allocate);
|
6491
|
+
rb_define_method(SwigClassHWInfo_t.klass, "initialize", _wrap_new_HWInfo_t, -1);
|
6492
|
+
rb_define_method(SwigClassHWInfo_t.klass, "hw=", _wrap_HWInfo_t_hw_set, -1);
|
6493
|
+
rb_define_method(SwigClassHWInfo_t.klass, "hw", _wrap_HWInfo_t_hw_get, -1);
|
6494
|
+
rb_define_method(SwigClassHWInfo_t.klass, "result=", _wrap_HWInfo_t_result_set, -1);
|
6495
|
+
rb_define_method(SwigClassHWInfo_t.klass, "result", _wrap_HWInfo_t_result_get, -1);
|
6496
|
+
SwigClassHWInfo_t.mark = 0;
|
6497
|
+
SwigClassHWInfo_t.destroy = (void (*)(void *)) free_HWInfo_t;
|
6498
|
+
SwigClassHWInfo_t.trackObjects = 0;
|
6468
6499
|
rb_define_module_function(mRubycdio, "get_hwinfo", _wrap_get_hwinfo, -1);
|
6469
6500
|
rb_define_module_function(mRubycdio, "set_blocksize", _wrap_set_blocksize, -1);
|
6470
6501
|
rb_define_module_function(mRubycdio, "set_speed", _wrap_set_speed, -1);
|