Menu
▾
▴
[Iaxclient-cvs] iaxclient/simpleclient/wx wx.cc,1.32,1.33
|
From: <st...@us...> - 2003-06-18 16:39:22
|
Update of /cvsroot/iaxclient/iaxclient/simpleclient/wx
In directory sc8-pr-cvs1:/tmp/cvs-serv23009/simpleclient/wx
Modified Files:
wx.cc
Log Message:
Modularize the event callback mechanism to use either PostEvent, or the
Immediate processing model with GuiLock that we'd been using.
The GuiLock stuff was causing the multiple register windows (on Win32
only), because the menu select event was getting processed over and
over, until one of the handlers finally returned, and took it off of the
event queue.
With PostEvent processing for the callback, this doesn't happen anymore,
because the queue isn't getting run from other threads.
Also, resolve (with a hack) the hang on exit experienced with windows.
Index: wx.cc
===================================================================
RCS file: /cvsroot/iaxclient/iaxclient/simpleclient/wx/wx.cc,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- wx.cc 17 Jun 2003 23:09:58 -0000 1.32
+++ wx.cc 18 Jun 2003 16:39:18 -0000 1.33
@@ -24,7 +24,6 @@
#define LEVEL_MIN -50
#define DEFAULT_SILENCE_THRESHOLD 1 // positive is "auto"
-#define TRY_GUILOCK
class IAXClient : public wxApp
{
@@ -44,7 +43,7 @@
// forward decls for callbacks
extern "C" {
- int iaxc_callback(iaxc_event e);
+ static int iaxc_callback(iaxc_event e);
int doTestCall(int ac, char **av);
}
@@ -77,9 +76,8 @@
ID_REGISTER,
ID_CALLS = 400,
-
- CALLBACK_STATUS = 1000,
- CALLBACK_LEVELS,
+
+ IAXCLIENT_EVENT = 500,
ID_MAX
};
@@ -101,7 +99,7 @@
public:
IAXCalls(wxWindow *parent, int nCalls);
void IAXCalls::OnSelect(wxListEvent &evt);
- int IAXCalls::OnStateCallback(struct iaxc_ev_call_state c);
+ int IAXCalls::HandleStateEvent(struct iaxc_ev_call_state c);
inline void IAXCalls::AutoSize() {
for(int i=0;i<nCalls;i++)
SetColumnWidth(i,wxLIST_AUTOSIZE);
@@ -118,10 +116,10 @@
END_EVENT_TABLE()
IAXCalls::IAXCalls(wxWindow *parent, int inCalls)
- : nCalls(inCalls),
- wxListCtrl(parent, ID_CALLS,
+ : wxListCtrl(parent, ID_CALLS,
wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_SINGLE_SEL,
- wxDefaultValidator, _T("calls"))
+ wxDefaultValidator, _T("calls")),
+ nCalls(inCalls)
{
// initialze IAXCalls control
long i;
@@ -138,7 +136,7 @@
Hide();
for(i=0;i<nCalls;i++) {
- long tmp = InsertItem(i,wxString::Format("%d", i+1), 0);
+ InsertItem(i,wxString::Format("%ld", i+1), 0);
// XXX ??? SetItemData(tmp,i);
SetItem(i, 2, _T("No call"));
}
@@ -146,16 +144,15 @@
AutoSize();
}
-int IAXCalls::OnStateCallback(struct iaxc_ev_call_state c)
+int IAXCalls::HandleStateEvent(struct iaxc_ev_call_state c)
{
- if (!wxThread::IsMain()) wxMutexGuiEnter();
fprintf(stderr, "Updating state for item %d state=%x\n", c.callNo, c.state);
// first, handle inactive calls
if(!(c.state & IAXC_CALL_STATE_ACTIVE)) {
- fprintf(stderr, "state for item %d is free\n", c.callNo);
+ //fprintf(stderr, "state for item %d is free\n", c.callNo);
SetItem(c.callNo, 2, _T("No call") );
SetItem(c.callNo, 1, _T("") );
} else {
@@ -189,11 +186,10 @@
if((c.state & IAXC_CALL_STATE_SELECTED) &&
!(GetItemState(c.callNo,wxLIST_STATE_SELECTED|wxLIST_STATE_SELECTED)))
{
- fprintf(stderr, "setting call %d to selected\n", c.callNo);
+ //fprintf(stderr, "setting call %d to selected\n", c.callNo);
SetItemState(c.callNo,wxLIST_STATE_SELECTED,wxLIST_STATE_SELECTED);
}
AutoSize();
- if (!wxThread::IsMain()) wxMutexGuiLeave();
return 0;
}
@@ -221,6 +217,11 @@
void IAXFrame::OnNotify(void);
void IAXFrame::OnRegisterMenu(wxCommandEvent &evt);
+ // Handlers for library-initiated events
+ void IAXFrame::HandleEvent(wxCommandEvent &evt);
+ int IAXFrame::HandleIAXEvent(iaxc_event *e);
+ int IAXFrame::HandleStatusEvent(char *msg);
+ int IAXFrame::HandleLevelEvent(float input, float output);
bool IAXFrame::GetPTTState();
void IAXFrame::CheckPTT();
@@ -238,12 +239,6 @@
bool pttState; // is the PTT button pressed?
bool silenceMode; // are we in silence suppression mode?
-#ifndef TRY_GUILOCK
- // values set by callbacks
- int inputLevel;
- int outputLevel;
- wxString statusString;
-#endif
protected:
DECLARE_EVENT_TABLE()
@@ -257,27 +252,6 @@
void IAXFrame::OnNotify()
{
-#ifndef TRY_GUILOCK
- static wxString lastStatus;
- static int lastInputLevel = 0;
- static int lastOutputLevel = 0;
-
- if(statusString != lastStatus) {
- SetStatusText(statusString);
- lastStatus = statusString;
- }
-
- if(lastInputLevel != inputLevel) {
- input->SetValue(inputLevel);
- lastInputLevel = inputLevel;
- }
-
- if(lastOutputLevel != outputLevel) {
- output->SetValue(outputLevel);
- lastOutputLevel = outputLevel;
- }
-#endif
-
if(pttMode) CheckPTT();
}
@@ -297,13 +271,6 @@
wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
wxBoxSizer *row3sizer = new wxBoxSizer(wxHORIZONTAL);
pttMode = false;
-#ifndef TRY_GUILOCK
- inputLevel = 0;
- outputLevel = 0;
- statusString = _T("Welcome to IAXClient");
-#endif
-
-
/* add status bar first; otherwise, sizer doesn't take it into
* account */
@@ -377,6 +344,7 @@
if(wxGetApp().optNumCalls > 1) {
int nCalls = wxGetApp().optNumCalls;
+ // XXX need to fix sizes better.
topsizer->Add(calls = new IAXCalls(this, nCalls), 1, wxEXPAND);
}
@@ -493,6 +461,7 @@
}
void IAXFrame::OnRegisterMenu(wxCommandEvent &evt) {
+
wxTextEntryDialog dialog(this,
_T("Register with a remote asterisk server"),
_T("Format is user:password@hostname"),
@@ -553,6 +522,73 @@
}
+int IAXFrame::HandleStatusEvent(char *msg)
+{
+ theFrame->SetStatusText(msg);
+ return 1;
+}
+
+int IAXFrame::HandleLevelEvent(float input, float output)
+{
+ int inputLevel, outputLevel;
+
+ if (input < LEVEL_MIN)
+ input = LEVEL_MIN;
+ else if (input > LEVEL_MAX)
+ input = LEVEL_MAX;
+ inputLevel = (int)input - (LEVEL_MIN);
+
+ if (output < LEVEL_MIN)
+ output = LEVEL_MIN;
+ else if (input > LEVEL_MAX)
+ output = LEVEL_MAX;
+ outputLevel = (int)output - (LEVEL_MIN);
+
+ static int lastInputLevel = 0;
+ static int lastOutputLevel = 0;
+
+
+ if(lastInputLevel != inputLevel) {
+ theFrame->input->SetValue(inputLevel);
+ lastInputLevel = inputLevel;
+ }
+
+ if(lastOutputLevel != outputLevel) {
+ theFrame->output->SetValue(outputLevel);
+ lastOutputLevel = outputLevel;
+ }
+
+ return 1;
+}
+
+
+int IAXFrame::HandleIAXEvent(iaxc_event *e)
+{
+ int ret = 0;
+ switch(e->type) {
+ case IAXC_EVENT_LEVELS:
+ ret = HandleLevelEvent(e->ev.levels.input, e->ev.levels.output);
+ break;
+ case IAXC_EVENT_TEXT:
+ ret = HandleStatusEvent(e->ev.text.message);
+ break;
+ case IAXC_EVENT_STATE:
+ ret = theFrame->calls->HandleStateEvent(e->ev.call);
+ break;
+ default:
+ break; // not handled
+ }
+ return ret;
+}
+
+void IAXFrame::HandleEvent(wxCommandEvent &evt)
+{
+ iaxc_event *e = (iaxc_event *)evt.GetClientData();
+ //fprintf(stderr, "In HandleEvent\n");
+ HandleIAXEvent(e);
+ free (e);
+}
+
BEGIN_EVENT_TABLE(IAXFrame, wxFrame)
EVT_BUTTON(0,IAXFrame::OnDTMF)
@@ -570,14 +606,15 @@
EVT_BUTTON(ID_DIAL,IAXFrame::OnDial)
EVT_BUTTON(ID_HANG,IAXFrame::OnHangup)
- EVT_MENU(ID_QUIT,IAXFrame::OnQuit)
EVT_MENU(ID_PTT,IAXFrame::OnPTTChange)
EVT_MENU(ID_SILENCE,IAXFrame::OnSilenceChange)
EVT_MENU(ID_REGISTER,IAXFrame::OnRegisterMenu)
-
+ EVT_MENU(ID_QUIT,IAXFrame::OnQuit)
+ EVT_MENU(IAXCLIENT_EVENT, IAXFrame::HandleEvent)
END_EVENT_TABLE()
+
IAXFrame::~IAXFrame()
{
#ifdef __WXGTK__
@@ -632,7 +669,6 @@
theFrame->Show(TRUE);
SetTopWindow(theFrame);
- // just one call for now!
iaxc_initialize(AUDIO_INTERNAL_PA, wxGetApp().optNumCalls);
iaxc_set_encode_format(IAXC_FORMAT_GSM);
@@ -665,74 +701,34 @@
*
* So, this isn't ideal, but it works, until I can figure out a better way
*/
- int status_callback(char *msg)
- {
-#ifdef TRY_GUILOCK
- static wxString lastStatus;
- if(lastStatus == msg) return 1;
+ // handle events via posting.
+#ifdef USE_GUILOCK
+ static int iaxc_callback(iaxc_event e)
+ {
+ int ret;
if (!wxThread::IsMain()) wxMutexGuiEnter();
- theFrame->SetStatusText(msg);
- lastStatus = msg;
+ ret = theFrame->HandleIAXEvent(&e);
if (!wxThread::IsMain()) wxMutexGuiLeave();
-#else
- theFrame->statusString = wxString(msg);
-#endif
- return 1;
+ return ret;
}
-
- int levels_callback(float input, float output)
+#else
+ static int iaxc_callback(iaxc_event e)
{
- int inputLevel, outputLevel;
-
- if (input < LEVEL_MIN)
- input = LEVEL_MIN;
- else if (input > LEVEL_MAX)
- input = LEVEL_MAX;
- inputLevel = (int)input - (LEVEL_MIN);
-
- if (output < LEVEL_MIN)
- output = LEVEL_MIN;
- else if (input > LEVEL_MAX)
- output = LEVEL_MAX;
- outputLevel = (int)output - (LEVEL_MIN);
-
-#ifdef TRY_GUILOCK
- static int lastInputLevel = 0;
- static int lastOutputLevel = 0;
+ iaxc_event *copy;
+ wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, IAXCLIENT_EVENT);
- if (!wxThread::IsMain()) wxMutexGuiEnter();
+ copy = (iaxc_event *)malloc(sizeof(iaxc_event));
+ memcpy(copy,&e,sizeof(iaxc_event));
- if(lastInputLevel != inputLevel) {
- theFrame->input->SetValue(inputLevel);
- lastInputLevel = inputLevel;
- }
+ evt.SetClientData(copy);
- if(lastOutputLevel != outputLevel) {
- theFrame->output->SetValue(outputLevel);
- lastOutputLevel = outputLevel;
- }
+ //fprintf(stderr, "Posting Event\n");
+ wxPostEvent(theFrame, evt);
- if (!wxThread::IsMain()) wxMutexGuiLeave();
-#else
- theFrame->inputLevel = (int)input - (LEVEL_MIN);
- theFrame->outputLevel = (int)output - (LEVEL_MIN);
-#endif
- return 1;
+ // pretend we handle all events.
+ return 1;
}
+#endif
-
- int iaxc_callback(iaxc_event e)
- {
- switch(e.type) {
- case IAXC_EVENT_LEVELS:
- return levels_callback(e.ev.levels.input, e.ev.levels.output);
- case IAXC_EVENT_TEXT:
- return status_callback(e.ev.text.message);
- case IAXC_EVENT_STATE:
- return theFrame->calls->OnStateCallback(e.ev.call);
- default:
- return 0; // not handled
- }
- }
}
|
