cannam@85
|
1 /*
|
cannam@85
|
2 ** Copyright (C) 2007-2011 Erik de Castro Lopo <erikd@mega-nerd.com>
|
cannam@85
|
3 **
|
cannam@85
|
4 ** This program is free software; you can redistribute it and/or modify
|
cannam@85
|
5 ** it under the terms of the GNU Lesser General Public License as published by
|
cannam@85
|
6 ** the Free Software Foundation; either version 2.1 of the License, or
|
cannam@85
|
7 ** (at your option) any later version.
|
cannam@85
|
8 **
|
cannam@85
|
9 ** This program is distributed in the hope that it will be useful,
|
cannam@85
|
10 ** but WITHOUT ANY WARRANTY; without even the implied warranty of
|
cannam@85
|
11 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
cannam@85
|
12 ** GNU Lesser General Public License for more details.
|
cannam@85
|
13 **
|
cannam@85
|
14 ** You should have received a copy of the GNU Lesser General Public License
|
cannam@85
|
15 ** along with this program; if not, write to the Free Software
|
cannam@85
|
16 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
cannam@85
|
17 */
|
cannam@85
|
18
|
cannam@85
|
19 #include <octave/oct.h>
|
cannam@85
|
20
|
cannam@85
|
21 #include "sndfile.h"
|
cannam@85
|
22
|
cannam@85
|
23 #define FOUR_GIG (0x100000000LL)
|
cannam@85
|
24 #define BUFFER_FRAMES 8192
|
cannam@85
|
25
|
cannam@85
|
26
|
cannam@85
|
27 static int format_of_str (const std::string & fmt) ;
|
cannam@85
|
28 static void string_of_format (std::string & fmt, int format) ;
|
cannam@85
|
29
|
cannam@85
|
30
|
cannam@85
|
31 DEFUN_DLD (sfversion, args, nargout ,
|
cannam@85
|
32 "-*- texinfo -*-\n\
|
cannam@85
|
33 @deftypefn {Loadable Function} {@var{version} =} sfversion ()\n\
|
cannam@85
|
34 @cindex Reading sound files\n\
|
cannam@85
|
35 Return a string containing the libsndfile version.\n\
|
cannam@85
|
36 @seealso{sfread, sfwrite}\n\
|
cannam@85
|
37 @end deftypefn")
|
cannam@85
|
38 { char buffer [256] ;
|
cannam@85
|
39 octave_value_list retval ;
|
cannam@85
|
40
|
cannam@85
|
41 /* Bail out if the input parameters are bad. */
|
cannam@85
|
42 if (args.length () != 0 || nargout > 1)
|
cannam@85
|
43 { print_usage () ;
|
cannam@85
|
44 return retval ;
|
cannam@85
|
45 } ;
|
cannam@85
|
46
|
cannam@85
|
47 sf_command (NULL, SFC_GET_LIB_VERSION, buffer, sizeof (buffer)) ;
|
cannam@85
|
48
|
cannam@85
|
49 std::string version (buffer) ;
|
cannam@85
|
50
|
cannam@85
|
51 retval.append (version) ;
|
cannam@85
|
52 return retval ;
|
cannam@85
|
53 } /* sfversion */
|
cannam@85
|
54
|
cannam@85
|
55
|
cannam@85
|
56 DEFUN_DLD (sfread, args, nargout ,
|
cannam@85
|
57 "-*- texinfo -*-\n\
|
cannam@85
|
58 @deftypefn {Loadable Function} {@var{data},@var{srate},@var{format} =} sfread (@var{filename})\n\
|
cannam@85
|
59 @cindex Reading sound files\n\
|
cannam@85
|
60 Read a sound file from disk using libsndfile.\n\
|
cannam@85
|
61 @seealso{sfversion, sfwrite}\n\
|
cannam@85
|
62 @end deftypefn")
|
cannam@85
|
63 { SNDFILE * file ;
|
cannam@85
|
64 SF_INFO sfinfo ;
|
cannam@85
|
65
|
cannam@85
|
66 octave_value_list retval ;
|
cannam@85
|
67
|
cannam@85
|
68 int nargin = args.length () ;
|
cannam@85
|
69
|
cannam@85
|
70 /* Bail out if the input parameters are bad. */
|
cannam@85
|
71 if ((nargin != 1) || !args (0) .is_string () || nargout < 1 || nargout > 3)
|
cannam@85
|
72 { print_usage () ;
|
cannam@85
|
73 return retval ;
|
cannam@85
|
74 } ;
|
cannam@85
|
75
|
cannam@85
|
76 memset (&sfinfo, 0, sizeof (sfinfo)) ;
|
cannam@85
|
77
|
cannam@85
|
78 std::string filename = args (0).string_value () ;
|
cannam@85
|
79
|
cannam@85
|
80 if ((file = sf_open (filename.c_str (), SFM_READ, &sfinfo)) == NULL)
|
cannam@85
|
81 { error ("sfread: couldn't open file %s : %s", filename.c_str (), sf_strerror (NULL)) ;
|
cannam@85
|
82 return retval ;
|
cannam@85
|
83 } ;
|
cannam@85
|
84
|
cannam@85
|
85 if (sfinfo.frames > FOUR_GIG)
|
cannam@85
|
86 printf ("This is a really huge file (%lld frames).\nYou may run out of memory trying to load it.\n", (long long) sfinfo.frames) ;
|
cannam@85
|
87
|
cannam@85
|
88 dim_vector dim = dim_vector () ;
|
cannam@85
|
89 dim.resize (2) ;
|
cannam@85
|
90 dim (0) = sfinfo.frames ;
|
cannam@85
|
91 dim (1) = sfinfo.channels ;
|
cannam@85
|
92
|
cannam@85
|
93 /* Should I be using Matrix instead? */
|
cannam@85
|
94 NDArray out (dim, 0.0) ;
|
cannam@85
|
95
|
cannam@85
|
96 float buffer [BUFFER_FRAMES * sfinfo.channels] ;
|
cannam@85
|
97 int readcount ;
|
cannam@85
|
98 sf_count_t total = 0 ;
|
cannam@85
|
99
|
cannam@85
|
100 do
|
cannam@85
|
101 { readcount = sf_readf_float (file, buffer, BUFFER_FRAMES) ;
|
cannam@85
|
102
|
cannam@85
|
103 /* Make sure we don't read more frames than we allocated. */
|
cannam@85
|
104 if (total + readcount > sfinfo.frames)
|
cannam@85
|
105 readcount = sfinfo.frames - total ;
|
cannam@85
|
106
|
cannam@85
|
107 for (int ch = 0 ; ch < sfinfo.channels ; ch++)
|
cannam@85
|
108 { for (int k = 0 ; k < readcount ; k++)
|
cannam@85
|
109 out (total + k, ch) = buffer [k * sfinfo.channels + ch] ;
|
cannam@85
|
110 } ;
|
cannam@85
|
111
|
cannam@85
|
112 total += readcount ;
|
cannam@85
|
113 } while (readcount > 0 && total < sfinfo.frames) ;
|
cannam@85
|
114
|
cannam@85
|
115 retval.append (out.squeeze ()) ;
|
cannam@85
|
116
|
cannam@85
|
117 if (nargout >= 2)
|
cannam@85
|
118 retval.append ((octave_uint32) sfinfo.samplerate) ;
|
cannam@85
|
119
|
cannam@85
|
120 if (nargout >= 3)
|
cannam@85
|
121 { std::string fmt ("") ;
|
cannam@85
|
122 string_of_format (fmt, sfinfo.format) ;
|
cannam@85
|
123 retval.append (fmt) ;
|
cannam@85
|
124 } ;
|
cannam@85
|
125
|
cannam@85
|
126 /* Clean up. */
|
cannam@85
|
127 sf_close (file) ;
|
cannam@85
|
128
|
cannam@85
|
129 return retval ;
|
cannam@85
|
130 } /* sfread */
|
cannam@85
|
131
|
cannam@85
|
132 DEFUN_DLD (sfwrite, args, nargout ,
|
cannam@85
|
133 "-*- texinfo -*-\n\
|
cannam@85
|
134 @deftypefn {Function File} sfwrite (@var{filename},@var{data},@var{srate},@var{format})\n\
|
cannam@85
|
135 Write a sound file to disk using libsndfile.\n\
|
cannam@85
|
136 @seealso{sfread, sfversion}\n\
|
cannam@85
|
137 @end deftypefn\n\
|
cannam@85
|
138 ")
|
cannam@85
|
139 { SNDFILE * file ;
|
cannam@85
|
140 SF_INFO sfinfo ;
|
cannam@85
|
141
|
cannam@85
|
142 octave_value_list retval ;
|
cannam@85
|
143
|
cannam@85
|
144 int nargin = args.length () ;
|
cannam@85
|
145
|
cannam@85
|
146 /* Bail out if the input parameters are bad. */
|
cannam@85
|
147 if (nargin != 4 || !args (0).is_string () || !args (1).is_real_matrix ()
|
cannam@85
|
148 || !args (2).is_real_scalar () || !args (3).is_string ()
|
cannam@85
|
149 || nargout != 0)
|
cannam@85
|
150 { print_usage () ;
|
cannam@85
|
151 return retval ;
|
cannam@85
|
152 } ;
|
cannam@85
|
153
|
cannam@85
|
154 std::string filename = args (0).string_value () ;
|
cannam@85
|
155 std::string format = args (3).string_value () ;
|
cannam@85
|
156
|
cannam@85
|
157 memset (&sfinfo, 0, sizeof (sfinfo)) ;
|
cannam@85
|
158
|
cannam@85
|
159 sfinfo.format = format_of_str (format) ;
|
cannam@85
|
160 if (sfinfo.format == 0)
|
cannam@85
|
161 { error ("Bad format '%s'", format.c_str ()) ;
|
cannam@85
|
162 return retval ;
|
cannam@85
|
163 } ;
|
cannam@85
|
164
|
cannam@85
|
165 sfinfo.samplerate = lrint (args (2).scalar_value ()) ;
|
cannam@85
|
166 if (sfinfo.samplerate < 1)
|
cannam@85
|
167 { error ("Bad sample rate : %d.\n", sfinfo.samplerate) ;
|
cannam@85
|
168 return retval ;
|
cannam@85
|
169 } ;
|
cannam@85
|
170
|
cannam@85
|
171 Matrix data = args (1).matrix_value () ;
|
cannam@85
|
172 long rows = args (1).rows () ;
|
cannam@85
|
173 long cols = args (1).columns () ;
|
cannam@85
|
174
|
cannam@85
|
175 if (cols > rows)
|
cannam@85
|
176 { error ("Audio data should have one column per channel, but supplied data "
|
cannam@85
|
177 "has %ld rows and %ld columns.\n", rows, cols) ;
|
cannam@85
|
178 return retval ;
|
cannam@85
|
179 } ;
|
cannam@85
|
180
|
cannam@85
|
181 sfinfo.channels = cols ;
|
cannam@85
|
182
|
cannam@85
|
183 if ((file = sf_open (filename.c_str (), SFM_WRITE, &sfinfo)) == NULL)
|
cannam@85
|
184 { error ("Couldn't open file %s : %s", filename.c_str (), sf_strerror (NULL)) ;
|
cannam@85
|
185 return retval ;
|
cannam@85
|
186 } ;
|
cannam@85
|
187
|
cannam@85
|
188 float buffer [BUFFER_FRAMES * sfinfo.channels] ;
|
cannam@85
|
189 int writecount ;
|
cannam@85
|
190 long total = 0 ;
|
cannam@85
|
191
|
cannam@85
|
192 do
|
cannam@85
|
193 {
|
cannam@85
|
194 writecount = BUFFER_FRAMES ;
|
cannam@85
|
195
|
cannam@85
|
196 /* Make sure we don't read more frames than we allocated. */
|
cannam@85
|
197 if (total + writecount > rows)
|
cannam@85
|
198 writecount = rows - total ;
|
cannam@85
|
199
|
cannam@85
|
200 for (int ch = 0 ; ch < sfinfo.channels ; ch++)
|
cannam@85
|
201 { for (int k = 0 ; k < writecount ; k++)
|
cannam@85
|
202 buffer [k * sfinfo.channels + ch] = data (total + k, ch) ;
|
cannam@85
|
203 } ;
|
cannam@85
|
204
|
cannam@85
|
205 if (writecount > 0)
|
cannam@85
|
206 sf_writef_float (file, buffer, writecount) ;
|
cannam@85
|
207
|
cannam@85
|
208 total += writecount ;
|
cannam@85
|
209 } while (writecount > 0 && total < rows) ;
|
cannam@85
|
210
|
cannam@85
|
211 /* Clean up. */
|
cannam@85
|
212 sf_close (file) ;
|
cannam@85
|
213
|
cannam@85
|
214 return retval ;
|
cannam@85
|
215 } /* sfwrite */
|
cannam@85
|
216
|
cannam@85
|
217
|
cannam@85
|
218 static void
|
cannam@85
|
219 str_split (const std::string & str, const std::string & delim, std::vector <std::string> & output)
|
cannam@85
|
220 {
|
cannam@85
|
221 unsigned int offset = 0 ;
|
cannam@85
|
222 size_t delim_index = 0 ;
|
cannam@85
|
223
|
cannam@85
|
224 delim_index = str.find (delim, offset) ;
|
cannam@85
|
225
|
cannam@85
|
226 while (delim_index != std::string::npos)
|
cannam@85
|
227 {
|
cannam@85
|
228 output.push_back (str.substr(offset, delim_index - offset)) ;
|
cannam@85
|
229 offset += delim_index - offset + delim.length () ;
|
cannam@85
|
230 delim_index = str.find (delim, offset) ;
|
cannam@85
|
231 }
|
cannam@85
|
232
|
cannam@85
|
233 output.push_back (str.substr (offset)) ;
|
cannam@85
|
234 } /* str_split */
|
cannam@85
|
235
|
cannam@85
|
236 static int
|
cannam@85
|
237 hash_of_str (const std::string & str)
|
cannam@85
|
238 {
|
cannam@85
|
239 int hash = 0 ;
|
cannam@85
|
240
|
cannam@85
|
241 for (unsigned k = 0 ; k < str.length () ; k++)
|
cannam@85
|
242 hash = (hash * 3) + tolower (str [k]) ;
|
cannam@85
|
243
|
cannam@85
|
244 return hash ;
|
cannam@85
|
245 } /* hash_of_str */
|
cannam@85
|
246
|
cannam@85
|
247 static int
|
cannam@85
|
248 major_format_of_hash (const std::string & str)
|
cannam@85
|
249 { int hash ;
|
cannam@85
|
250
|
cannam@85
|
251 hash = hash_of_str (str) ;
|
cannam@85
|
252
|
cannam@85
|
253 switch (hash)
|
cannam@85
|
254 {
|
cannam@85
|
255 case 0x5c8 : /* 'wav' */ return SF_FORMAT_WAV ;
|
cannam@85
|
256 case 0xf84 : /* 'aiff' */ return SF_FORMAT_AIFF ;
|
cannam@85
|
257 case 0x198 : /* 'au' */ return SF_FORMAT_AU ;
|
cannam@85
|
258 case 0x579 : /* 'paf' */ return SF_FORMAT_PAF ;
|
cannam@85
|
259 case 0x5e5 : /* 'svx' */ return SF_FORMAT_SVX ;
|
cannam@85
|
260 case 0x1118 : /* 'nist' */ return SF_FORMAT_NIST ;
|
cannam@85
|
261 case 0x5d6 : /* 'voc' */ return SF_FORMAT_VOC ;
|
cannam@85
|
262 case 0x324a : /* 'ircam' */ return SF_FORMAT_IRCAM ;
|
cannam@85
|
263 case 0x505 : /* 'w64' */ return SF_FORMAT_W64 ;
|
cannam@85
|
264 case 0x1078 : /* 'mat4' */ return SF_FORMAT_MAT4 ;
|
cannam@85
|
265 case 0x1079 : /* 'mat5' */ return SF_FORMAT_MAT5 ;
|
cannam@85
|
266 case 0x5b8 : /* 'pvf' */ return SF_FORMAT_PVF ;
|
cannam@85
|
267 case 0x1d1 : /* 'xi' */ return SF_FORMAT_XI ;
|
cannam@85
|
268 case 0x56f : /* 'htk' */ return SF_FORMAT_HTK ;
|
cannam@85
|
269 case 0x5aa : /* 'sds' */ return SF_FORMAT_SDS ;
|
cannam@85
|
270 case 0x53d : /* 'avr' */ return SF_FORMAT_AVR ;
|
cannam@85
|
271 case 0x11d0 : /* 'wavx' */ return SF_FORMAT_WAVEX ;
|
cannam@85
|
272 case 0x569 : /* 'sd2' */ return SF_FORMAT_SD2 ;
|
cannam@85
|
273 case 0x1014 : /* 'flac' */ return SF_FORMAT_FLAC ;
|
cannam@85
|
274 case 0x504 : /* 'caf' */ return SF_FORMAT_CAF ;
|
cannam@85
|
275 case 0x5f6 : /* 'wve' */ return SF_FORMAT_WVE ;
|
cannam@85
|
276 default : break ;
|
cannam@85
|
277 } ;
|
cannam@85
|
278
|
cannam@85
|
279 printf ("%s : hash '%s' -> 0x%x\n", __func__, str.c_str (), hash) ;
|
cannam@85
|
280
|
cannam@85
|
281 return 0 ;
|
cannam@85
|
282 } /* major_format_of_hash */
|
cannam@85
|
283
|
cannam@85
|
284 static int
|
cannam@85
|
285 minor_format_of_hash (const std::string & str)
|
cannam@85
|
286 { int hash ;
|
cannam@85
|
287
|
cannam@85
|
288 hash = hash_of_str (str) ;
|
cannam@85
|
289
|
cannam@85
|
290 switch (hash)
|
cannam@85
|
291 {
|
cannam@85
|
292 case 0x1085 : /* 'int8' */ return SF_FORMAT_PCM_S8 ;
|
cannam@85
|
293 case 0x358a : /* 'uint8' */ return SF_FORMAT_PCM_U8 ;
|
cannam@85
|
294 case 0x31b0 : /* 'int16' */ return SF_FORMAT_PCM_16 ;
|
cannam@85
|
295 case 0x31b1 : /* 'int24' */ return SF_FORMAT_PCM_24 ;
|
cannam@85
|
296 case 0x31b2 : /* 'int32' */ return SF_FORMAT_PCM_32 ;
|
cannam@85
|
297 case 0x3128 : /* 'float' */ return SF_FORMAT_FLOAT ;
|
cannam@85
|
298 case 0x937d : /* 'double' */ return SF_FORMAT_DOUBLE ;
|
cannam@85
|
299 case 0x11bd : /* 'ulaw' */ return SF_FORMAT_ULAW ;
|
cannam@85
|
300 case 0xfa1 : /* 'alaw' */ return SF_FORMAT_ALAW ;
|
cannam@85
|
301 case 0xfc361 : /* 'ima_adpcm' */ return SF_FORMAT_IMA_ADPCM ;
|
cannam@85
|
302 case 0x5739a : /* 'ms_adpcm' */ return SF_FORMAT_MS_ADPCM ;
|
cannam@85
|
303 case 0x9450 : /* 'gsm610' */ return SF_FORMAT_GSM610 ;
|
cannam@85
|
304 case 0x172a3 : /* 'g721_32' */ return SF_FORMAT_G721_32 ;
|
cannam@85
|
305 case 0x172d8 : /* 'g723_24' */ return SF_FORMAT_G723_24 ;
|
cannam@85
|
306 case 0x172da : /* 'g723_40' */ return SF_FORMAT_G723_40 ;
|
cannam@85
|
307 default : break ;
|
cannam@85
|
308 } ;
|
cannam@85
|
309
|
cannam@85
|
310 printf ("%s : hash '%s' -> 0x%x\n", __func__, str.c_str (), hash) ;
|
cannam@85
|
311
|
cannam@85
|
312 return 0 ;
|
cannam@85
|
313 } /* minor_format_of_hash */
|
cannam@85
|
314
|
cannam@85
|
315
|
cannam@85
|
316 static const char *
|
cannam@85
|
317 string_of_major_format (int format)
|
cannam@85
|
318 {
|
cannam@85
|
319 switch (format & SF_FORMAT_TYPEMASK)
|
cannam@85
|
320 {
|
cannam@85
|
321 case SF_FORMAT_WAV : return "wav" ;
|
cannam@85
|
322 case SF_FORMAT_AIFF : return "aiff" ;
|
cannam@85
|
323 case SF_FORMAT_AU : return "au" ;
|
cannam@85
|
324 case SF_FORMAT_PAF : return "paf" ;
|
cannam@85
|
325 case SF_FORMAT_SVX : return "svx" ;
|
cannam@85
|
326 case SF_FORMAT_NIST : return "nist" ;
|
cannam@85
|
327 case SF_FORMAT_VOC : return "voc" ;
|
cannam@85
|
328 case SF_FORMAT_IRCAM : return "ircam" ;
|
cannam@85
|
329 case SF_FORMAT_W64 : return "w64" ;
|
cannam@85
|
330 case SF_FORMAT_MAT4 : return "mat4" ;
|
cannam@85
|
331 case SF_FORMAT_MAT5 : return "mat5" ;
|
cannam@85
|
332 case SF_FORMAT_PVF : return "pvf" ;
|
cannam@85
|
333 case SF_FORMAT_XI : return "xi" ;
|
cannam@85
|
334 case SF_FORMAT_HTK : return "htk" ;
|
cannam@85
|
335 case SF_FORMAT_SDS : return "sds" ;
|
cannam@85
|
336 case SF_FORMAT_AVR : return "avr" ;
|
cannam@85
|
337 case SF_FORMAT_WAVEX : return "wavx" ;
|
cannam@85
|
338 case SF_FORMAT_SD2 : return "sd2" ;
|
cannam@85
|
339 case SF_FORMAT_FLAC : return "flac" ;
|
cannam@85
|
340 case SF_FORMAT_CAF : return "caf" ;
|
cannam@85
|
341 case SF_FORMAT_WVE : return "wfe" ;
|
cannam@85
|
342 default : break ;
|
cannam@85
|
343 } ;
|
cannam@85
|
344
|
cannam@85
|
345 return "unknown" ;
|
cannam@85
|
346 } /* string_of_major_format */
|
cannam@85
|
347
|
cannam@85
|
348 static const char *
|
cannam@85
|
349 string_of_minor_format (int format)
|
cannam@85
|
350 {
|
cannam@85
|
351 switch (format & SF_FORMAT_SUBMASK)
|
cannam@85
|
352 {
|
cannam@85
|
353 case SF_FORMAT_PCM_S8 : return "int8" ;
|
cannam@85
|
354 case SF_FORMAT_PCM_U8 : return "uint8" ;
|
cannam@85
|
355 case SF_FORMAT_PCM_16 : return "int16" ;
|
cannam@85
|
356 case SF_FORMAT_PCM_24 : return "int24" ;
|
cannam@85
|
357 case SF_FORMAT_PCM_32 : return "int32" ;
|
cannam@85
|
358 case SF_FORMAT_FLOAT : return "float" ;
|
cannam@85
|
359 case SF_FORMAT_DOUBLE : return "double" ;
|
cannam@85
|
360 case SF_FORMAT_ULAW : return "ulaw" ;
|
cannam@85
|
361 case SF_FORMAT_ALAW : return "alaw" ;
|
cannam@85
|
362 case SF_FORMAT_IMA_ADPCM : return "ima_adpcm" ;
|
cannam@85
|
363 case SF_FORMAT_MS_ADPCM : return "ms_adpcm" ;
|
cannam@85
|
364 case SF_FORMAT_GSM610 : return "gsm610" ;
|
cannam@85
|
365 case SF_FORMAT_G721_32 : return "g721_32" ;
|
cannam@85
|
366 case SF_FORMAT_G723_24 : return "g723_24" ;
|
cannam@85
|
367 case SF_FORMAT_G723_40 : return "g723_40" ;
|
cannam@85
|
368 default : break ;
|
cannam@85
|
369 } ;
|
cannam@85
|
370
|
cannam@85
|
371 return "unknown" ;
|
cannam@85
|
372 } /* string_of_minor_format */
|
cannam@85
|
373
|
cannam@85
|
374 static int
|
cannam@85
|
375 format_of_str (const std::string & fmt)
|
cannam@85
|
376 {
|
cannam@85
|
377 std::vector <std::string> split ;
|
cannam@85
|
378
|
cannam@85
|
379 str_split (fmt, "-", split) ;
|
cannam@85
|
380
|
cannam@85
|
381 if (split.size () != 2)
|
cannam@85
|
382 return 0 ;
|
cannam@85
|
383
|
cannam@85
|
384 int major_fmt = major_format_of_hash (split.at (0)) ;
|
cannam@85
|
385 if (major_fmt == 0)
|
cannam@85
|
386 return 0 ;
|
cannam@85
|
387
|
cannam@85
|
388 int minor_fmt = minor_format_of_hash (split.at (1)) ;
|
cannam@85
|
389 if (minor_fmt == 0)
|
cannam@85
|
390 return 0 ;
|
cannam@85
|
391
|
cannam@85
|
392 return major_fmt | minor_fmt ;
|
cannam@85
|
393 } /* format_of_str */
|
cannam@85
|
394
|
cannam@85
|
395 static void
|
cannam@85
|
396 string_of_format (std::string & fmt, int format)
|
cannam@85
|
397 {
|
cannam@85
|
398 char buffer [64] ;
|
cannam@85
|
399
|
cannam@85
|
400 snprintf (buffer, sizeof (buffer), "%s-%s", string_of_major_format (format), string_of_minor_format (format)) ;
|
cannam@85
|
401
|
cannam@85
|
402 fmt = buffer ;
|
cannam@85
|
403
|
cannam@85
|
404 return ;
|
cannam@85
|
405 } /* string_of_format */
|