projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' into dfsg-orig
[debian/gnuradio]
/
gnuradio-core
/
src
/
lib
/
io
/
gr_wavfile_sink.cc
diff --git
a/gnuradio-core/src/lib/io/gr_wavfile_sink.cc
b/gnuradio-core/src/lib/io/gr_wavfile_sink.cc
index f06c33d5cd67e7135d4fd0a8874b02f60dd68b5a..72e4ef51e0721ccbd163e06ac577e3f5eaa91d30 100644
(file)
--- a/
gnuradio-core/src/lib/io/gr_wavfile_sink.cc
+++ b/
gnuradio-core/src/lib/io/gr_wavfile_sink.cc
@@
-1,6
+1,6
@@
/* -*- c++ -*- */
/*
/* -*- c++ -*- */
/*
- * Copyright 2004,2006,2007,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2007,2008
,2009
Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
*
* This file is part of GNU Radio
*
@@
-32,6
+32,7
@@
#include <cstring>
#include <cmath>
#include <fcntl.h>
#include <cstring>
#include <cmath>
#include <fcntl.h>
+#include <gruel/thread.h>
// win32 (mingw/msvc) specific
#ifdef HAVE_IO_H
// win32 (mingw/msvc) specific
#ifdef HAVE_IO_H
@@
-103,7
+104,7
@@
gr_wavfile_sink::gr_wavfile_sink(const char *filename,
bool
gr_wavfile_sink::open(const char* filename)
{
bool
gr_wavfile_sink::open(const char* filename)
{
-
omni_mutex_lock l
(d_mutex);
+
gruel::scoped_lock guard
(d_mutex);
// we use the open system call to get access to the O_LARGEFILE flag.
int fd;
// we use the open system call to get access to the O_LARGEFILE flag.
int fd;
@@
-141,7
+142,7
@@
gr_wavfile_sink::open(const char* filename)
void
gr_wavfile_sink::close()
{
void
gr_wavfile_sink::close()
{
-
omni_mutex_lock l
(d_mutex);
+
gruel::scoped_lock guard
(d_mutex);
if (!d_fp)
return;
if (!d_fp)
return;
@@
-230,7
+231,7
@@
gr_wavfile_sink::convert_to_short(float sample)
void
gr_wavfile_sink::set_bits_per_sample(int bits_per_sample)
{
void
gr_wavfile_sink::set_bits_per_sample(int bits_per_sample)
{
-
omni_mutex_lock l
(d_mutex);
+
gruel::scoped_lock guard
(d_mutex);
if (bits_per_sample == 8 || bits_per_sample == 16) {
d_bytes_per_sample_new = bits_per_sample / 8;
}
if (bits_per_sample == 8 || bits_per_sample == 16) {
d_bytes_per_sample_new = bits_per_sample / 8;
}
@@
-240,7
+241,7
@@
gr_wavfile_sink::set_bits_per_sample(int bits_per_sample)
void
gr_wavfile_sink::set_sample_rate(unsigned int sample_rate)
{
void
gr_wavfile_sink::set_sample_rate(unsigned int sample_rate)
{
-
omni_mutex_lock l
(d_mutex);
+
gruel::scoped_lock guard
(d_mutex);
d_sample_rate = sample_rate;
}
d_sample_rate = sample_rate;
}
@@
-252,7
+253,7
@@
gr_wavfile_sink::do_update()
return;
}
return;
}
-
omni_mutex_lock l
(d_mutex); // hold mutex for duration of this block
+
gruel::scoped_lock guard
(d_mutex); // hold mutex for duration of this block
if (d_fp) {
close_wav();
}
if (d_fp) {
close_wav();
}