X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.hpp;h=3d3e01d4787df95cbce69d9f1dd5471eaed8cbed;hb=13e475e412663ee904b94a6510b5628bdb8b84fa;hp=3f0f462ba4412b30f0ade603bbc5e160d07969e9;hpb=7a01bd3654ed046216308fa64edfd79be7cd525f;p=pulseview.git
diff --git a/pv/data/decode/decoder.hpp b/pv/data/decode/decoder.hpp
index 3f0f462b..3d3e01d4 100644
--- a/pv/data/decode/decoder.hpp
+++ b/pv/data/decode/decoder.hpp
@@ -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 .
*/
#ifndef PULSEVIEW_PV_DATA_DECODE_DECODER_HPP
@@ -34,20 +33,17 @@ struct srd_session;
namespace pv {
-namespace view {
-class LogicSignal;
-}
-
namespace data {
class Logic;
+class SignalBase;
namespace decode {
class Decoder
{
public:
- Decoder(const srd_decoder *const decoder);
+ Decoder(const srd_decoder *const dec);
virtual ~Decoder();
@@ -57,9 +53,9 @@ public:
void show(bool show = true);
const std::map >& channels() const;
+ std::shared_ptr >& channels() const;
void set_channels(std::map > channels);
+ std::shared_ptr > channels);
const std::map& options() const;
@@ -68,7 +64,7 @@ public:
bool have_required_channels() const;
srd_decoder_inst* create_decoder_inst(
- srd_session *session, int unit_size) const;
+ srd_session *session) const;
std::set< std::shared_ptr > get_data();
@@ -77,7 +73,7 @@ private:
bool shown_;
- std::map >
+ std::map >
channels_;
std::map options_;
};