Mercurial > audlegacy-plugins
comparison src/adplug/core/rix.cxx @ 953:ae7e96e44f22 trunk
[svn] Now in sync with AdPlug upstream, merging their commit: "Removed superfluous exit() call. This was detected as part of a GCC 4.3
compilation regression test. Thanks to Martin Michlmayr! Fixes Debian bug
#417078."
author | chainsaw |
---|---|
date | Fri, 13 Apr 2007 09:27:41 -0700 |
parents | cae46214b8bf |
children | 4709ce4e209e |
comparison
equal
deleted
inserted
replaced
952:87666f9bf6d0 | 953:ae7e96e44f22 |
---|---|
1 /* | 1 /* |
2 * Adplug - Replayer for many OPL2/OPL3 audio file formats. | 2 * Adplug - Replayer for many OPL2/OPL3 audio file formats. |
3 * Copyright (C) 1999 - 2006 Simon Peter, <dn.tlp@gmx.net>, et al. | 3 * Copyright (C) 1999 - 2007 Simon Peter, <dn.tlp@gmx.net>, et al. |
4 * | 4 * |
5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Lesser General Public | 6 * modify it under the terms of the GNU Lesser General Public |
7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
8 * version 2.1 of the License, or (at your option) any later version. | 8 * version 2.1 of the License, or (at your option) any later version. |
132 opl->init(); | 132 opl->init(); |
133 opl->write(1,32); // go to OPL2 mode | 133 opl->write(1,32); // go to OPL2 mode |
134 set_new_int(); | 134 set_new_int(); |
135 data_initial(); | 135 data_initial(); |
136 } | 136 } |
137 | |
137 unsigned int CrixPlayer::getsubsongs() | 138 unsigned int CrixPlayer::getsubsongs() |
138 { | 139 { |
139 if(flag_mkf) | 140 if(flag_mkf) |
140 { | 141 { |
141 unsigned int *buf_index=(unsigned int *)file_buffer; | 142 unsigned int *buf_index=(unsigned int *)file_buffer; |
155 } | 156 } |
156 | 157 |
157 /*------------------Implemention----------------------------*/ | 158 /*------------------Implemention----------------------------*/ |
158 inline void CrixPlayer::set_new_int() | 159 inline void CrixPlayer::set_new_int() |
159 { | 160 { |
160 if(!ad_initial()) exit(1); | 161 // if(!ad_initial()) exit(1); |
162 ad_initial(); | |
161 } | 163 } |
162 /*----------------------------------------------------------*/ | 164 /*----------------------------------------------------------*/ |
163 inline void CrixPlayer::Pause() | 165 inline void CrixPlayer::Pause() |
164 { | 166 { |
165 register unsigned short i; | 167 register unsigned short i; |