← Back to branch summary

~ubuntu-branches/debian/squeeze/openmcu/squeeze

« back to all changes in this revision

Viewing changes to filemembers.cxx

  • Committer: Bazaar Package Importer
  • Author(s): Kilian Krause
  • Date: 2006-04-16 22:43:44 UTC
  • mfrom: (3.1.1 etch)
  • Revision ID: james.westby@ubuntu.com-20060416224344-rki152ye95snhodz
Tags: 2.1.1-3
http://bugs.debian.org/362705
Don't use PWD, but CURDIR as sudo no longer provides PWD (Closes:#362705)

Show diffs side-by-side

added added

removed removed

Lines of Context:
filemembers.cxx
28
28
 * Contributor(s): Derek J Smithies (derek@indranet.co.nz)
29
29
 *
30
30
 * $Log: filemembers.cxx,v $
 
31
 * Revision 2.2  2006/01/16 09:43:05  csoutheren
 
32
 * Fixed problem with crashes at end of playing files
 
33
 *
31
34
 * Revision 2.1  2004/05/26 06:54:31  csoutheren
32
35
 * Changed to be a PHTTPServiceProcess
33
36
 * Added ability to play WAV files on member entry and exit
59
62
    thread = NULL;
60
63
  } else {
61
64
    running = TRUE;
62
 
    thread = PThread::Create(PCREATE_NOTIFIER(Thread), 0, PThread::NoAutoDeleteThread);
 
65
    thread = PThread::Create(PCREATE_NOTIFIER(Thread), 0, PThread::AutoDeleteThread);
63
66
  }
64
67
}
65
68
 
76
79
  if ((thread != NULL) && running) {
77
80
    running = FALSE;
78
81
    thread->WaitForTermination();
79
 
    delete thread;
80
82
    thread = NULL;
81
83
  }
82
84
}
127
129
  running = TRUE;
128
130
 
129
131
  if (mode == PFile::WriteOnly)
130
 
    thread = PThread::Create(PCREATE_NOTIFIER(WriteThread), 0, PThread::NoAutoDeleteThread);
 
132
    thread = PThread::Create(PCREATE_NOTIFIER(WriteThread), 0, PThread::AutoDeleteThread);
131
133
  else
132
 
    thread = PThread::Create(PCREATE_NOTIFIER(ReadThread), 0, PThread::NoAutoDeleteThread);
 
134
    thread = PThread::Create(PCREATE_NOTIFIER(ReadThread), 0, PThread::AutoDeleteThread);
133
135
}
134
136
 
135
137
ConferenceFileMember::~ConferenceFileMember()
145
147
  if ((thread != NULL) && running) {
146
148
    running = FALSE;
147
149
    thread->WaitForTermination();
148
 
    delete thread;
149
150
    thread = NULL;
150
151
  }
151
152
}