Skip to content

Commit 9678cc2

Browse files
committed
swig: Use %flatnested instead of %nestedworkaround
%nestedworkaround is deprecated in SWIG 3 and no longer works.
1 parent 2d646ea commit 9678cc2

File tree

2 files changed

+208
-233
lines changed

2 files changed

+208
-233
lines changed
Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,10 @@
1-
%rename("bits_representing_peak") TagLib::ID3v2::PeakVolume::bitsRepresentingPeak;
2-
%rename("peak_volume") TagLib::ID3v2::PeakVolume::peakVolume;
1+
%rename("bits_representing_peak") TagLib::ID3v2::RelativeVolumeFrame::PeakVolume::bitsRepresentingPeak;
2+
%rename("peak_volume") TagLib::ID3v2::RelativeVolumeFrame::PeakVolume::peakVolume;
33

44
%rename("set_volume_adjustment") TagLib::ID3v2::RelativeVolumeFrame::setVolumeAdjustment;
55
%rename("set_volume_adjustment_index") TagLib::ID3v2::RelativeVolumeFrame::setVolumeAdjustmentIndex;
66
%rename("set_peak_volume") TagLib::ID3v2::RelativeVolumeFrame::setPeakVolume;
77

8-
struct TagLib::ID3v2::PeakVolume {
9-
unsigned char bitsRepresentingPeak;
10-
TagLib::ByteVector peakVolume;
11-
};
12-
13-
%nestedworkaround TagLib::ID3v2::RelativeVolumeFrame::PeakVolume;
14-
15-
%{
16-
namespace TagLib {
17-
namespace ID3v2 {
18-
typedef RelativeVolumeFrame::PeakVolume PeakVolume;
19-
}
20-
}
21-
%}
22-
238
%typemap(out) TagLib::List<TagLib::ID3v2::RelativeVolumeFrame::ChannelType> {
249
VALUE ary = rb_ary_new2($1.size());
2510
for (TagLib::List<TagLib::ID3v2::RelativeVolumeFrame::ChannelType>::ConstIterator it = $1.begin();
@@ -30,6 +15,8 @@ namespace TagLib {
3015
$result = ary;
3116
}
3217

18+
%flatnested TagLib::ID3v2::RelativeVolumeFrame::PeakVolume;
19+
3320
%include <taglib/relativevolumeframe.h>
3421

3522
// vim: set filetype=cpp sw=2 ts=2 expandtab:

0 commit comments

Comments
 (0)