1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
|
diff -ur a/libdevice/vaapi/VaapiImage.cpp b/libdevice/vaapi/VaapiImage.cpp
--- a/libdevice/vaapi/VaapiImage.cpp 2012-01-19 20:17:48.000000000 +0100
+++ b/libdevice/vaapi/VaapiImage.cpp 2012-02-23 19:05:13.000000000 +0100
@@ -35,7 +35,7 @@
: _format(format)
, _image_data(NULL)
{
- log_debug(_("VaapiImage::VaapiImage(): format '%s'\n", string_of_FOURCC(format)));
+ log_debug("VaapiImage::VaapiImage(): format '%s'\n", string_of_FOURCC(format));
memset(&_image, 0, sizeof(_image));
_image.image_id = VA_INVALID_ID;
@@ -79,7 +79,7 @@
if (!vaapi_check_status(status, "vaCreateImage()"))
return false;
- log_debug(_(" image 0x%08x, format '%s'\n", get(), string_of_FOURCC(_format)));
+ log_debug(" image 0x%08x, format '%s'\n", get(), string_of_FOURCC(_format));
return true;
}
diff -ur a/libdevice/vaapi/VaapiSubpicture.cpp b/libdevice/vaapi/VaapiSubpicture.cpp
--- a/libdevice/vaapi/VaapiSubpicture.cpp 2012-01-19 20:17:48.000000000 +0100
+++ b/libdevice/vaapi/VaapiSubpicture.cpp 2012-02-23 19:05:13.000000000 +0100
@@ -32,7 +32,7 @@
: _image(image)
, _subpicture(VA_INVALID_ID)
{
- log_debug(_("VaapiSubpicture::VaapiSubpicture(): format '%s'\n", string_of_FOURCC(image->format())));
+ log_debug("VaapiSubpicture::VaapiSubpicture(): format '%s'\n", string_of_FOURCC(image->format()));
if (!create()) {
boost::format msg;
diff -ur a/libdevice/vaapi/VaapiSurface.cpp b/libdevice/vaapi/VaapiSurface.cpp
--- a/libdevice/vaapi/VaapiSurface.cpp 2012-01-19 20:17:48.000000000 +0100
+++ b/libdevice/vaapi/VaapiSurface.cpp 2012-02-23 19:05:13.000000000 +0100
@@ -74,7 +74,7 @@
VaapiSurfaceImpl::~VaapiSurfaceImpl()
{
- log_debug(_("VaapiSurface::~VaapiSurface(): surface 0x%08x\n", surface()));
+ log_debug("VaapiSurface::~VaapiSurface(): surface 0x%08x\n", surface());
if (surface() == VA_INVALID_SURFACE) {
return;
diff -ur a/libdevice/vaapi/VaapiSurfaceGLX.cpp b/libdevice/vaapi/VaapiSurfaceGLX.cpp
--- a/libdevice/vaapi/VaapiSurfaceGLX.cpp 2012-01-19 20:17:48.000000000 +0100
+++ b/libdevice/vaapi/VaapiSurfaceGLX.cpp 2012-02-23 19:05:13.000000000 +0100
@@ -202,14 +202,14 @@
reset(reinterpret_cast<uintptr_t>(surface));
- log_debug(_(" -> surface %p\n", this->surface()));
+ log_debug(" -> surface %p\n", this->surface());
}
VaapiSurfaceGLXImpl::~VaapiSurfaceGLXImpl()
{
// GNASH_REPORT_FUNCTION;
- log_debug(_("VaapiSurface::~VaapiSurface(): surface %p\n", surface()));
+ log_debug("VaapiSurface::~VaapiSurface(): surface %p\n", surface());
if (!surface()) {
return;
@@ -263,7 +263,7 @@
bool VaapiSurfaceGLX::update(boost::shared_ptr<VaapiSurface> surface)
{
- log_debug(_("VaapiSurfaceGLX::update(): from surface 0x%08x\n", surface->get()));
+ log_debug("VaapiSurfaceGLX::update(): from surface 0x%08x\n", surface->get());
return dynamic_cast<VaapiSurfaceGLXImpl *>(_impl.get())->update(surface);
}
diff -ur a/libdevice/vaapi/VaapiSurfaceProxy.cpp b/libdevice/vaapi/VaapiSurfaceProxy.cpp
--- a/libdevice/vaapi/VaapiSurfaceProxy.cpp 2012-01-19 20:17:48.000000000 +0100
+++ b/libdevice/vaapi/VaapiSurfaceProxy.cpp 2012-02-23 19:05:13.000000000 +0100
@@ -28,12 +28,12 @@
boost::shared_ptr<VaapiContext> context)
: _context(context), _surface(surface)
{
- log_debug(_("VaapiSurfaceProxy::VaapiSurfaceProxy(): surface 0x%08x\n", _surface->get()));
+ log_debug("VaapiSurfaceProxy::VaapiSurfaceProxy(): surface 0x%08x\n", _surface->get());
}
VaapiSurfaceProxy::~VaapiSurfaceProxy()
{
- log_debug(_("VaapiSurfaceProxy::~VaapiSurfaceProxy(): surface 0x%08x\n", _surface->get()));
+ log_debug("VaapiSurfaceProxy::~VaapiSurfaceProxy(): surface 0x%08x\n", _surface->get());
_context->releaseSurface(_surface);
}
diff -ur a/libdevice/x11/X11Device.cpp b/libdevice/x11/X11Device.cpp
--- a/libdevice/x11/X11Device.cpp 2012-01-19 20:17:48.000000000 +0100
+++ b/libdevice/x11/X11Device.cpp 2012-02-23 19:05:13.000000000 +0100
@@ -85,7 +85,7 @@
GNASH_REPORT_FUNCTION;
if (!initDevice(0, 0)) {
- log_error(_("Couldn't initialize X11 device!"));
+ log_error("Couldn't initialize X11 device!");
}
}
@@ -103,7 +103,7 @@
GNASH_REPORT_FUNCTION;
if (!initDevice(argc, argv)) {
- log_error(_("Couldn't initialize X11 device!"));
+ log_error("Couldn't initialize X11 device!");
}
}
@@ -139,7 +139,7 @@
_display = XOpenDisplay(dpyName);
if (!_display) {
- log_error(_("couldn't open X11 display!"));
+ log_error("couldn't open X11 display!");
return false;
}
@@ -159,7 +159,7 @@
_vinfo = XGetVisualInfo(_display, VisualIDMask, &visTemplate, &num_visuals);
std::cerr << "Num Visuals: " << num_visuals << std::endl;
if (!_vinfo) {
- log_error(_("Error: couldn't get X visual\n"));
+ log_error("Error: couldn't get X visual\n");
exit(1);
}
std::cerr << "X11 visual is: " << _vinfo->visual << std::endl;
@@ -196,7 +196,7 @@
if (_display) {
XGetErrorText(_display, error, msg, 80);
} else {
- log_error(_("The default Display is not set!"));
+ log_error("The default Display is not set!");
}
return msg;
@@ -209,12 +209,12 @@
GNASH_REPORT_FUNCTION;
if (!_display) {
- log_error(_("No Display device set!"));
+ log_error("No Display device set!");
return;
}
if (!_root) {
- log_error(_("No drawable window set!"));
+ log_error("No drawable window set!");
return;
}
@@ -279,11 +279,11 @@
case KeyPress:
{
char buffer[10];
- int code;
+ int r, code;
code = XLookupKeysym(&event.xkey, 0);
if (!keyPress || !keyPress(code)) {
- // int r = XLookupString(&event.xkey, buffer, sizeof(buffer),
- // NULL, NULL);
+ r = XLookupString(&event.xkey, buffer, sizeof(buffer),
+ NULL, NULL);
if (buffer[0] == 27) {
// escape
return;
|
