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.0.2-old/lib/engine/audioinput/skel/audioinput-core.cpp (-8 / +7 lines)
Lines 198-211 Link Here
198
       iter++)
198
       iter++)
199
    (*iter)->get_devices (devices);
199
    (*iter)->get_devices (devices);
200
200
201
  if (PTrace::CanTrace(4)) {
201
#if PTRACING
202
     for (std::vector<AudioInputDevice>::iterator iter = devices.begin ();
202
	for (std::vector<AudioInputDevice>::iterator iter = devices.begin ();
203
         iter != devices.end ();
203
			iter != devices.end ();
204
         iter++) {
204
			iter++) {
205
      PTRACE(4, "AudioInputCore\tDetected Device: " << *iter);
205
		PTRACE(4, "AudioInputCore\tDetected Device: " << *iter);
206
    }
206
	}
207
  }
207
#endif // PTRACING
208
209
}
208
}
210
209
211
void AudioInputCore::set_device(const AudioInputDevice & device)
210
void AudioInputCore::set_device(const AudioInputDevice & device)
(-)ekiga-3.0.2-old/lib/engine/audiooutput/skel/audiooutput-core.cpp (-8 / +7 lines)
Lines 151-164 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
162
}
161
}
163
162
164
void AudioOutputCore::set_device(AudioOutputPS ps, const AudioOutputDevice & device)
163
void AudioOutputCore::set_device(AudioOutputPS ps, const AudioOutputDevice & device)
(-)ekiga-3.0.2-old/lib/engine/videoinput/skel/videoinput-core.cpp (-7 / +7 lines)
Lines 201-213 Link Here
201
       iter++)
201
       iter++)
202
    (*iter)->get_devices (devices);
202
    (*iter)->get_devices (devices);
203
203
204
  if (PTrace::CanTrace(4)) {
204
#if PTRACING
205
     for (std::vector<VideoInputDevice>::iterator iter = devices.begin ();
205
	for (std::vector<VideoInputDevice>::iterator iter = devices.begin ();
206
         iter != devices.end ();
206
			iter != devices.end ();
207
         iter++) {
207
			iter++) {
208
      PTRACE(4, "VidInputCore\tDetected Device: " << *iter);
208
		PTRACE(4, "VidInputCore\tDetected Device: " << *iter);
209
    }
209
	}
210
  }
210
#endif
211
}
211
}
212
212
213
void VideoInputCore::set_device(const VideoInputDevice & device, int channel, VideoInputFormat format)
213
void VideoInputCore::set_device(const VideoInputDevice & device, int channel, VideoInputFormat format)
(-)ekiga-3.0.2-old/lib/gui/xvwindow.cpp (-12 / +13 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-699 Link Here
684
      }
685
      }
685
    }
686
    }
686
  
687
  
687
    if ( (_useShm) && (PTrace::CanTrace (4)) ) {
688
#if PTRACING
688
      int j = 0;
689
		int j = 0;
689
      PTRACE(4, "XVideo\tCreated XvImage (" << _XVImage[i]->width << "x" << _XVImage[i]->height 
690
		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);
691
				<< ", data size: " << _XVImage[i]->data_size << ", num_planes: " << _XVImage[i]->num_planes);
691
  
692
692
      for (j = 0 ; j < _XVImage[i]->num_planes ; j++) 
693
		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]);
694
			PTRACE(4, "XVideo\t  Plane " << j << ": pitch=" << _XVImage[i]->pitches [j] << ", offset=" << _XVImage[i]->offsets [j]);
694
    }
695
#endif // PTRACING
695
  
696
696
    if (_useShm) {
697
		if (_useShm) {
697
      _XShmInfo[i].shmid = shmget (IPC_PRIVATE, _XVImage[i]->data_size, IPC_CREAT | 0777);
698
      _XShmInfo[i].shmid = shmget (IPC_PRIVATE, _XVImage[i]->data_size, IPC_CREAT | 0777);
698
      if (_XShmInfo[i].shmid < 0) {
699
      if (_XShmInfo[i].shmid < 0) {
699
        XFree (_XVImage[i]);
700
        XFree (_XVImage[i]);
(-)ekiga-3.0.2-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.0.2-old/src/gui/main.cpp (+3 lines)
Lines 4713-4722 Link Here
4713
  /* Ekiga initialisation */
4713
  /* Ekiga initialisation */
4714
  static GnomeMeeting instance;
4714
  static GnomeMeeting instance;
4715
4715
4716
#if PTRACING
4716
  if (debug_level != 0)
4717
  if (debug_level != 0)
4717
    PTrace::Initialise (PMAX (PMIN (5, debug_level), 0), NULL,
4718
    PTrace::Initialise (PMAX (PMIN (5, debug_level), 0), NULL,
4718
			PTrace::Timestamp | PTrace::Thread
4719
			PTrace::Timestamp | PTrace::Thread
4719
			| PTrace::Blocks | PTrace::DateAndTime);
4720
			| PTrace::Blocks | PTrace::DateAndTime);
4721
#endif // PTRACING
4722
4720
#ifdef EKIGA_REVISION
4723
#ifdef EKIGA_REVISION
4721
  PTRACE(1, "Ekiga SVN revision: " << EKIGA_REVISION);
4724
  PTRACE(1, "Ekiga SVN revision: " << EKIGA_REVISION);
4722
#endif
4725
#endif

Return to bug 238554