-rw-r--r-- | core/applets/obex/obex.cc | 62 |
1 files changed, 59 insertions, 3 deletions
diff --git a/core/applets/obex/obex.cc b/core/applets/obex/obex.cc index 683964b..2218dbc 100644 --- a/core/applets/obex/obex.cc +++ b/core/applets/obex/obex.cc @@ -13,12 +13,18 @@ Obex::Obex( QObject *parent, const char* name ) m_rec = 0; m_send=0; m_count = 0; + m_receive = false; + connect( this, SIGNAL(error(int) ), // for recovering to receive + SLOT(slotError() ) ); + connect( this, SIGNAL(sent() ), + SLOT(slotError() ) ); }; Obex::~Obex() { delete m_rec; delete m_send; } void Obex::receive() { + m_receive = true; qWarning("Receive" ); m_rec = new OProcess(); *m_rec << "irobex_palm3"; @@ -32,16 +38,34 @@ void Obex::receive() { if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { qWarning("could not start :("); emit done( false ); + delete m_rec; + m_rec = 0; } - emit currentTry(m_count ); +// emit currentTry(m_count ); } -void Obex::send( const QString& fileName) { +void Obex::send( const QString& fileName) { // if currently receiving stop it send receive m_count = 0; m_file = fileName; + qWarning("send"); + if (m_rec != 0 ) { + qWarning("running"); + if (m_rec->isRunning() ) { + emit error(-1 ); + qWarning("is running"); + delete m_rec; + m_rec = 0; + + }else{ + qWarning("is not running"); + emit error( -1 ); // we did not delete yet but it's not running slotExited is pending + return; + } + } sendNow(); } void Obex::sendNow(){ + qWarning("sendNow"); if ( m_count >= 25 ) { // could not send emit error(-1 ); return; @@ -56,11 +80,14 @@ void Obex::sendNow(){ this, SLOT(slotExited(OProcess*)) ); connect(m_send, SIGNAL(receivedStdout(OProcess*, char*, int )), this, SLOT(slotStdOut(OProcess*, char*, int) ) ); + // now start it if (!m_send->start(/*OProcess::NotifyOnExit, OProcess::AllOutput*/ ) ) { qWarning("could not send" ); m_count = 25; emit error(-1 ); + delete m_send; + m_send=0; } // end m_count++; @@ -88,9 +115,11 @@ void Obex::recieved() { emit receivedFile( filename ); } }else{ - emit error(-1); + emit done(false); }; delete m_rec; + m_rec = 0; + receive(); } void Obex::sendEnd() { @@ -126,3 +155,30 @@ QString Obex::parseOut( ){ } return path; } +/** + * when sent is done slotError is called we will start receive again + */ +void Obex::slotError() { + qWarning("slotError"); + if ( m_receive ) + receive(); +}; +void Obex::setReceiveEnabled( bool receive ) { + if ( !receive ) { // + m_receive = false; + shutDownReceive(); + } +} + +void Obex::shutDownReceive() { + if (m_rec != 0 ) { + qWarning("running"); + if (m_rec->isRunning() ) { + emit error(-1 ); + qWarning("is running"); + delete m_rec; + m_rec = 0; + } + } + +} |