X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=5fae925886155a900394cb64d6861e6e3fb37b82;hp=1513b20be5cb70156db3dfe33c43c8c0e4fd594b;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=27c0521002ea986b72d9675b99803665516db14c

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 1513b20..5fae925 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cassert>
@@ -25,7 +24,7 @@
 
 #include "decoder.hpp"
 
-#include <pv/view/logicsignal.hpp>
+#include <pv/data/signalbase.hpp>
 
 using std::set;
 using std::map;
@@ -63,14 +62,14 @@ void Decoder::show(bool show)
 	shown_ = show;
 }
 
-const map<const srd_channel*, shared_ptr<view::LogicSignal> >&
+const map<const srd_channel*, shared_ptr<data::SignalBase> >&
 Decoder::channels() const
 {
 	return channels_;
 }
 
 void Decoder::set_channels(std::map<const srd_channel*,
-	std::shared_ptr<view::LogicSignal> > channels)
+	std::shared_ptr<data::SignalBase> > channels)
 {
 	channels_ = channels;
 }
@@ -103,9 +102,9 @@ set< shared_ptr<pv::data::Logic> > Decoder::get_data()
 {
 	set< shared_ptr<pv::data::Logic> > data;
 	for (const auto& channel : channels_) {
-		shared_ptr<view::LogicSignal> signal(channel.second);
-		assert(signal);
-		data.insert(signal->logic_data());
+		shared_ptr<data::SignalBase> b(channel.second);
+		assert(b);
+		data.insert(b->logic_data());
 	}
 
 	return data;
@@ -135,9 +134,8 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
 		g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
 	for (const auto& channel : channels_) {
-		shared_ptr<view::LogicSignal> signal(channel.second);
-		GVariant *const gvar = g_variant_new_int32(
-			signal->channel()->index());
+		shared_ptr<data::SignalBase> b(channel.second);
+		GVariant *const gvar = g_variant_new_int32(b->index());
 		g_variant_ref_sink(gvar);
 		g_hash_table_insert(channels, channel.first->id, gvar);
 	}