From ed10b73df98c1b4c41a0b940e4f8729fe28c2b8a Mon Sep 17 00:00:00 2001 From: zecke Date: Thu, 13 Jun 2002 19:04:05 +0000 Subject: Stop receiving when wanting to send --- 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 @@ -10,87 +10,116 @@ using namespace OpieObex; Obex::Obex( QObject *parent, const char* name ) : QObject(parent, name ) { - m_rec = 0; - m_send=0; - m_count = 0; + 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; + delete m_rec; + delete m_send; } void Obex::receive() { - qWarning("Receive" ); - m_rec = new OProcess(); - *m_rec << "irobex_palm3"; - // connect to the necessary slots - connect(m_rec, SIGNAL(processExited(OProcess*) ), - this, SLOT(slotExited(OProcess*) ) ); + m_receive = true; + qWarning("Receive" ); + m_rec = new OProcess(); + *m_rec << "irobex_palm3"; + // connect to the necessary slots + connect(m_rec, SIGNAL(processExited(OProcess*) ), + this, SLOT(slotExited(OProcess*) ) ); - connect(m_rec, SIGNAL(receivedStdout(OProcess*, char*, int ) ), - this, SLOT(slotStdOut(OProcess*, char*, int) ) ); + connect(m_rec, SIGNAL(receivedStdout(OProcess*, char*, int ) ), + this, SLOT(slotStdOut(OProcess*, char*, int) ) ); - if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { - qWarning("could not start :("); - emit done( false ); - } - emit currentTry(m_count ); + 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 ); } -void Obex::send( const QString& fileName) { - m_count = 0; - m_file = fileName; - sendNow(); +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(){ - if ( m_count >= 25 ) { // could not send - emit error(-1 ); - return; - } - // OProcess inititialisation - m_send = new OProcess(); - *m_send << "irobex_palm3"; - *m_send << m_file; + qWarning("sendNow"); + if ( m_count >= 25 ) { // could not send + emit error(-1 ); + return; + } + // OProcess inititialisation + m_send = new OProcess(); + *m_send << "irobex_palm3"; + *m_send << m_file; - // connect to slots Exited and and StdOut - connect(m_send, SIGNAL(processExited(OProcess*) ), - 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 ); - } - // end - m_count++; - emit currentTry( m_count ); + // connect to slots Exited and and StdOut + connect(m_send, SIGNAL(processExited(OProcess*) ), + 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++; + emit currentTry( m_count ); } void Obex::slotExited(OProcess* proc ){ - if (proc == m_rec ) { // recieve process + if (proc == m_rec ) { // recieve process recieved(); }else if ( proc == m_send ) { sendEnd(); } } void Obex::slotStdOut(OProcess* proc, char* buf, int len){ - if ( proc == m_rec ) { // only recieve - QCString cstring( buf, len ); - m_outp.append( cstring.data() ); - } + if ( proc == m_rec ) { // only recieve + QCString cstring( buf, len ); + m_outp.append( cstring.data() ); + } } void Obex::recieved() { if (m_rec->normalExit() ) { - if ( m_rec->exitStatus() == 0 ) { // we got one - QString filename = parseOut(); - emit receivedFile( filename ); - } + if ( m_rec->exitStatus() == 0 ) { // we got one + QString filename = parseOut(); + 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; + } + } + +} diff --git a/core/applets/obex/obex.h b/core/applets/obex/obex.h index 4e78015..2ce44f2 100644 --- a/core/applets/obex/obex.h +++ b/core/applets/obex/obex.h @@ -1,6 +1,6 @@ -#ifndef OpieObex_H +#ifndef OpieObex_H #define OpieObex_H #include @@ -9,71 +9,75 @@ class OProcess; class QCopChannel; namespace OpieObex { class Obex : public QObject { - Q_OBJECT + Q_OBJECT public: - /** - * Obex c'tor look - */ - Obex( QObject *parent, const char* name); - /** - * d'tor - */ - ~Obex(); + /** + * Obex c'tor look + */ + Obex( QObject *parent, const char* name); + /** + * d'tor + */ + ~Obex(); - /** - * Starting listening to irda after enabled by the applet - * a signal gets emitted when recieved a file - */ - void receive(); - void send( const QString& ); + /** + * Starting listening to irda after enabled by the applet + * a signal gets emitted when recieved a file + */ + void receive(); + void send( const QString& ); + void setReceiveEnabled( bool = false ); signals: - /** - * a signal - * @param path The path to the recieved file - */ - void receivedFile( const QString& path); - /** - * error signal if the program couldn't be started or the - * the connection timed out - */ - void error( int ); - /** - * The current try to receive data - */ - void currentTry(unsigned int); - /** - * signal sent The file got beamed to the remote location - */ - void sent(); + /** + * a signal + * @param path The path to the recieved file + */ + void receivedFile( const QString& path); + /** + * error signal if the program couldn't be started or the + * the connection timed out + */ + void error( int ); + /** + * The current try to receive data + */ + void currentTry(unsigned int); + /** + * signal sent The file got beamed to the remote location + */ + void sent(); // private slots - void done(bool); + void done(bool); private: - uint m_count; - QString m_file; - QString m_outp; - OProcess *m_send; - OProcess *m_rec; - - private slots: + uint m_count; + QString m_file; + QString m_outp; + OProcess *m_send; + OProcess *m_rec; + bool m_receive : 1; + void shutDownReceive(); - /** - * send over palm obex - */ +private slots: + + /** + * send over palm obex + */ + + //void send(const QString&); + + // the process exited + void slotExited(OProcess* proc) ; + void slotStdOut(OProcess*, char*, int); + void slotError(); - //void send(const QString&); - - // the process exited - void slotExited(OProcess* proc) ; - void slotStdOut(OProcess*, char*, int); - private: - void sendNow(); - QString parseOut(); - void recieved(); - void sendEnd(); - + void sendNow(); + QString parseOut(); + void recieved(); + void sendEnd(); + }; }; diff --git a/core/applets/obex/obeximpl.cc b/core/applets/obex/obeximpl.cc index 856f100..0c137af 100644 --- a/core/applets/obex/obeximpl.cc +++ b/core/applets/obex/obeximpl.cc @@ -49,6 +49,7 @@ void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) { stream >> desc; QString filename; stream >> filename; + m_sendgui->raise(); // should be on top m_sendgui->showMaximized(); m_sendgui->lblPath->setText(filename); connect( (QObject*)m_sendgui->PushButton2, SIGNAL(clicked()), @@ -56,9 +57,14 @@ void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) { m_obex->send(filename ); connect( (QObject*)m_obex, SIGNAL( sent() ), this, SLOT( slotSent() ) ); - }else if(msg == "receive(bool)" ) { // open a GUI + }else if(msg == "receive(int)" ) { // open a GUI m_recvgui->showMaximized(); - m_obex->receive(); + int receiveD = 0; + stream >> receiveD; + if ( receiveD == 1) + m_obex->receive(); + else + m_obex->setReceiveEnabled( false ); } else if (msg =="done(QString)") { QString text; @@ -87,7 +93,7 @@ void ObexImpl::slotSent() { void ObexImpl::slotError( int errorCode) { QString errorString = ""; - if (errorCode = -1) { + if (errorCode == -1) { errorString = "test"; } qDebug("Error: " + errorString); -- cgit v0.9.0.2