[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4280 - in gnuradio/trunk/gnuradio-core/src/lib: gener
From: |
eb |
Subject: |
[Commit-gnuradio] r4280 - in gnuradio/trunk/gnuradio-core/src/lib: general gengen |
Date: |
Tue, 16 Jan 2007 10:57:28 -0700 (MST) |
Author: eb
Date: 2007-01-16 10:57:28 -0700 (Tue, 16 Jan 2007)
New Revision: 4280
Added:
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_noise_type.h
Removed:
gnuradio/trunk/gnuradio-core/src/lib/general/gr_noise_type.h
Modified:
gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am
gnuradio/trunk/gnuradio-core/src/lib/general/general.i
gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am
gnuradio/trunk/gnuradio-core/src/lib/gengen/gengen.i
Log:
fixed problem with gr_noise_source_* caused by splitting gnuradio_swig_python
Modified: gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am 2007-01-16
17:45:41 UTC (rev 4279)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am 2007-01-16
17:57:28 UTC (rev 4280)
@@ -210,7 +210,6 @@
gr_misc.h \
gr_nco.h \
gr_nlog10_ff.h \
- gr_noise_type.h \
gr_nop.h \
gr_null_sink.h \
gr_null_source.h \
Modified: gnuradio/trunk/gnuradio-core/src/lib/general/general.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/general.i 2007-01-16
17:45:41 UTC (rev 4279)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/general.i 2007-01-16
17:57:28 UTC (rev 4280)
@@ -27,7 +27,6 @@
#include <gr_null_source.h>
#include <gr_head.h>
#include <gr_skiphead.h>
-#include <gr_noise_type.h>
#include <gr_quadrature_demod_cf.h>
#include <gr_remez.h>
#include <gr_float_to_complex.h>
@@ -117,7 +116,6 @@
%include "gr_null_source.i"
%include "gr_head.i"
%include "gr_skiphead.i"
-%include "gr_noise_type.h"
%include "gr_quadrature_demod_cf.i"
%include "gr_remez.i"
%include "gr_float_to_complex.i"
Deleted: gnuradio/trunk/gnuradio-core/src/lib/general/gr_noise_type.h
Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am 2007-01-16
17:45:41 UTC (rev 4279)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am 2007-01-16
17:57:28 UTC (rev 4280)
@@ -110,6 +110,7 @@
grinclude_HEADERS = \
$(GENERATED_H) \
gr_endianness.h \
+ gr_noise_type.h \
gr_sig_source_waveform.h
noinst_HEADERS =
Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/gengen.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/gengen.i 2007-01-16
17:45:41 UTC (rev 4279)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/gengen.i 2007-01-16
17:57:28 UTC (rev 4280)
@@ -1,9 +1,11 @@
%{
#include "gr_endianness.h"
#include "gr_sig_source_waveform.h"
+#include "gr_noise_type.h"
%}
%include "gr_endianness.i"
%include "gr_sig_source_waveform.h"
+%include "gr_noise_type.h"
%include "gengen_generated.i"
Copied: gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_noise_type.h (from rev
4278, gnuradio/trunk/gnuradio-core/src/lib/general/gr_noise_type.h)
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_noise_type.h
(rev 0)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_noise_type.h 2007-01-16
17:57:28 UTC (rev 4280)
@@ -0,0 +1,30 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_NOISE_TYPE_H
+#define INCLUDED_GR_NOISE_TYPE_H
+
+typedef enum {
+ GR_UNIFORM = 200, GR_GAUSSIAN, GR_LAPLACIAN, GR_IMPULSE
+} gr_noise_type_t;
+
+#endif /* INCLUDED_GR_NOISE_TYPE_H */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4280 - in gnuradio/trunk/gnuradio-core/src/lib: general gengen,
eb <=