X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=joinpbx.h;h=18e38c0b8febb3887fe29770f2a3ef0339f06bcc;hp=e885e9ed4512e988c7eeb6ade9152b5125405804;hb=3ac6881c22bce18091f19b06958ac66016bf9a32;hpb=db6990e487255e8b206ef67d8d99fa74849a9a11

diff --git a/joinpbx.h b/joinpbx.h
index e885e9e..18e38c0 100644
--- a/joinpbx.h
+++ b/joinpbx.h
@@ -27,11 +27,6 @@ enum { /* relation types */
 	RELATION_TYPE_CONNECT,	/* interface is connected */
 };
 
-enum { /* relation audio state */
-	CHANNEL_STATE_CONNECT,	/* endpoint is connected to the join voice transmission in both dirs */
-	CHANNEL_STATE_HOLD,	/* endpoint is on hold state, no audio */
-};
-
 enum { /* states that results from last notification */
 	NOTIFY_STATE_ACTIVE, /* just the normal case, the party is active */
 	NOTIFY_STATE_SUSPEND, /* the party is inactive, because she has parked */
@@ -43,7 +38,7 @@ enum { /* states that results from last notification */
 struct join_relation { /* relation to an interface */
 	struct join_relation *next;	/* next node */
 	int type;			/* type of relation */
-	unsigned long epoint_id;	/* interface to link join to */
+	unsigned int epoint_id;	/* interface to link join to */
 	int channel_state;		/* if audio is available */
 	int rx_state;			/* current state of what we received from endpoint */
 	int tx_state;			/* current state of what we sent to endpoint */
@@ -54,7 +49,7 @@ class JoinPBX : public Join
 	public:
 	JoinPBX(class Endpoint *epoint);
 	~JoinPBX();
-	void message_epoint(unsigned long epoint_id, int message, union parameter *param);
+	void message_epoint(unsigned int epoint_id, int message, union parameter *param);
 	int handler(void);
 	int release(struct join_relation *relation, int location, int cause);
 
@@ -72,14 +67,14 @@ class JoinPBX : public Join
 	int j_partyline_jingle;		/* also play jingle on join/leave */
 
 	void bridge(void);
-	void bridge_data(unsigned long epoint_from, struct join_relation *relation_from, union parameter *param);
+	void bridge_data(unsigned int epoint_from, struct join_relation *relation_from, union parameter *param);
 	void remove_relation(struct join_relation *relation);
 	struct join_relation *add_relation(void);
-	int out_setup(unsigned long epoint_id, int message, union parameter *param, char *newnumber);
+	int out_setup(unsigned int epoint_id, int message, union parameter *param, char *newnumber, char *newkeypad);
 	void play_jingle(int in);
 }; 
 
-void joinpbx_debug(class JoinPBX *joinpbx, char *function);
-int joinpbx_countrelations(unsigned long join_id);
+void joinpbx_debug(class JoinPBX *joinpbx, const char *function);
+int joinpbx_countrelations(unsigned int join_id);
 int track_notify(int oldstate, int notify);