X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=joinpbx.h;h=cda54197d4d46a2c73ca16b0a451e2fbafb3efac;hp=9106251d35c8cc292fb8dcdf71de9cceb437974c;hb=034d3a91404addedc1c7a3494862c79532b0b878;hpb=d2b113f2c4f11acfaee1b2e0fd2f03744a89f6d4

diff --git a/joinpbx.h b/joinpbx.h
index 9106251..cda5419 100644
--- a/joinpbx.h
+++ b/joinpbx.h
@@ -50,7 +50,6 @@ class JoinPBX : public Join
 	JoinPBX(class Endpoint *epoint);
 	~JoinPBX();
 	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);
 
 	char j_caller[32];		/* caller number */
@@ -60,21 +59,22 @@ class JoinPBX : public Join
 	int j_multicause, j_multilocation;
 	
 	int j_pid;			/* pid of join to generate bridge id */
-	int j_updatebridge;		/* bridge must be updated */
+	struct lcr_work j_updatebridge;		/* bridge must be updated */
 	struct join_relation *j_relation; /* list of endpoints that are related to the join */
 
 	int j_partyline;		/* if set, join is conference room */
 	int j_partyline_jingle;		/* also play jingle on join/leave */
 
+	unsigned int j_3pty;		/* other join if a 3pty-bridge is requested */
+
 	void bridge(void);
-	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 int 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);
+void joinpbx_debug(class JoinPBX *joinpbx, const char *function);
 int joinpbx_countrelations(unsigned int join_id);
 int track_notify(int oldstate, int notify);