Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-28 16:23:50 +01:00
Code Issues Projects Releases Wiki Activity

Fixed conflicts in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason
2019-07-27 17:29:49 -04:00
parent 5b7126b6d2 c3cc94143a
commit 1895c018b7
29 changed files with 216 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/rdttyout.cpp
View File

@@ -2,7 +2,7 @@
//
// Output a string on a Rivendell TTY
//
// (C) Copyright 2002-2003,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,9 +18,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <rdtty.h>
#include <rdttyout.h>
#include "rdtty.h"
#include "rdttyout.h"
bool RDTtyOut(const QString &station,unsigned port_id,const QString &str)
{
@@ -39,23 +38,23 @@ bool RDTtyOut(const QString &station,unsigned port_id,const QString &str)
delete tty_entry;
return false;
}
tty_device->writeBlock((const char *)str,strlen((const char *)str));
tty_device->write((const char *)str,strlen((const char *)str));
switch(tty_entry->termination()) {
case RDTty::CrTerm:
tty_device->putch(13);
break;
case RDTty::CrTerm:
tty_device->putch(13);
break;
case RDTty::LfTerm:
tty_device->putch(10);
break;
case RDTty::LfTerm:
tty_device->putch(10);
break;
case RDTty::CrLfTerm:
tty_device->putch(13);
tty_device->putch(10);
break;
case RDTty::CrLfTerm:
tty_device->putch(13);
tty_device->putch(10);
break;
default:
break;
case RDTty::NoTerm:
break;
}
tty_device->close();
delete tty_device;