[Pkg-voip-commits] r8744 - in /lcr/trunk/debian: changelog patches/series patches/vbox-announcement

[dorchain-guest at alioth.debian.org]

Author: dorchain-guest
Date: Wed Feb  2 14:53:54 2011
New Revision: 8744

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8744
Log:
vbox-annoucement fix from git integrated

Added:
    lcr/trunk/debian/patches/vbox-announcement
Modified:
    lcr/trunk/debian/changelog
    lcr/trunk/debian/patches/series

Modified: lcr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/changelog?rev=8744&op=diff
==============================================================================
--- lcr/trunk/debian/changelog (original)
+++ lcr/trunk/debian/changelog Wed Feb  2 14:53:54 2011
@@ -6,6 +6,7 @@
     - update debian policy 3.8.4
   * refreshed patches
   * new compile patches necessary
+  * vbox-annoucement fix from git integrated
 
  -- Joerg Dorchain <joerg at dorchain.net>  Wed, 9 Jun 2010 13:00:00 +0200
 

Modified: lcr/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/patches/series?rev=8744&op=diff
==============================================================================
--- lcr/trunk/debian/patches/series (original)
+++ lcr/trunk/debian/patches/series Wed Feb  2 14:53:54 2011
@@ -2,3 +2,4 @@
 configure_warning
 tone_zone_sound
 af_isdn
+vbox-announcement

Added: lcr/trunk/debian/patches/vbox-announcement
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/patches/vbox-announcement?rev=8744&op=file
==============================================================================
--- lcr/trunk/debian/patches/vbox-announcement (added)
+++ lcr/trunk/debian/patches/vbox-announcement Wed Feb  2 14:53:54 2011
@@ -1,0 +1,55 @@
+From: Andreas Eversberg <jolly at eversberg.eu>
+Date: Mon, 20 Sep 2010 06:22:13 +0000 (+0200)
+Subject: Fix of vbox announcing bug
+X-Git-Url: http://git.misdn.org/?p=lcr.git;a=commitdiff_plain;h=1e711b3a83867445c2ad7e7f84e4e3c024ad9572
+
+Fix of vbox announcing bug
+
+Hi,
+
+here's a simple patch that makes the announcement work again when using
+the vbox in lcr.
+
+Bodo
+---
+
+diff --git a/vbox.cpp b/vbox.cpp
+index 6eb0ce2..bc2c369 100644
+--- a/vbox.cpp
++++ b/vbox.cpp
+@@ -107,14 +107,14 @@ void VBoxPort::send_announcement(void)
+ 	class Endpoint	*epoint;
+ 	int		temp;
+ 	struct timeval current_time;
+-	long long	now;
++	long long	now;  /* Time in samples */
+ 
+ 	/* don't restart timer, if announcement is played */
+ 	if (p_vbox_announce_fh < 0)
+ 		return;
+ 
+ 	gettimeofday(&current_time, NULL);
+-	now = current_time.tv_sec * MICRO_SECONDS + current_time.tv_usec;
++	now = (current_time.tv_sec * MICRO_SECONDS + current_time.tv_usec)/125;
+ 
+ 	/* set time the first time */
+ 	if (!p_vbox_audio_start)
+@@ -122,6 +122,8 @@ void VBoxPort::send_announcement(void)
+ 	
+ 	/* calculate the number of bytes */
+ 	tosend = (unsigned int)(now - p_vbox_audio_start) - p_vbox_audio_transferred;
++	if (tosend > sizeof(buffer))
++		tosend = sizeof(buffer);
+ 
+ 	/* schedule next event */
+ 	temp = ISDN_TRANSMIT + ISDN_TRANSMIT - tosend;
+@@ -129,9 +131,6 @@ void VBoxPort::send_announcement(void)
+ 		temp = 0;
+ 	schedule_timer(&p_vbox_announce_timer, 0, temp*125);
+ 
+-	if (tosend > sizeof(buffer))
+-		tosend = sizeof(buffer);
+-
+ 	/* add the number of samples elapsed */
+ 	p_vbox_audio_transferred += tosend;
+