66#include " DasherInterfaceBase.h"
77#include " DasherModel.h"
88
9- SocketInput::SocketInput (CSettingsUser* Creator, Dasher::CDashIntfSettings * Controller, Dasher::CFrameRate* pFramerate): CScreenCoordInput(0 , _(" Socket Input" )),
9+ SocketInput::SocketInput (CSettingsUser* Creator, Dasher::CDasherInterfaceBase * Controller, Dasher::CFrameRate* pFramerate): CScreenCoordInput(0 , _(" Socket Input" )),
1010 CDefaultFilter(Creator, Controller, pFramerate, 2 , " Socket Mode" )
1111{
12- xLabel = Controller-> GetStringParameter (Dasher::Parameter::SP_SOCKET_INPUT_X_LABEL);
13- yLabel = Controller-> GetStringParameter (Dasher::Parameter::SP_SOCKET_INPUT_Y_LABEL);
12+ xLabel = GetStringParameter (Dasher::Parameter::SP_SOCKET_INPUT_X_LABEL);
13+ yLabel = GetStringParameter (Dasher::Parameter::SP_SOCKET_INPUT_Y_LABEL);
1414}
1515
1616SocketInput::~SocketInput ()
@@ -22,7 +22,7 @@ bool SocketInput::GetScreenCoords(Dasher::screenint& iX, Dasher::screenint& iY,
2222{
2323 const Dasher::CDasherView::ScreenRegion screenRegion = pView->VisibleRegion ();
2424
25- const double vectorLength = std::min (Dasher::CDasherModel::ORIGIN_Y - screenRegion.minY , screenRegion.maxY - Dasher::CDasherModel::ORIGIN_Y);
25+ const double vectorLength = static_cast < double >( std::min (Dasher::CDasherModel::ORIGIN_Y - screenRegion.minY , screenRegion.maxY - Dasher::CDasherModel::ORIGIN_Y) );
2626 const double normalization = sqrt (lastRelativeX * lastRelativeX + lastRelativeY * lastRelativeY);
2727
2828 pView->Dasher2Screen (
@@ -35,7 +35,7 @@ bool SocketInput::GetScreenCoords(Dasher::screenint& iX, Dasher::screenint& iY,
3535
3636void SocketInput::startListen ()
3737{
38- session_acceptor = std::make_unique<asio::ip::tcp::acceptor>(io_service, asio::ip::tcp::endpoint (asio::ip::tcp::v4 (), static_cast <short >(Controller-> GetLongParameter (Dasher::LP_SOCKET_PORT))));
38+ session_acceptor = std::make_unique<asio::ip::tcp::acceptor>(io_service, asio::ip::tcp::endpoint (asio::ip::tcp::v4 (), static_cast <short >(GetLongParameter (Dasher::LP_SOCKET_PORT))));
3939
4040 receiveThread = std::thread ([this ](){
4141
@@ -80,7 +80,7 @@ void SocketInput::startListen()
8080 stop ();
8181 }
8282 }
83- } catch (std::exception& e )
83+ } catch (std::exception&)
8484 {
8585 std::cout << " Wrong format for socket input" << std::endl;
8686 }
0 commit comments