← Back to branch summary

~ubuntu-branches/ubuntu/precise/sflphone/precise

« back to all changes in this revision

Viewing changes to daemon/src/conference.cpp

  • Committer: Package Import Robot
  • Author(s): Whoopie
  • Date: 2012-03-22 10:29:10 UTC
  • mfrom: (4.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20120322102910-tb8hugi2su1tguwh
Tags: 1.0.2-1ubuntu1
https://launchpad.net/bugs/913018
* Apply some upstream patches to fix FTBFS (LP: #913018):
  - debian/patches/05_glib_includes.patch: fix glib includes.
  - debian/patches/06_use_XkbKeycodeToKeysym.patch: use 
    XkbKeycodeToKeysym instead of (deprecated) XKeycodeToKeysym.

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/conference.cpp
41
41
    , confState_(ACTIVE_ATTACHED)
42
42
    , participants_()
43
43
{
44
 
    Recordable::initRecFileName(id_);
 
44
    Recordable::initRecFilename(id_);
45
45
}
46
46
 
47
47
int Conference::getState() const
101
101
 
102
102
bool Conference::setRecording()
103
103
{
104
 
    bool recordStatus = Recordable::recAudio.isRecording();
 
104
    bool recordStatus = Recordable::recAudio_.isRecording();
105
105
 
106
 
    Recordable::recAudio.setRecording();
 
106
    Recordable::recAudio_.setRecording();
107
107
    MainBuffer *mbuffer = Manager::instance().getMainBuffer();
108
108
 
109
 
    std::string process_id(Recordable::recorder.getRecorderID());
 
109
    std::string process_id(Recordable::recorder_.getRecorderID());
110
110
 
111
111
    // start recording
112
112
    if (!recordStatus) {
115
115
 
116
116
        mbuffer->bindHalfDuplexOut(process_id);
117
117
 
118
 
        Recordable::recorder.start();
 
118
        Recordable::recorder_.start();
119
119
    } else {
120
120
        for (ParticipantSet::const_iterator iter = participants_.begin(); iter != participants_.end(); ++iter)
121
121
            mbuffer->unBindHalfDuplexOut(process_id, *iter);