Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 238554 | Differences between
and this patch

Collapse All | Expand All

(-)ekiga-3.2.0-old/lib/engine/audioinput/audioinput-core.cpp (-7 / +7 lines)
Lines 197-209 Link Here
197
       iter++)
197
       iter++)
198
    (*iter)->get_devices (devices);
198
    (*iter)->get_devices (devices);
199
199
200
  if (PTrace::CanTrace(4)) {
200
#if PTRACING
201
     for (std::vector<AudioInputDevice>::iterator iter = devices.begin ();
201
	for (std::vector<AudioInputDevice>::iterator iter = devices.begin ();
202
         iter != devices.end ();
202
			iter != devices.end ();
203
         iter++) {
203
			iter++) {
204
      PTRACE(4, "AudioInputCore\tDetected Device: " << *iter);
204
		PTRACE(4, "AudioInputCore\tDetected Device: " << *iter);
205
    }
205
	}
206
  }
206
#endif // PTRACING
207
207
208
}
208
}
209
209
(-)ekiga-3.2.0-old/lib/engine/audiooutput/audiooutput-core.cpp (-7 / +7 lines)
Lines 151-163 Link Here
151
       iter++)
151
       iter++)
152
    (*iter)->get_devices (devices);
152
    (*iter)->get_devices (devices);
153
153
154
  if (PTrace::CanTrace(4)) {
154
#if PTRACING
155
     for (std::vector<AudioOutputDevice>::iterator iter = devices.begin ();
155
	for (std::vector<AudioOutputDevice>::iterator iter = devices.begin ();
156
         iter != devices.end ();
156
			iter != devices.end ();
157
         iter++) {
157
			iter++) {
158
      PTRACE(4, "AudioOutputCore\tDetected Device: " << *iter);
158
		PTRACE(4, "AudioOutputCore\tDetected Device: " << *iter);
159
    }
159
	}
160
  }
160
#endif // PTRACING
161
161
162
}
162
}
163
163
(-)ekiga-3.2.0-old/lib/engine/videoinput/videoinput-core.cpp (-7 / +7 lines)
Lines 207-219 Link Here
207
       iter++)
207
       iter++)
208
    (*iter)->get_devices (devices);
208
    (*iter)->get_devices (devices);
209
209
210
  if (PTrace::CanTrace(4)) {
210
#if PTRACING
211
     for (std::vector<VideoInputDevice>::iterator iter = devices.begin ();
211
	for (std::vector<VideoInputDevice>::iterator iter = devices.begin ();
212
         iter != devices.end ();
212
			iter != devices.end ();
213
         iter++) {
213
			iter++) {
214
      PTRACE(4, "VidInputCore\tDetected Device: " << *iter);
214
		PTRACE(4, "VidInputCore\tDetected Device: " << *iter);
215
    }
215
	}
216
  }
216
#endif // PTRACING
217
}
217
}
218
218
219
void VideoInputCore::set_device(const VideoInputDevice & device, int channel, VideoInputFormat format)
219
void VideoInputCore::set_device(const VideoInputDevice & device, int channel, VideoInputFormat format)
(-)ekiga-3.2.0-old/lib/gui/xvwindow.cpp (-3 / +6 lines)
Lines 409-416 Link Here
409
          continue;
409
          continue;
410
        }
410
        }
411
411
412
        if (PTrace::CanTrace (4)) 
412
#if PTRACING
413
          DumpCapabilities (candidateXVPort);
413
				DumpCapabilities (candidateXVPort);
414
#endif // PTRACING
414
415
415
        // Check if the Port supports YV12/YUV colorspace
416
        // Check if the Port supports YV12/YUV colorspace
416
        supportsYV12 = false;
417
        supportsYV12 = false;
Lines 684-690 Link Here
684
      }
685
      }
685
    }
686
    }
686
  
687
  
