Merge branch 'master' of https://github.com/mrjacobagilbert/gr-gsm into mrjaco-master

Added appropriate changes to grc files, corrected CMakeLists files

4 files changed, 14 insertions, 8 deletions

diff --git a/lib/misc_utils/bursts_printer_impl.cc b/lib/misc_utils/bursts_printer_impl.cc
index 8803a84..cd42f12 100644
--- a/lib/misc_utils/bursts_printer_impl.cc
+++ b/lib/misc_utils/bursts_printer_impl.cc
@@ -44,6 +44,7 @@ namespace gr {
         int8_t * burst = (int8_t *)(pmt::blob_data(header_plus_burst))+sizeof(gsmtap_hdr);
         size_t burst_len=pmt::blob_length(header_plus_burst)-sizeof(gsmtap_hdr);
         
+        std::cout << d_prepend_string;
         for(int ii=0; ii<burst_len; ii++)
         {
           std::cout << std::setprecision(1) << static_cast<int>(burst[ii]) << "";
@@ -52,20 +53,21 @@ namespace gr {
     }
      
     bursts_printer::sptr
-    bursts_printer::make()
+    bursts_printer::make(pmt::pmt_t prepend_string)
     {
       return gnuradio::get_initial_sptr
-        (new bursts_printer_impl());
+        (new bursts_printer_impl(prepend_string));
     }
 
     /*
      * The private constructor
      */
-    bursts_printer_impl::bursts_printer_impl()
+    bursts_printer_impl::bursts_printer_impl(pmt::pmt_t prepend_string)
       : gr::block("bursts_printer",
               gr::io_signature::make(0, 0, 0),
               gr::io_signature::make(0, 0, 0))
     {
+        d_prepend_string = prepend_string;
         message_port_register_in(pmt::mp("bursts"));
         set_msg_handler(pmt::mp("bursts"), boost::bind(&bursts_printer_impl::bursts_print, this, _1));
     }
diff --git a/lib/misc_utils/bursts_printer_impl.h b/lib/misc_utils/bursts_printer_impl.h
index 0ee6923..21ca62e 100644
--- a/lib/misc_utils/bursts_printer_impl.h
+++ b/lib/misc_utils/bursts_printer_impl.h
@@ -33,8 +33,9 @@ namespace gr {
     {
      private:
       void bursts_print(pmt::pmt_t burst);
+      pmt::pmt_t d_prepend_string;
      public:
-      bursts_printer_impl();
+      bursts_printer_impl(pmt::pmt_t prepend_string);
       ~bursts_printer_impl();
     };
 
diff --git a/lib/misc_utils/message_printer_impl.cc b/lib/misc_utils/message_printer_impl.cc
index 48cd95b..d02e2fe 100644
--- a/lib/misc_utils/message_printer_impl.cc
+++ b/lib/misc_utils/message_printer_impl.cc
@@ -40,6 +40,7 @@ namespace gr {
         
         gsmtap_hdr * header = (gsmtap_hdr *)message_plus_header;
         
+        std::cout << d_prepend_string;
         for(int ii=sizeof(gsmtap_hdr); ii<message_plus_header_len; ii++)
         {
             printf(" %02x", message_plus_header[ii]);
@@ -48,20 +49,21 @@ namespace gr {
     }
 
     message_printer::sptr
-    message_printer::make()
+    message_printer::make(pmt::pmt_t prepend_string)
     {
       return gnuradio::get_initial_sptr
-        (new message_printer_impl());
+        (new message_printer_impl(prepend_string));
     }
 
     /*
      * The private constructor
      */
-    message_printer_impl::message_printer_impl()
+    message_printer_impl::message_printer_impl(pmt::pmt_t prepend_string)
       : gr::block("message_printer",
               gr::io_signature::make(0, 0, 0),
               gr::io_signature::make(0, 0, 0))
     {
+        d_prepend_string = prepend_string;
         message_port_register_in(pmt::mp("msgs"));
         set_msg_handler(pmt::mp("msgs"), boost::bind(&message_printer_impl::message_print, this, _1));
 
diff --git a/lib/misc_utils/message_printer_impl.h b/lib/misc_utils/message_printer_impl.h
index e2c8236..e82485e 100644
--- a/lib/misc_utils/message_printer_impl.h
+++ b/lib/misc_utils/message_printer_impl.h
@@ -32,8 +32,9 @@ namespace gr {
     {
      private:
       void message_print(pmt::pmt_t msg);
+      pmt::pmt_t d_prepend_string;
      public:
-      message_printer_impl();
+      message_printer_impl(pmt::pmt_t prepend_string);
       ~message_printer_impl();
     };