projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_615_replace_rawfile' into m2ts_test
[vuplus_dvbapp]
/
include
/
connection.h
diff --git
a/include/connection.h
b/include/connection.h
index
8ca75cb
..
870fd85
100644
(file)
--- a/
include/connection.h
+++ b/
include/connection.h
@@
-4,14
+4,12
@@
#include <libsig_comp.h>
#include <lib/base/object.h>
#include <libsig_comp.h>
#include <lib/base/object.h>
-class eConnection: public
virtual
iObject, public Connection
+class eConnection: public iObject, public Connection
{
{
-
int ref
;
+
DECLARE_REF(eConnection)
;
ePtr<iObject> m_owner;
public:
ePtr<iObject> m_owner;
public:
-DEFINE_REF(eConnection);
-public:
- eConnection(iObject *owner, const Connection &conn): Connection(conn), ref(0), m_owner(owner) { };
+ eConnection(iObject *owner, const Connection &conn): Connection(conn), m_owner(owner) { };
virtual ~eConnection() { disconnect(); }
};
virtual ~eConnection() { disconnect(); }
};