Skip to content

Commit 06128ee

Browse files
committed
1.2.4: strip and fix warrning
1 parent 9a42fe5 commit 06128ee

9 files changed

Lines changed: 24 additions & 78 deletions

File tree

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
`ORG.SLM:`
2+
![GitHub release (latest by date)](https://img.shields.io/github/v/release/Sound-Linux-More/qcodec2)
3+
![GitHub Release Date](https://img.shields.io/github/release-date/Sound-Linux-More/qcodec2)
4+
![GitHub repo size](https://img.shields.io/github/repo-size/Sound-Linux-More/qcodec2)
5+
![GitHub all releases](https://img.shields.io/github/downloads/Sound-Linux-More/qcodec2/total)
6+
![GitHub](https://img.shields.io/github/license/Sound-Linux-More/qcodec2)
7+
18
# qcodec2
29
qcodec2 is Qt wrappers for codec2 speech codec. You can find more information about codec2 here:
310
http://www.rowetel.com/?page_id=452
@@ -109,4 +116,4 @@ At the end do not forget flush buffers and close file.
109116
You can build documentation using Doxygen which can be found at:
110117
http://www.stack.nl/~dimitri/doxygen
111118

112-
using Doxyfile in main folder
119+
using Doxyfile in main folder

qcodec2_gui.pro

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ INCLUDEPATH *= \
1818
$$PWD/src/qcodec2
1919

2020
SOURCES *= \
21-
$$PWD/src/qcodec2_gui_main.cpp\
22-
$$PWD/src/gui/mainwindow.cpp
21+
$$PWD/src/gui/mainwindow.cpp \
22+
$$PWD/src/qcodec2_gui_main.cpp
2323

2424
HEADERS *= \
2525
$$PWD/src/gui/mainwindow.h
@@ -43,3 +43,8 @@ win32 {
4343

4444
include($$PWD/src/qcodec2/qcodec2.pri)
4545

46+
UI_DIR = build
47+
MOC_DIR = build
48+
RCC_DIR = build
49+
OBJECTS_DIR = build
50+
mytarget.commands += $${QMAKE_MKDIR} build

res/qcodec2_gui.qrc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<RCC>
22
<qresource prefix="/icons">
33
<file alias="MainIcon">1483071548_microphone-70px.png</file>
4-
<file alias="Refresh">1483071979_refresh.png</file>
5-
<file alias="Close">1483071984_cross.png</file>
6-
<file alias="SpecifyFile">1483071988_folder.png</file>
4+
<file alias="Refresh">1483071979_refresh.png</file>
5+
<file alias="Close">1483071984_cross.png</file>
6+
<file alias="SpecifyFile">1483071988_folder.png</file>
77
</qresource>
88
</RCC>

src/gui/mainwindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void MainWindow::init()
109109
on_actionRefresh_triggered();
110110

111111
this->setWindowTitle(tr("QCodec2 GUI"));
112-
this->setWindowIcon(QIcon(QLatin1Literal(":/MainIcon")));
112+
this->setWindowIcon(QIcon(QLatin1Literal(":/icons/MainIcon")));
113113

114114

115115
initializeStatusBar();

src/include/codec2.h

Lines changed: 0 additions & 67 deletions
This file was deleted.

src/qcodec2/qcodec2decoder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ qint64 QCodec2Decoder::readData(char *data, qint64 maxSize)
3030
int buffPtrIndex=0;
3131

3232
//(len/2) rather than (len) allows smaller sound card buffer
33-
while((buffPtrIndex+sizeof(short)*m_SamplesPerFrame)<(maxSize/2))
33+
while((qint64)(buffPtrIndex+sizeof(short)*m_SamplesPerFrame) < (maxSize/2))
3434
{
3535
qint64 bytesread=m_ExternalDevice->read((char*)m_CodecsBitsBuffer, m_BytesPerFrame);
3636

src/qcodec2/qcodec2encoder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class QCodec2Encoder : public QCodec2BaseClass
2727
public slots:
2828

2929
//! must be called before encoding started
30-
bool start(const QIODevice::OpenMode additionalFlags = 0);
30+
bool start(const QIODevice::OpenMode additionalFlags = QFlag(0));
3131

3232
//! must be called when no more encoding needed
3333
void stop();

src/qcodec2/qcodec2wrappersbase.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77

88
#include <QtMultimedia/QAudioFormat>
99

10+
#include <codec2/codec2.h>
11+
1012
#include "qcodec2shared.h"
11-
#include "codec2.h"
1213

1314
class QCodec2BaseClass : public QIODevice, public QLastErrorHolder
1415
{

src/qcodec2_gui_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ void initializeSettings()
66
QCoreApplication::setOrganizationDomain(QLatin1String("www.danish.com.ua"));
77
QCoreApplication::setOrganizationName(QLatin1String("qcodec2_gui"));
88
QCoreApplication::setApplicationName(QLatin1String("qcodec2_gui"));
9-
QCoreApplication::setApplicationVersion(QLatin1String("1.2.3.0"));
9+
QCoreApplication::setApplicationVersion(QLatin1String("1.2.4.0"));
1010
}
1111

1212
int main(int argc, char *argv[])

0 commit comments

Comments
 (0)