687
    if ( (_useShm) && (PTrace::CanTrace (4)) ) {
688
#if PTRACING
689
    if ( (_useShm) ) {
688
      int j = 0;
690
      int j = 0;
689
      PTRACE(4, "XVideo\tCreated XvImage (" << _XVImage[i]->width << "x" << _XVImage[i]->height 
691
      PTRACE(4, "XVideo\tCreated XvImage (" << _XVImage[i]->width << "x" << _XVImage[i]->height 
690
            << ", data size: " << _XVImage[i]->data_size << ", num_planes: " << _XVImage[i]->num_planes);
692
            << ", data size: " << _XVImage[i]->data_size << ", num_planes: " << _XVImage[i]->num_planes);
Lines 692-697 Link Here
692
      for (j = 0 ; j < _XVImage[i]->num_planes ; j++) 
694
      for (j = 0 ; j < _XVImage[i]->num_planes ; j++) 
693
        PTRACE(4, "XVideo\t  Plane " << j << ": pitch=" << _XVImage[i]->pitches [j] << ", offset=" << _XVImage[i]->offsets [j]);
695
        PTRACE(4, "XVideo\t  Plane " << j << ": pitch=" << _XVImage[i]->pitches [j] << ", offset=" << _XVImage[i]->offsets [j]);
694
    }
696
    }
697
#endif // PTRACING
695
  
698
  
696
    if (_useShm) {
699
    if (_useShm) {
697
      _XShmInfo[i].shmid = shmget (IPC_PRIVATE, _XVImage[i]->data_size, IPC_CREAT | 0777);
700
      _XShmInfo[i].shmid = shmget (IPC_PRIVATE, _XVImage[i]->data_size, IPC_CREAT | 0777);
(-)ekiga-3.2.0-old/lib/gui/xwindow.cpp (-2 / +3 lines)
Lines 200-207 Link Here
200
  PTRACE(4, "X11\tInitiasing new X11 window with " << windowWidth << "x" << windowHeight << " at " << x << "," << y);
200
  PTRACE(4, "X11\tInitiasing new X11 window with " << windowWidth << "x" << windowHeight << " at " << x << "," << y);
201
  XLockDisplay (_display);
201
  XLockDisplay (_display);
202
202
203
  if (PTrace::CanTrace (4)) 
203
#if PTRACING
204
    DumpVisuals();
204
	DumpVisuals();
205
#endif // PTRACING
205
206
206
  if (!CreateAtomsAndWindow(gc, x, y, windowWidth, windowHeight)) {
207
  if (!CreateAtomsAndWindow(gc, x, y, windowWidth, windowHeight)) {
207
    XUnlockDisplay(_display);
208
    XUnlockDisplay(_display);
(-)ekiga-3.2.0-old/src/gui/main.cpp (+3 lines)
Lines 4453-4462 Link Here
4453
  /* Ekiga initialisation */
4453
  /* Ekiga initialisation */
4454
  static GnomeMeeting instance;
4454
  static GnomeMeeting instance;
4455
4455
4456
#if PTRACING
4456
  if (debug_level != 0)
4457
  if (debug_level != 0)
4457
    PTrace::Initialise (PMAX (PMIN (5, debug_level), 0), NULL,
4458
    PTrace::Initialise (PMAX (PMIN (5, debug_level), 0), NULL,
4458
			PTrace::Timestamp | PTrace::Thread
4459
			PTrace::Timestamp | PTrace::Thread
4459
			| PTrace::Blocks | PTrace::DateAndTime);
4460
			| PTrace::Blocks | PTrace::DateAndTime);
4461
#endif // PTRACING
4462
4460
#ifdef EKIGA_REVISION
4463
#ifdef EKIGA_REVISION
4461
  PTRACE(1, "Ekiga SVN revision: " << EKIGA_REVISION);
4464
  PTRACE(1, "Ekiga SVN revision: " << EKIGA_REVISION);
4462
#endif
4465
#endif

Return to bug 238554