X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.hpp;h=1b655662bcb707dfe5fd83dbc847164e81bc04a2;hb=870ea3dbf35b182e120c5d84ab89bf9cb7691232;hp=2d9fcc639591a5226101f40eb8ded32911447dbf;hpb=520362f8c4082820193f09e43b27a8c7df2ef011;p=pulseview.git
diff --git a/pv/data/decode/decoder.hpp b/pv/data/decode/decoder.hpp
index 2d9fcc6..1b65566 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
@@ -27,6 +26,11 @@
#include
+using std::map;
+using std::set;
+using std::shared_ptr;
+using std::string;
+
struct srd_decoder;
struct srd_decoder_inst;
struct srd_channel;
@@ -34,13 +38,10 @@ struct srd_session;
namespace pv {
-namespace view {
-class LogicSignal;
-}
-
namespace data {
class Logic;
+class SignalBase;
namespace decode {
@@ -56,30 +57,28 @@ public:
bool shown() const;
void show(bool show = true);
- const std::map >& channels() const;
- void set_channels(std::map > channels);
+ const map >& channels() const;
+ void set_channels(map > channels);
- const std::map& options() const;
+ const map& options() const;
void set_option(const char *id, GVariant *value);
bool have_required_channels() const;
- srd_decoder_inst* create_decoder_inst(
- srd_session *session) const;
+ srd_decoder_inst* create_decoder_inst(srd_session *session) const;
- std::set< std::shared_ptr > get_data();
+ set< shared_ptr > get_data();
private:
const srd_decoder *const decoder_;
bool shown_;
- std::map >
- channels_;
- std::map options_;
+ map > channels_;
+ map options_;
};
} // namespace decode