← Back to branch summary

~oif-team/grail/trunk

« back to all changes in this revision

Viewing changes to src/recognizer.h

  • Committer: Chase Douglas
  • Date: 2012-07-25 23:09:08 UTC
  • mfrom: (229.2.4 grail)
  • Revision ID: chase.douglas@canonical.com-20120725230908-1l25qh2ex2ueanqj
Merge in project rename

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/recognizer.h
1
1
/*****************************************************************************
2
2
 *
3
 
 * utouch-grail - Multitouch Gesture Recognition Library
 
3
 * grail - Multitouch Gesture Recognition Library
4
4
 *
5
5
 * Copyright (C) 2011-2012 Canonical Ltd.
6
6
 *
18
18
 *
19
19
 ****************************************************************************/
20
20
 
21
 
#ifndef UTOUCH_GRAIL_RECOGNIZER_H_
22
 
#define UTOUCH_GRAIL_RECOGNIZER_H_
 
21
#ifndef GRAIL_RECOGNIZER_H_
 
22
#define GRAIL_RECOGNIZER_H_
23
23
 
24
24
#include <list>
25
25
#include <map>
26
26
#include <memory>
27
27
#include <set>
28
28
 
29
 
#include <utouch/frame.h>
 
29
#include <oif/frame.h>
30
30
 
31
 
#include "utouch/grail.h"
 
31
#include "oif/grail.h"
32
32
#include "forward.h"
33
33
#include "subscription.h"
34
34
 
48
48
   wanted. */
49
49
#define CLEAR_TOUCHES(map) \
50
50
  { \
51
 
    if (utouch::grail::Logger::instance().level() <= utouch::grail::Logger::Dbg) \
 
51
    if (oif::grail::Logger::instance().level() <= oif::grail::Logger::Dbg) \
52
52
      if ((map).size() > 0) \
53
53
        LOG(Dbg) << "touch(es) " << (map).ToString() \
54
54
                 << " have been erased from " #map "\n"; \
55
55
    (map).clear(); \
56
56
  }
57
57
 
58
 
namespace utouch {
 
58
namespace oif {
59
59
namespace grail {
60
60
 
61
61
class Recognizer {
110
110
};
111
111
 
112
112
} // namespace grail
113
 
} // namespace utouch
114
 
#endif // UTOUCH_GRAIL_RECOGNIZER_H_
 
113
} // namespace oif
 
114
#endif // GRAIL_RECOGNIZER_H_