summaryrefslogtreecommitdiff
path: root/net/gnomemeeting/files/patch-af
blob: 612f4fd0c440066897b2e9cd0338351826ab7830 (plain) (blame)
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
*** src/endpoint.cpp.orig	Sun Jun 17 22:37:03 2001
--- src/endpoint.cpp	Fri Jul 27 14:27:01 2001
*************** GMH323EndPoint::GMH323EndPoint (GM_windo
*** 83,88 ****
--- 83,90 ----
  
    SetCurrentConnection (NULL);
    SetCallingState (0);
+ 
+   ring_thread = NULL;
  }
  
  
*************** void GMH323EndPoint::OnConnectionEstabli
*** 525,531 ****
    applet_widget_set_tooltip (APPLET_WIDGET (gw->applet), NULL);
    gdk_threads_leave ();
  
!   pthread_cancel (ring_thread);
  
    calling_state = 2;
  
--- 527,534 ----
    applet_widget_set_tooltip (APPLET_WIDGET (gw->applet), NULL);
    gdk_threads_leave ();
  
!   if (ring_thread != NULL)
!     pthread_cancel (ring_thread);
  
    calling_state = 2;
  
*************** BOOL GMH323EndPoint::OpenVideoDevice (H3
*** 700,706 ****
        codec.SetVideoDevice("/dev/video");
        codec.SetVideoInput (0);
        codec.SetTxQualityLevel (opts->tr_vq);
!       codec.SetTxFPS (opts->tr_fps);
        codec.SetBackgroundFill(opts->tr_ub);
        codec.SetVideoFormat(opts->video_format);
  
--- 703,709 ----
        codec.SetVideoDevice("/dev/video");
        codec.SetVideoInput (0);
        codec.SetTxQualityLevel (opts->tr_vq);
! /*      codec.SetTxFPS (opts->tr_fps); */
        codec.SetBackgroundFill(opts->tr_ub);
        codec.SetVideoFormat(opts->video_format);