Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package serialdv for openSUSE:Factory checked in at 2021-06-26 21:25:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/serialdv (Old) and /work/SRC/openSUSE:Factory/.serialdv.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "serialdv" Sat Jun 26 21:25:22 2021 rev:4 rq:902382 version:1.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/serialdv/serialdv.changes 2019-09-04 09:15:39.398935524 +0200 +++ /work/SRC/openSUSE:Factory/.serialdv.new.2625/serialdv.changes 2021-06-26 21:25:40.903360628 +0200 @@ -1,0 +2,6 @@ +Thu Jun 24 11:03:48 UTC 2021 - Ferdinand Thiessen <[email protected]> + +- Update to version 1.1.4 + * no user visible changes + +------------------------------------------------------------------- Old: ---- serialDV-1.1.2.tar.gz New: ---- serialDV-1.1.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ serialdv.spec ++++++ --- /var/tmp/diff_new_pack.3zW416/_old 2021-06-26 21:25:41.331361193 +0200 +++ /var/tmp/diff_new_pack.3zW416/_new 2021-06-26 21:25:41.331361193 +0200 @@ -1,7 +1,7 @@ # # spec file for package serialdv # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2019, Martin Hauke <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -20,7 +20,7 @@ %define sover 1 %define libname libserialdv%{sover} Name: serialdv -Version: 1.1.2 +Version: 1.1.4 Release: 0 Summary: Library for audio de-/encoding with ABME3000 based devices License: GPL-3.0-only ++++++ serialDV-1.1.2.tar.gz -> serialDV-1.1.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serialDV-1.1.2/.gitignore new/serialDV-1.1.4/.gitignore --- old/serialDV-1.1.2/.gitignore 2019-09-02 00:54:27.000000000 +0200 +++ new/serialDV-1.1.4/.gitignore 2019-10-22 22:08:06.000000000 +0200 @@ -1,3 +1,4 @@ .cproject .project -build \ No newline at end of file +.vscode +build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serialDV-1.1.2/CMakeLists.txt new/serialDV-1.1.4/CMakeLists.txt --- old/serialDV-1.1.2/CMakeLists.txt 2019-09-02 00:54:27.000000000 +0200 +++ new/serialDV-1.1.4/CMakeLists.txt 2019-10-22 22:08:06.000000000 +0200 @@ -4,7 +4,7 @@ set(MAJOR_VERSION 1) set(MINOR_VERSION 1) -set(PATCH_VERSION 2) +set(PATCH_VERSION 4) set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}) set(VERSION ${VERSION_STRING}) @@ -43,19 +43,30 @@ set(serialdv_SOURCES datacontroller.cpp - serialdatacontroller.cpp - udpdatacontroller.cpp + dummydatacontroller.cpp dvcontroller.cpp ) set(serialdv_HEADERS serialdv_export.h datacontroller.h - serialdatacontroller.h - udpdatacontroller.h + dummydatacontroller.h dvcontroller.h ) +if (NOT APPLE) + set(serialdv_SOURCES + ${serialdv_SOURCES} + serialdatacontroller.cpp + udpdatacontroller.cpp + ) + set(serialdv_HEADERS + ${serialdv_HEADERS} + serialdatacontroller.h + udpdatacontroller.h + ) +endif() + include_directories( ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serialDV-1.1.2/datacontroller.h new/serialDV-1.1.4/datacontroller.h --- old/serialDV-1.1.2/datacontroller.h 2019-09-02 00:54:27.000000000 +0200 +++ new/serialDV-1.1.4/datacontroller.h 2019-10-22 22:08:06.000000000 +0200 @@ -53,6 +53,12 @@ virtual int write(const unsigned char* buffer, unsigned int lengthInBytes) = 0; virtual void closeIt() = 0; + +#ifdef __WINDOWS__ + static const unsigned int BUFFER_LENGTH = 1000U; +#else + static const unsigned int BUFFER_LENGTH = 400U; +#endif }; } // namespace SerialDV diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serialDV-1.1.2/dummydatacontroller.cpp new/serialDV-1.1.4/dummydatacontroller.cpp --- old/serialDV-1.1.2/dummydatacontroller.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/serialDV-1.1.4/dummydatacontroller.cpp 2019-10-22 22:08:06.000000000 +0200 @@ -0,0 +1,61 @@ +/////////////////////////////////////////////////////////////////////////////////// +// Copyright (C) 2019 Edouard Griffiths, F4EXB. // +// // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation as version 3 of the License, or // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License V3 for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program. If not, see <http://www.gnu.org/licenses/>. // +/////////////////////////////////////////////////////////////////////////////////// + +#include "dummydatacontroller.h" + +namespace SerialDV +{ + +DummyDataController::DummyDataController() +{ +} + +DummyDataController::~DummyDataController() +{ +} + +bool DummyDataController::open(const std::string& device, SERIAL_SPEED speed) +{ + (void) device; + (void) speed; + return false; +} + +int DummyDataController::read(unsigned char* buffer, unsigned int lengthInBytes) +{ + (void) buffer; + (void) lengthInBytes; + return 0; +} + +int DummyDataController::write(const unsigned char* buffer, unsigned int lengthInBytes) +{ + (void) buffer; + (void) lengthInBytes; + return 0; +} + +void DummyDataController::closeIt() +{ +} + +bool DummyDataController::initResponse() +{ + return true; // Do nothing for dummmy +} + + +} // namespace SerialDV diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serialDV-1.1.2/dummydatacontroller.h new/serialDV-1.1.4/dummydatacontroller.h --- old/serialDV-1.1.2/dummydatacontroller.h 1970-01-01 01:00:00.000000000 +0100 +++ new/serialDV-1.1.4/dummydatacontroller.h 2019-10-22 22:08:06.000000000 +0200 @@ -0,0 +1,41 @@ +/////////////////////////////////////////////////////////////////////////////////// +// Copyright (C) 2019 Edouard Griffiths, F4EXB. // +// // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation as version 3 of the License, or // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License V3 for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program. If not, see <http://www.gnu.org/licenses/>. // +/////////////////////////////////////////////////////////////////////////////////// + +#ifndef DUMMYDATACONTROLLER_H_ +#define DUMMYDATACONTROLLER_H_ + +#include "datacontroller.h" + +namespace SerialDV +{ + +class SERIALDV_API DummyDataController : public DataController { +public: + DummyDataController(); + virtual ~DummyDataController(); + + virtual bool open(const std::string& device, SERIAL_SPEED speed); + + virtual bool initResponse(); + virtual int read(unsigned char* buffer, unsigned int lengthInBytes); + virtual int write(const unsigned char* buffer, unsigned int lengthInBytes); + + virtual void closeIt(); +}; + +} // namespace SerialDV + +#endif /* DUMMYDATACONTROLLER_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serialDV-1.1.2/dvcontroller.cpp new/serialDV-1.1.4/dvcontroller.cpp --- old/serialDV-1.1.2/dvcontroller.cpp 2019-09-02 00:54:27.000000000 +0200 +++ new/serialDV-1.1.4/dvcontroller.cpp 2019-10-22 22:08:06.000000000 +0200 @@ -21,8 +21,12 @@ #include <cstring> #include <stdint.h> +#ifdef __APPLE__ +#include "dummydatacontroller.h" +#else #include "udpdatacontroller.h" #include "serialdatacontroller.h" +#endif #include "dvcontroller.h" namespace SerialDV @@ -51,11 +55,15 @@ { m_open = false; +#ifdef __APPLE__ + m_serial = new DummyDataController(); +#else if (device.find(':') != std::string::npos) { m_serial = new UDPDataController(); } else { m_serial = new SerialDataController(); } +#endif bool res = m_serial->open(device, halfSpeed ? SERIAL_230400 : SERIAL_460800); @@ -65,8 +73,8 @@ m_serial->write(DV3000_REQ_PRODID, DV3000_REQ_PRODID_LEN); - unsigned char buffer[BUFFER_LENGTH]; - RESP_TYPE type = getResponse(buffer, BUFFER_LENGTH); + unsigned char buffer[DataController::BUFFER_LENGTH]; + RESP_TYPE type = getResponse(buffer, DataController::BUFFER_LENGTH); if (type == RESP_ERROR) { @@ -217,7 +225,7 @@ buffer[DV3000_REQ_GAIN_LEN+1] = dBGainOut; m_serial->write(buffer, DV3000_REQ_GAIN_LEN + 2); - RESP_TYPE type = getResponse(buffer, BUFFER_LENGTH); + RESP_TYPE type = getResponse(buffer, DataController::BUFFER_LENGTH); if (type == RESP_ERROR) { @@ -263,8 +271,8 @@ assert(ambe != 0); assert(length == m_currentNbMbeBytes); - unsigned char buffer[BUFFER_LENGTH]; - RESP_TYPE type = getResponse(buffer, BUFFER_LENGTH); + unsigned char buffer[DataController::BUFFER_LENGTH]; + RESP_TYPE type = getResponse(buffer, DataController::BUFFER_LENGTH); if (type != RESP_AMBE) { @@ -310,8 +318,8 @@ assert(audio != 0); assert(length == MBE_AUDIO_BLOCK_SIZE_INTERNAL); - unsigned char buffer[BUFFER_LENGTH]; - RESP_TYPE type = getResponse(buffer, BUFFER_LENGTH); + unsigned char buffer[DataController::BUFFER_LENGTH]; + RESP_TYPE type = getResponse(buffer, DataController::BUFFER_LENGTH); if (type != RESP_AUDIO) { @@ -377,8 +385,8 @@ m_serial->write(ratepStr, DV3000_REQ_RATEP_LEN); - unsigned char buffer[BUFFER_LENGTH]; - RESP_TYPE type = getResponse(buffer, BUFFER_LENGTH); + unsigned char buffer[DataController::BUFFER_LENGTH]; + RESP_TYPE type = getResponse(buffer, DataController::BUFFER_LENGTH); if (type == RESP_ERROR) { @@ -402,7 +410,7 @@ { (void) length; assert(buffer != 0); - assert(length >= BUFFER_LENGTH); + assert(length >= DataController::BUFFER_LENGTH); if (!m_serial->initResponse()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serialDV-1.1.2/serialdatacontroller.h new/serialDV-1.1.4/serialdatacontroller.h --- old/serialDV-1.1.2/serialdatacontroller.h 2019-09-02 00:54:27.000000000 +0200 +++ new/serialDV-1.1.4/serialdatacontroller.h 2019-10-22 22:08:06.000000000 +0200 @@ -25,13 +25,6 @@ namespace SerialDV { - -#ifdef __WINDOWS__ -const unsigned int BUFFER_LENGTH = 1000U; -#else -const unsigned int BUFFER_LENGTH = 400U; -#endif - class SERIALDV_API SerialDataController : public DataController { public: SerialDataController();
