← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to daemon/src/video/shm_sink.h

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2015-01-07 14:51:16 UTC
  • mfrom: (4.3.5 sid)
  • Revision ID: package-import@ubuntu.com-20150107145116-yxnafinf4lrdvrmx
Tags: 1.4.1-0.1ubuntu1
* Merge with Debian, remaining changes:
 - Drop soprano, nepomuk build-dep
* Drop ubuntu patches, now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/video/shm_sink.h
76
76
    SHMHeader *shm_area_;
77
77
    size_t shm_area_len_;
78
78
    std::string opened_name_;
 
79
#ifdef DEBUG_FPS
 
80
    unsigned frameCount_;
 
81
    std::chrono::time_point<std::chrono::system_clock> lastFrameDebug_;
 
82
#endif
79
83
};
80
84
 
81
85
}