projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Session: Make sure we don't try to add a non-existant decoder
[pulseview.git]
/
pv
/
binding
/
decoder.hpp
diff --git
a/pv/binding/decoder.hpp
b/pv/binding/decoder.hpp
index 107ac15de8a9407541b2d9cd2f7b8e023d25071e..0e93cffee8ddc9b284222f036cb9174b1f7746d7 100644
(file)
--- a/
pv/binding/decoder.hpp
+++ b/
pv/binding/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
* 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_BINDING_DECODER_HPP
*/
#ifndef PULSEVIEW_PV_BINDING_DECODER_HPP
@@
-25,6
+24,8
@@
#include <pv/prop/property.hpp>
#include <pv/prop/property.hpp>
+using std::shared_ptr;
+
struct srd_decoder_option;
namespace pv {
struct srd_decoder_option;
namespace pv {
@@
-41,11
+42,11
@@
namespace binding {
class Decoder : public Binding
{
public:
class Decoder : public Binding
{
public:
- Decoder(s
td::s
hared_ptr<pv::data::DecoderStack> decoder_stack,
- s
td::s
hared_ptr<pv::data::decode::Decoder> decoder);
+ Decoder(shared_ptr<pv::data::DecoderStack> decoder_stack,
+ shared_ptr<pv::data::decode::Decoder> decoder);
private:
private:
- static s
td::s
hared_ptr<prop::Property> bind_enum(const QString &name,
+ static shared_ptr<prop::Property> bind_enum(const QString &name,
const srd_decoder_option *option,
prop::Property::Getter getter, prop::Property::Setter setter);
const srd_decoder_option *option,
prop::Property::Getter getter, prop::Property::Setter setter);
@@
-54,8
+55,8
@@
private:
void setter(const char *id, Glib::VariantBase value);
private:
void setter(const char *id, Glib::VariantBase value);
private:
- s
td::s
hared_ptr<pv::data::DecoderStack> decoder_stack_;
- s
td::s
hared_ptr<pv::data::decode::Decoder> decoder_;
+ shared_ptr<pv::data::DecoderStack> decoder_stack_;
+ shared_ptr<pv::data::decode::Decoder> decoder_;
};
} // binding
};
} // binding