diff -Naur libsndfile-1.0.21/programs/Makefile.am libsndfile-1.0.21-haiku/programs/Makefile.am
|
old
|
new
|
|
| 16 | 16 | sndfile_info_SOURCES = sndfile-info.c |
| 17 | 17 | sndfile_info_LDADD = $(top_builddir)/src/libsndfile.la |
| 18 | 18 | |
| 19 | | sndfile_play_SOURCES = sndfile-play.c |
| 20 | | sndfile_play_LDADD = $(top_builddir)/src/libsndfile.la $(OS_SPECIFIC_LINKS) $(ALSA_LIBS) |
| | 19 | sndfile_play_SOURCES = sndfile-play-beos.cpp test-sndfile-metadata-set.py |
| | 20 | sndfile_play_LDADD = $(top_builddir)/src/libsndfile.la $(OS_SPECIFIC_LINKS) $(ALSA_LIBS) -lbe -lmedia |
| 21 | 21 | |
| 22 | 22 | sndfile_convert_SOURCES = sndfile-convert.c common.c common.h |
| 23 | 23 | sndfile_convert_LDADD = $(top_builddir)/src/libsndfile.la |
diff -Naur libsndfile-1.0.21/programs/sndfile-play-beos.cpp libsndfile-1.0.21-haiku/programs/sndfile-play-beos.cpp
|
old
|
new
|
|
| 30 | 30 | ** BeOS functions for playing a sound. |
| 31 | 31 | */ |
| 32 | 32 | |
| 33 | | #if defined (__BEOS__) |
| | 33 | #if defined(__BEOS__) || defined(__HAIKU__) |
| 34 | 34 | |
| 35 | 35 | struct shared_data |
| 36 | 36 | { |
| … |
… |
|
| 60 | 60 | { for (m = readcount ; m < count ; m++) |
| 61 | 61 | buffer [m] = 0 ; |
| 62 | 62 | } |
| 63 | | if (data->sfinfo.pcmbitwidth < 16) |
| | 63 | if (readcount > count) |
| 64 | 64 | { for (m = 0 ; m < count ; m++) |
| 65 | 65 | buffer [m] *= 256 ; |
| 66 | 66 | } |
| … |
… |
|
| 78 | 78 | |
| 79 | 79 | for (k = 1 ; k < argc ; k++) |
| 80 | 80 | { printf ("Playing %s\n", argv [k]) ; |
| 81 | | if (! (data.sndfile = sf_open_read (argv [k], &data.sfinfo))) |
| | 81 | if (! (data.sndfile = sf_open (argv [k], SFM_READ, &data.sfinfo))) |
| 82 | 82 | { sf_perror (NULL) ; |
| 83 | 83 | continue ; |
| 84 | 84 | } ; |