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
|
diff -ru ekiga-3.2.0-old/lib/engine/audioinput/audioinput-core.cpp ekiga-3.2.0/lib/engine/audioinput/audioinput-core.cpp
--- ekiga-3.2.0-old/lib/engine/audioinput/audioinput-core.cpp 2009-01-07 05:02:11.000000000 -0500
+++ ekiga-3.2.0/lib/engine/audioinput/audioinput-core.cpp 2009-03-28 12:58:37.000000000 -0400
@@ -197,13 +197,13 @@
iter++)
(*iter)->get_devices (devices);
- if (PTrace::CanTrace(4)) {
- for (std::vector<AudioInputDevice>::iterator iter = devices.begin ();
- iter != devices.end ();
- iter++) {
- PTRACE(4, "AudioInputCore\tDetected Device: " << *iter);
- }
- }
+#if PTRACING
+ for (std::vector<AudioInputDevice>::iterator iter = devices.begin ();
+ iter != devices.end ();
+ iter++) {
+ PTRACE(4, "AudioInputCore\tDetected Device: " << *iter);
+ }
+#endif // PTRACING
}
diff -ru ekiga-3.2.0-old/lib/engine/audiooutput/audiooutput-core.cpp ekiga-3.2.0/lib/engine/audiooutput/audiooutput-core.cpp
--- ekiga-3.2.0-old/lib/engine/audiooutput/audiooutput-core.cpp 2009-01-07 05:02:11.000000000 -0500
+++ ekiga-3.2.0/lib/engine/audiooutput/audiooutput-core.cpp 2009-03-28 12:59:58.000000000 -0400
@@ -151,13 +151,13 @@
iter++)
(*iter)->get_devices (devices);
- if (PTrace::CanTrace(4)) {
- for (std::vector<AudioOutputDevice>::iterator iter = devices.begin ();
- iter != devices.end ();
- iter++) {
- PTRACE(4, "AudioOutputCore\tDetected Device: " << *iter);
- }
- }
+#if PTRACING
+ for (std::vector<AudioOutputDevice>::iterator iter = devices.begin ();
+ iter != devices.end ();
+ iter++) {
+ PTRACE(4, "AudioOutputCore\tDetected Device: " << *iter);
+ }
+#endif // PTRACING
}
diff -ru ekiga-3.2.0-old/lib/engine/videoinput/videoinput-core.cpp ekiga-3.2.0/lib/engine/videoinput/videoinput-core.cpp
--- ekiga-3.2.0-old/lib/engine/videoinput/videoinput-core.cpp 2009-03-01 17:47:10.000000000 -0500
+++ ekiga-3.2.0/lib/engine/videoinput/videoinput-core.cpp 2009-03-28 12:57:34.000000000 -0400
@@ -207,13 +207,13 @@
iter++)
(*iter)->get_devices (devices);
- if (PTrace::CanTrace(4)) {
- for (std::vector<VideoInputDevice>::iterator iter = devices.begin ();
- iter != devices.end ();
- iter++) {
- PTRACE(4, "VidInputCore\tDetected Device: " << *iter);
- }
- }
+#if PTRACING
+ for (std::vector<VideoInputDevice>::iterator iter = devices.begin ();
+ iter != devices.end ();
+ iter++) {
+ PTRACE(4, "VidInputCore\tDetected Device: " << *iter);
+ }
+#endif // PTRACING
}
void VideoInputCore::set_device(const VideoInputDevice & device, int channel, VideoInputFormat format)
diff -ru ekiga-3.2.0-old/lib/gui/xvwindow.cpp ekiga-3.2.0/lib/gui/xvwindow.cpp
--- ekiga-3.2.0-old/lib/gui/xvwindow.cpp 2009-01-07 05:02:11.000000000 -0500
+++ ekiga-3.2.0/lib/gui/xvwindow.cpp 2009-03-28 12:50:33.000000000 -0400
@@ -409,8 +409,9 @@
continue;
}
- if (PTrace::CanTrace (4))
- DumpCapabilities (candidateXVPort);
+#if PTRACING
+ DumpCapabilities (candidateXVPort);
+#endif // PTRACING
// Check if the Port supports YV12/YUV colorspace
supportsYV12 = false;
@@ -684,7 +685,8 @@
}
}
- if ( (_useShm) && (PTrace::CanTrace (4)) ) {
+#if PTRACING
+ if ( (_useShm) ) {
int j = 0;
PTRACE(4, "XVideo\tCreated XvImage (" << _XVImage[i]->width << "x" << _XVImage[i]->height
<< ", data size: " << _XVImage[i]->data_size << ", num_planes: " << _XVImage[i]->num_planes);
@@ -692,6 +694,7 @@
for (j = 0 ; j < _XVImage[i]->num_planes ; j++)
PTRACE(4, "XVideo\t Plane " << j << ": pitch=" << _XVImage[i]->pitches [j] << ", offset=" << _XVImage[i]->offsets [j]);
}
+#endif // PTRACING
if (_useShm) {
_XShmInfo[i].shmid = shmget (IPC_PRIVATE, _XVImage[i]->data_size, IPC_CREAT | 0777);
diff -ru ekiga-3.2.0-old/lib/gui/xwindow.cpp ekiga-3.2.0/lib/gui/xwindow.cpp
--- ekiga-3.2.0-old/lib/gui/xwindow.cpp 2009-01-07 05:02:11.000000000 -0500
+++ ekiga-3.2.0/lib/gui/xwindow.cpp 2009-03-28 12:47:40.000000000 -0400
@@ -200,8 +200,9 @@
PTRACE(4, "X11\tInitiasing new X11 window with " << windowWidth << "x" << windowHeight << " at " << x << "," << y);
XLockDisplay (_display);
- if (PTrace::CanTrace (4))
- DumpVisuals();
+#if PTRACING
+ DumpVisuals();
+#endif // PTRACING
if (!CreateAtomsAndWindow(gc, x, y, windowWidth, windowHeight)) {
XUnlockDisplay(_display);
diff -ru ekiga-3.2.0-old/src/gui/main.cpp ekiga-3.2.0/src/gui/main.cpp
--- ekiga-3.2.0-old/src/gui/main.cpp 2009-03-03 16:48:37.000000000 -0500
+++ ekiga-3.2.0/src/gui/main.cpp 2009-03-28 13:16:24.000000000 -0400
@@ -4453,10 +4453,13 @@
/* Ekiga initialisation */
static GnomeMeeting instance;
+#if PTRACING
if (debug_level != 0)
PTrace::Initialise (PMAX (PMIN (5, debug_level), 0), NULL,
PTrace::Timestamp | PTrace::Thread
| PTrace::Blocks | PTrace::DateAndTime);
+#endif // PTRACING
+
#ifdef EKIGA_REVISION
PTRACE(1, "Ekiga SVN revision: " << EKIGA_REVISION);
#endif
|
GitWeb