/[svn]/linuxsampler/trunk/src/shell/TerminalCtrl.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/shell/TerminalCtrl.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3053 by schoenebeck, Fri Feb 7 19:53:09 2014 UTC revision 3054 by schoenebeck, Thu Dec 15 12:47:45 2016 UTC
# Line 1  Line 1 
1  /*  /*
2   * LSCP Shell   * LSCP Shell
3   *   *
4   * Copyright (c) 2014 Christian Schoenebeck   * Copyright (c) 2014 - 2016 Christian Schoenebeck
5   *   *
6   * This program is part of LinuxSampler and released under the same terms.   * This program is part of LinuxSampler and released under the same terms.
7   */   */
# Line 146  std::vector<char> TerminalCtrl::getChars Line 146  std::vector<char> TerminalCtrl::getChars
146      setting.c_cc[VTIME] = burstDeciSeconds;      setting.c_cc[VTIME] = burstDeciSeconds;
147      if (tcsetattr(0, TCSANOW, &setting) < 0) return v;      if (tcsetattr(0, TCSANOW, &setting) < 0) return v;
148      v.resize(max);      v.resize(max);
149      const int n = read(0, &v[0], max);      const int n = (int)read(0, &v[0], max);
150      if (n != max) v.resize(n < 0 ? 0 : n);      if (n != max) v.resize(n < 0 ? 0 : n);
151    
152      restore(original);      restore(original);
# Line 172  std::string TerminalCtrl::getStringToDel Line 172  std::string TerminalCtrl::getStringToDel
172      std::vector<char> v = getCharsToDelimiter(delimiter, includeDelimiter);      std::vector<char> v = getCharsToDelimiter(delimiter, includeDelimiter);
173      if (v.empty()) return s;      if (v.empty()) return s;
174      v.push_back(0);      v.push_back(0);
175      int n = strlen(&v[0]);      int n = (int)strlen(&v[0]);
176      s.resize(n);      s.resize(n);
177      memcpy(&s[0], &v[0], n);      memcpy(&s[0], &v[0], n);
178      return s;      return s;

Legend:
Removed from v.3053  
changed lines
  Added in v.3054

  ViewVC Help
Powered by ViewVC