fixup

[lcr.git] / joinpbx.h

diff --git a/joinpbx.h b/joinpbx.h
index c9e79d1..cda5419 100644 (file)
--- a/joinpbx.h
+++ b/joinpbx.h
@@ -38,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 */
@@ -49,8 +49,7 @@ class JoinPBX : public Join
        public:
        JoinPBX(class Endpoint *epoint);
        ~JoinPBX();
-       void message_epoint(unsigned long epoint_id, int message, union parameter *param);
-       int handler(void);
+       void message_epoint(unsigned int epoint_id, int message, union parameter *param);
        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 long 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);