ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add offset to replay_rate to make it unsigned 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2708 e3e1d417-86f3-4887-817a-d78f3d33393f
pull/27/merge
viseon 2008-12-05 23:56:15 +00:00
parent 5d766dde92
commit f2ad7cc770
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/zm_event.cpp
View File

@ -25,6 +25,7 @@
#include <sys/ipc.h>
#include <sys/msg.h>
#include <getopt.h>
#include <arpa/inet.h>
#include <glob.h>
#include "zm.h"
@ -836,7 +837,7 @@ void EventStream::processCommand( const CmdMsg *msg )
// Clear paused flag
paused = false;
}
replay_rate = (signed short)ntohs(((unsigned char)msg->msg_data[1]<<8)|(unsigned char)msg->msg_data[2]);
replay_rate = ntohs(((unsigned char)msg->msg_data[2]<<8)|(unsigned char)msg->msg_data[1])-32768;
break;
}
case CMD_STOP :

2
src/zm_monitor.cpp
View File

@ -2788,7 +2788,7 @@ void MonitorStream::processCommand( const CmdMsg *msg )
// Set delayed_play flag
delayed = true;
}
replay_rate = (signed short)ntohs(((unsigned char)msg->msg_data[1]<<8)|(unsigned char)msg->msg_data[2]);
replay_rate = ntohs(((unsigned char)msg->msg_data[2]<<8)|(unsigned char)msg->msg_data[1])-32768;
break;
}
case CMD_STOP :

2
web/ajax/stream.php
View File

@ -22,7 +22,7 @@ switch ( $_REQUEST['command'] )
{
case CMD_VARPLAY :
//error_log( "Varplaying to ".$_REQUEST['rate'] );
$msg = pack( "lcn", MSG_CMD, $_REQUEST['command'], $_REQUEST['rate']-32768 );
$msg = pack( "lcn", MSG_CMD, $_REQUEST['command'], $_REQUEST['rate']+32768 );
break;
case CMD_ZOOMIN :
//error_log( "Zooming to ".$_REQUEST['x'].",".$_REQUEST['y'] );