projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AnalogSignal: Temporarily disable analog signal conversion
[pulseview.git]
/
pv
/
data
/
decode
/
decoder.cpp
diff --git
a/pv/data/decode/decoder.cpp
b/pv/data/decode/decoder.cpp
index 374dd4d360c9bf8bca84f544eaf04892395c9888..d7ec5e11bc3525102d073b7d171fb5be6f478d2c 100644
(file)
--- 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
* 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 <cassert>
@@
-25,7
+24,7
@@
#include "decoder.hpp"
#include "decoder.hpp"
-#include <pv/
view/logicsignal
.hpp>
+#include <pv/
data/signalbase
.hpp>
using std::set;
using std::map;
using std::set;
using std::map;
@@
-44,7
+43,7
@@
Decoder::Decoder(const srd_decoder *const dec) :
Decoder::~Decoder()
{
Decoder::~Decoder()
{
- for (auto
& option : options_)
+ for (auto& option : options_)
g_variant_unref(option.second);
}
g_variant_unref(option.second);
}
@@
-63,19
+62,19
@@
void Decoder::show(bool show)
shown_ = 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_;
}
Decoder::channels() const
{
return channels_;
}
-void Decoder::set_channels(
std::
map<const srd_channel*,
- s
td::shared_ptr<view::LogicSignal
> > channels)
+void Decoder::set_channels(map<const srd_channel*,
+ s
hared_ptr<data::SignalBase
> > channels)
{
channels_ = channels;
}
{
channels_ = channels;
}
-const
std::map<std::
string, GVariant*>& Decoder::options() const
+const
map<
string, GVariant*>& Decoder::options() const
{
return options_;
}
{
return options_;
}
@@
-102,10
+101,10
@@
bool Decoder::have_required_channels() const
set< shared_ptr<pv::data::Logic> > Decoder::get_data()
{
set< shared_ptr<pv::data::Logic> > data;
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());
+ for (const auto& channel : channels_) {
+ shared_ptr<
data::SignalBase> b
(channel.second);
+ assert(
b
);
+ data.insert(
b
->logic_data());
}
return data;
}
return data;
@@
-116,7
+115,7
@@
srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
- for (const auto
& option : options_) {
+ for (const auto& option : options_) {
GVariant *const value = option.second;
g_variant_ref(value);
g_hash_table_replace(opt_hash, (void*)g_strdup(
GVariant *const value = option.second;
g_variant_ref(value);
g_hash_table_replace(opt_hash, (void*)g_strdup(
@@
-134,10
+133,9
@@
srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
GHashTable *const channels = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
GHashTable *const channels = g_hash_table_new_full(g_str_hash,
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());
+ for (const auto& channel : channels_) {
+ 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);
}
g_variant_ref_sink(gvar);
g_hash_table_insert(channels, channel.first->id, gvar);
}
@@
-147,6
+145,6
@@
srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
return decoder_inst;
}
return decoder_inst;
}
-}
//
decode
-}
//
data
-}
//
pv
+}
// namespace
decode
+}
// namespace
data
+}
// namespace
pv