* 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/>.
*/
-#ifndef PULSEVIEW_PV_DATA_DECODE_DECODER_H
-#define PULSEVIEW_PV_DATA_DECODE_DECODER_H
+#ifndef PULSEVIEW_PV_DATA_DECODE_DECODER_HPP
+#define PULSEVIEW_PV_DATA_DECODE_DECODER_HPP
#include <map>
#include <memory>
#include <set>
+#include <vector>
#include <glib.h>
+using std::map;
+using std::string;
+using std::vector;
+
struct srd_decoder;
struct srd_decoder_inst;
struct srd_channel;
namespace pv {
-namespace view {
-class LogicSignal;
-}
-
namespace data {
+struct DecodeChannel;
class Logic;
+class SignalBase;
namespace decode {
class Decoder
{
public:
- Decoder(const srd_decoder *const decoder);
+ Decoder(const srd_decoder *const dec);
virtual ~Decoder();
bool shown() const;
void show(bool show = true);
- const std::map<const srd_channel*,
- std::shared_ptr<view::LogicSignal> >& channels() const;
- void set_channels(std::map<const srd_channel*,
- std::shared_ptr<view::LogicSignal> > channels);
+ const vector<data::DecodeChannel*>& channels() const;
+ void set_channels(vector<data::DecodeChannel*> channels);
- const std::map<std::string, GVariant*>& options() const;
+ const map<string, GVariant*>& options() const;
void set_option(const char *id, GVariant *value);
- bool have_required_channels() const;
+ void apply_all_options();
- srd_decoder_inst* create_decoder_inst(
- srd_session *session, int unit_size) const;
+ bool have_required_channels() const;
- std::set< std::shared_ptr<pv::data::Logic> > get_data();
+ srd_decoder_inst* create_decoder_inst(srd_session *session);
+ void invalidate_decoder_inst();
private:
const srd_decoder *const decoder_;
bool shown_;
- std::map<const srd_channel*, std::shared_ptr<pv::view::LogicSignal> >
- channels_;
- std::map<std::string, GVariant*> options_;
+ vector<data::DecodeChannel*> channels_;
+ map<string, GVariant*> options_;
+ srd_decoder_inst *decoder_inst_;
};
} // namespace decode
} // namespace data
} // namespace pv
-#endif // PULSEVIEW_PV_DATA_DECODE_DECODER_H
+#endif // PULSEVIEW_PV_DATA_DECODE_DECODER_HPP