X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.hpp;h=3d3e01d4787df95cbce69d9f1dd5471eaed8cbed;hp=121286f17aeed8e748d90045d019f3ae63b8b0fa;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=c4dd1e4ee295c4fc6bc3db0feaf826df4807cc91
diff --git a/pv/data/decode/decoder.hpp b/pv/data/decode/decoder.hpp
index 121286f..3d3e01d 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;
@@ -77,7 +73,7 @@ private:
bool shown_;
- std::map >
+ std::map >
channels_;
std::map options_;
};