projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added Ctrl-Q and Ctrl-W shortcuts.
[pulseview.git]
/
pv
/
data
/
decode
/
decoder.hpp
diff --git
a/pv/data/decode/decoder.hpp
b/pv/data/decode/decoder.hpp
index aa79e01c93d4894f312d0b63c9cc3c99bde8b5bc..3d3e01d4787df95cbce69d9f1dd5471eaed8cbed 100644
(file)
--- a/
pv/data/decode/decoder.hpp
+++ b/
pv/data/decode/decoder.hpp
@@
-14,12
+14,11
@@
* 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/>.
*/
*/
-#ifndef PULSEVIEW_PV_DATA_DECODE_DECODER_H
-#define PULSEVIEW_PV_DATA_DECODE_DECODER_H
+#ifndef PULSEVIEW_PV_DATA_DECODE_DECODER_H
PP
+#define PULSEVIEW_PV_DATA_DECODE_DECODER_H
PP
#include <map>
#include <memory>
#include <map>
#include <memory>
@@
-34,20
+33,17
@@
struct srd_session;
namespace pv {
namespace pv {
-namespace view {
-class LogicSignal;
-}
-
namespace data {
class Logic;
namespace data {
class Logic;
+class SignalBase;
namespace decode {
class Decoder
{
public:
namespace decode {
class Decoder
{
public:
- Decoder(const srd_decoder *const dec
oder
);
+ Decoder(const srd_decoder *const dec);
virtual ~Decoder();
virtual ~Decoder();
@@
-57,9
+53,9
@@
public:
void show(bool show = true);
const std::map<const srd_channel*,
void show(bool show = true);
const std::map<const srd_channel*,
- std::shared_ptr<
view::LogicSignal
> >& channels() const;
+ std::shared_ptr<
data::SignalBase
> >& channels() const;
void set_channels(std::map<const srd_channel*,
void set_channels(std::map<const srd_channel*,
- std::shared_ptr<
view::LogicSignal
> > channels);
+ std::shared_ptr<
data::SignalBase
> > channels);
const std::map<std::string, GVariant*>& options() const;
const std::map<std::string, GVariant*>& options() const;
@@
-68,7
+64,7
@@
public:
bool have_required_channels() const;
srd_decoder_inst* create_decoder_inst(
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<pv::data::Logic> > get_data();
std::set< std::shared_ptr<pv::data::Logic> > get_data();
@@
-77,7
+73,7
@@
private:
bool shown_;
bool shown_;
- std::map<const srd_channel*, std::shared_ptr<pv::
view::LogicSignal
> >
+ std::map<const srd_channel*, std::shared_ptr<pv::
data::SignalBase
> >
channels_;
std::map<std::string, GVariant*> options_;
};
channels_;
std::map<std::string, GVariant*> options_;
};
@@
-86,4
+82,4
@@
private:
} // namespace data
} // namespace pv
} // namespace data
} // namespace pv
-#endif // PULSEVIEW_PV_DATA_DECODE_DECODER_H
+#endif // PULSEVIEW_PV_DATA_DECODE_DECODER_H
PP