author | paule <paule> | 2007-01-28 04:04:14 (UTC) |
---|---|---|
committer | paule <paule> | 2007-01-28 04:04:14 (UTC) |
commit | ec2309cb69365847762db542c41951629cd06cbe (patch) (side-by-side diff) | |
tree | 2f0101c1f0d6268207dbd15eb21f40c812a4fff5 /noncore/tools/remote/remote.cpp | |
parent | 3cd37427b5c5f26f62cff583fbde914467ddafe3 (diff) | |
download | opie-ec2309cb69365847762db542c41951629cd06cbe.zip opie-ec2309cb69365847762db542c41951629cd06cbe.tar.gz opie-ec2309cb69365847762db542c41951629cd06cbe.tar.bz2 |
Refactored out all communication with LIRC into new LircHandler class
Diffstat (limited to 'noncore/tools/remote/remote.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/tools/remote/remote.cpp | 73 |
1 files changed, 14 insertions, 59 deletions
diff --git a/noncore/tools/remote/remote.cpp b/noncore/tools/remote/remote.cpp index 35d06bc..67fc57d 100644 --- a/noncore/tools/remote/remote.cpp +++ b/noncore/tools/remote/remote.cpp @@ -38,68 +38,23 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -/*void reconnect(int &fd) -{ -// struct sockaddr_un addr; - - addr.sun_family=AF_UNIX; - strcpy(addr.sun_path,"/dev/lircd"); - fd = socket(AF_UNIX, SOCK_STREAM, 0); - - if(connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) - { - QMessageBox *mb = new QMessageBox("error", - "couldnt connect to socket", - QMessageBox::NoIcon, - QMessageBox::Ok, - QMessageBox::NoButton, - QMessageBox::NoButton); - mb->exec(); - } -} -*/ - int main( int argc, char **argv ) { QPEApplication a( argc, argv ); MainView w; - - int fd; - // struct sockaddr_un addr; - // char read_buffer[BUFFERSIZE+1]; - // char write_buffer[] = "LIST\n"; - - // addr.sun_family=AF_UNIX; - // strcpy(addr.sun_path,"/dev/lircd"); - // fd = socket(AF_UNIX, SOCK_STREAM, 0); - - // printf("fd1: %d\n", fd); - /* - if(connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) - { - QMessageBox *mb = new QMessageBox("error", - "couldnt connect to socket", - QMessageBox::NoIcon, - QMessageBox::Ok, - QMessageBox::NoButton, - QMessageBox::NoButton); - mb->exec(); - } - */ - - // printf("%d\n", write(fd, write_buffer, sizeof(write_buffer) ) ); - - // printf("%d\n", read(fd, read_buffer, BUFFERSIZE ) ); - - // QMessageBox *mbtest = new QMessageBox("lirc test", - // *new QString((const char *) read_buffer), - // QMessageBox::NoIcon, - // QMessageBox::Ok, - // QMessageBox::NoButton, - // QMessageBox::NoButton); - // mbtest->exec(); - a.setMainWidget( &w ); - w.setIRSocket(fd); QPEApplication::showWidget( &w ); - return a.exec(); + + LircHandler lh; + if(!lh.isLircdRunning()) { + QMessageBox mb("Error!", + "Lircd is not running", + QMessageBox::NoIcon, + QMessageBox::Ok, + QMessageBox::NoButton, + QMessageBox::NoButton); + mb.exec(); + + } + + return a.exec(); } |