diff options
| author | Steve Huston <shuston@riverace.com> | 2004-01-25 23:15:22 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2004-01-25 23:15:22 +0000 |
| commit | 07c87eb2415ed54efc7f9d0385ac24c6e5e7f784 (patch) | |
| tree | c2081e5f13a1b3368f617c87d5602ffe4db03377 | |
| parent | ca577f184d2b741e40c014ed226e5a3eb43a6088 (diff) | |
| download | ATCD-07c87eb2415ed54efc7f9d0385ac24c6e5e7f784.tar.gz | |
ChangeLogTag:Sun Jan 25 18:05:31 2004 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | examples/APG/Streams/RecordingDevice_Text.cpp | 14 |
2 files changed, 10 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 6cd7e9505be..5ac616bd12b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jan 25 18:05:31 2004 Steve Huston <shuston@riverace.com> + + * examples/APG/Streams/RecordingDevice_Text.cpp: Fixed formatting + to fit in its spots in the book. + Sun Jan 25 20:46:03 UTC 2004 Don Hinton <dhinton@dre.vanderbilt.edu> * ace/Global_Macros.h: @@ -22,7 +27,7 @@ Sun Jan 25 09:11:40 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * bin/msvc_mpc_auto_compile.pl: - Soem cosmetic fixes to get ACEXEML and Kokyu compiled well + Some cosmetic fixes to get ACEXEML and Kokyu compiled well before other things. The dsw's in TAO hierarchy do not have the dsp's of ACE hierarchy included but for TAOACE.dsw. diff --git a/examples/APG/Streams/RecordingDevice_Text.cpp b/examples/APG/Streams/RecordingDevice_Text.cpp index 2f75ea6c2a1..71ba4c76398 100644 --- a/examples/APG/Streams/RecordingDevice_Text.cpp +++ b/examples/APG/Streams/RecordingDevice_Text.cpp @@ -155,22 +155,20 @@ int TextListener::play_message (ACE_FILE_Addr &addr) Command *c = new Command (); c->command_ = Command::CMD_PLAY_MESSAGE; c->extra_data_ = &addr; - c = this->command_stream_->execute (c); return c->numeric_result_; } ACE_FILE_Addr temp ("/tmp/outgoing_message.text"); ACE_FILE_IO *file; - if (type->is_audio ()) file = Util::audio_to_text (addr, temp); else if (type->is_video ()) file = Util::video_to_text (addr, temp); else - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Invalid message type %d\n"), - type->get_codec ()), - -1); + ACE_ERROR_RETURN + ((LM_ERROR, ACE_TEXT ("Invalid message type %d\n"), + type->get_codec ()), -1); int rval = this->play_message (temp); file->remove (); return rval; @@ -183,13 +181,9 @@ MessageType *TextListener::record_message (ACE_FILE_Addr &addr) Command *c = new Command (); c->command_ = Command::CMD_RECORD_MESSAGE; c->extra_data_ = &addr; - c = this->command_stream_->execute (c); - if (c->numeric_result_ == -1) - { - return 0; - } + return 0; return new MessageType (MessageType::RAWTEXT, addr); } |