[Commit-gnuradio] r3884 - gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime

[jcorgan]

Author: jcorgan
Date: 2006-10-27 17:00:47 -0600 (Fri, 27 Oct 2006)
New Revision: 3884

Added:
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.cc
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.h
Modified:
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/Makefile.am
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
Log:
Work in progress.

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/Makefile.am
 2006-10-27 22:32:12 UTC (rev 3883)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/Makefile.am
 2006-10-27 23:00:47 UTC (rev 3884)
@@ -34,6 +34,7 @@
        gr_block.cc                             \
        gr_block_detail.cc                      \
        gr_hier_block2.cc                       \
+       gr_hier_block2_impl.cc                  \
        gr_buffer.cc                            \
        gr_dispatcher.cc                        \
        gr_error_handler.cc                     \
@@ -67,6 +68,7 @@
        gr_block.h                              \
        gr_block_detail.h                       \
        gr_hier_block2.h                        \
+       gr_hier_block2_impl.h                   \
        gr_buffer.h                             \
        gr_complex.h                            \
        gr_dispatcher.h                         \

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
   2006-10-27 22:32:12 UTC (rev 3883)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
   2006-10-27 23:00:47 UTC (rev 3884)
@@ -25,32 +25,33 @@
 #endif
 
 #include <gr_hier_block2.h>
+#include <gr_hier_block2_impl.h>
 #include <iostream>
 
-using namespace std;
-
-gr_hier_block2_sptr gr_make_hier_block2(const string name, 
+gr_hier_block2_sptr gr_make_hier_block2(const std::string name, 
                                        gr_io_signature_sptr input_signature,
                                        gr_io_signature_sptr output_signature)
 {
     return gr_hier_block2_sptr(new gr_hier_block2(name, input_signature, 
output_signature));
 }
 
-gr_hier_block2::gr_hier_block2(const string name,
+gr_hier_block2::gr_hier_block2(const std::string name,
                               gr_io_signature_sptr input_signature,
                               gr_io_signature_sptr output_signature)
-  : gr_basic_block(name, input_signature, output_signature)
+  : gr_basic_block(name, input_signature, output_signature),
+    d_impl(new gr_hier_block2_impl())
 {
     if (GR_HIER_BLOCK2_DEBUG)
-       cout << "Constructing hier_block2 with name '" << name << "'." << endl;
+       std::cout << "Constructing hier_block2 with name '" << name << "'." << 
std::endl;
 }
 
-gr_hier_block2::~gr_hier_block2 ()
+gr_hier_block2::~gr_hier_block2()
 {
+    delete d_impl;
 }
 
-void gr_hier_block2::define_component(const string name, gr_block_sptr comp)
+void gr_hier_block2::define_component(const std::string name, gr_block_sptr 
comp)
 {
     if (GR_HIER_BLOCK2_DEBUG)
-       cout << "Adding block '" << name << "' to container." << endl;
+       std::cout << "Adding block '" << name << "' to container." << std::endl;
 }

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
    2006-10-27 22:32:12 UTC (rev 3883)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
    2006-10-27 23:00:47 UTC (rev 3884)
@@ -34,6 +34,8 @@
                                        gr_io_signature_sptr input_signature,
                                        gr_io_signature_sptr output_signature);
 
+class gr_hier_block2_impl;
+
 /*!
  * \brief gr_hier_block2 - Hierarchical container class for gr_block's
  *
@@ -44,6 +46,12 @@
     friend gr_hier_block2_sptr gr_make_hier_block2(const std::string name,
                                                   gr_io_signature_sptr 
input_signature,
                                                   gr_io_signature_sptr 
output_signature);
+
+    /*!
+     * \brief Private implementation details of gr_hier_block2
+     */
+    gr_hier_block2_impl *d_impl;
+    
 protected: 
     gr_hier_block2(const std::string name,
                   gr_io_signature_sptr input_signature,

Added: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.cc
                              (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.cc
      2006-10-27 23:00:47 UTC (rev 3884)
@@ -0,0 +1,38 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gr_hier_block2_impl.h>
+#include <iostream>
+
+gr_hier_block2_impl::gr_hier_block2_impl()
+{
+    if (GR_HIER_BLOCK2_IMPL_DEBUG)
+       std::cout << "Constructing hier_block2_impl" << std::endl;
+}
+
+gr_hier_block2_impl::~gr_hier_block2_impl()
+{
+}


Property changes on: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.cc
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.h
                               (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.h
       2006-10-27 23:00:47 UTC (rev 3884)
@@ -0,0 +1,38 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006 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_HIER_BLOCK2_IMPL_H
+#define INCLUDED_GR_HIER_BLOCK2_IMPL_H
+
+// Define to 0 to eliminate debugging
+#define GR_HIER_BLOCK2_IMPL_DEBUG 1
+
+class gr_hier_block2_impl
+{
+private:
+    friend class gr_hier_block2;
+    gr_hier_block2_impl();
+        
+public:
+    ~gr_hier_block2_impl();
+};
+
+#endif /* INCLUDED_GR_HIER_BLOCK2_H */


Property changes on: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.h
___________________________________________________________________
Name: svn:eol-style
   + native