WebSVN – tpanel – Diff – /trunk/tsipclient.h

         void cleanUp();
         int getLineID() { return mLine; }
         SIP_STATE_t getSIPState(pjsua_call_id id) { if (id >= 0 && id < PJSUA_MAX_CALLS) return mSIPState[id]; else return SIP_NONE; }
         bool isRegistered() { return mRegistered; }
+        static TSIPClient *getSIPClient() { return mMyself; }
         bool call(const std::string& dest);         //<! Start a phone call
         bool pickup(pjsua_call_id call);            //<! Lift up if the phone is ringing
         bool terminate(int id);                     //<! Terminate a call
         bool hold(int id);                          //<! Pause a call
         bool transfer(int id, const std::string& num);  //<! transfer the current call
         bool setDTMFduration(uint_t ms);            //<! Set the DTMF duration in ms.
         bool getPrivate() { return mDoNotDisturb; } //<! Returns the current private mode.
     protected:
-        void start();
+        void runRinger();                           //<! Plays a ring tone if a call is coming.
         static void _log_call(int level, const char *data, int len);
         static void on_incoming_call(pjsua_acc_id acc_id, pjsua_call_id call_id, pjsip_rx_data *rdata);
         static void on_call_state(pjsua_call_id call_id, pjsip_event *e);
         static void on_call_media_state(pjsua_call_id call_id);
         int getNumberCalls();
         pjsua_call_id getActiveCall();
         void setSIPState(SIP_STATE_t s, pjsua_call_id id) { if (id >= 0 && id < PJSUA_MAX_CALLS) mSIPState[id] = s; }
         static void sendConnectionStatus(SIP_STATE_t state, int id);
+        static void init_ringtone_player();
+        static pj_status_t start_ring_tone();
+        static pj_status_t stop_ring_tone();
         int mLine{0};
         bool mRegistered{false};
         SIP_STATE_t mSIPState[PJSUA_MAX_CALLS];
         pjsua_acc_id mAccountID{0};
         bool mDoNotDisturb{false};
         static TSIPClient *mMyself;
         static pjsua_call_id mCurrentCall;
         static std::atomic<bool> mRefreshRun;
+        static bool mPhoneRingInit;
         // Here is the configuration for the PJSUA library
         typedef struct app_call_data
+        {
             pj_timer_entry      timer;
             pj_bool_t           ringback_on{PJ_FALSE};
             pj_bool_t           ring_on{PJ_FALSE};
         } app_call_data;
+        typedef struct ringtone_port_info_t
+        {
+            pj_bool_t ring_on{PJ_FALSE};
+            int ring_slot{0};
+            pjmedia_port *ring_port{nullptr};
+            pj_pool_t *pool{nullptr};
+        } ringtone_port_info_t;
         typedef struct pjsua_app_config
+        {
             pjsua_config        cfg;
             pjsua_logging_config log_cfg;
             pjsua_media_config  media_cfg;
             uint_t              codec_cnt{0};
             pj_str_t            codec_arg[32];
             uint_t              codec_dis_cnt{0};
             pj_str_t            codec_dis[32];
             pj_bool_t           null_audio{PJ_FALSE};
-            uint_t              wav_count;
+            uint_t              wav_count{0};
             pj_str_t            wav_files[32];
             uint_t              tone_count{0};
             pjmedia_tone_desc   tones[32];
             pjsua_conf_port_id  tone_slots[32];
             pjsua_player_id     wav_id{0};
             pj_str_t            rec_file;
             pj_bool_t           auto_rec{PJ_FALSE};
             pjsua_recorder_id   rec_id{0};
             pjsua_conf_port_id  rec_port{0};
             unsigned            auto_answer{0};
-            unsigned            duration{0};
+            unsigned            duration{36000};
-            float               mic_level{0.0};
+            float               mic_level{100.0};
-            float               speaker_level{0.0};
+            float               speaker_level{100.0};
             int                 capture_dev{0};
             int                 playback_dev{0};
             uint_t              capture_lat{0};
             uint_t              playback_lat{0};
             uint_t              aud_cnt{0};
         }pjsua_app_config;
         static pjsua_app_config mAppConfig;
+        static ringtone_port_info_t mRingtonePortInfo;
 };
 #endif  // _NOSIP_
 #endif  // __TSIPCLIENT_H__

Subversion Repositories tpanel

(root)/trunk/tsipclient.h @ 143 – Rev 138 → 141