* 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>
#include "decoder.hpp"
-#include <pv/view/logicsignal.hpp>
+#include <pv/data/signalbase.hpp>
using std::set;
using std::map;
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)
+void Decoder::set_channels(map<const srd_channel*,
+ shared_ptr<data::SignalBase> > channels)
{
channels_ = channels;
}
-const std::map<std::string, GVariant*>& Decoder::options() const
+const map<string, GVariant*>& Decoder::options() const
{
return options_;
}
{
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;
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);
}