diff --git a/DroidStar.pro b/DroidStar.pro
index ad9f893..15b3644 100644
--- a/DroidStar.pro
+++ b/DroidStar.pro
@@ -19,8 +19,12 @@ macx:QT += serialport
macx::INCLUDEPATH += /usr/local/include
macx:LIBS += -L/usr/local/lib -framework AVFoundation
macx:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
-macx:QMAKE_INFO_PLIST = Info.plist
-ios:LIBS += -framework AVFoundation
+macx:QMAKE_INFO_PLIST = Info.plist.mac
+ios:LIBS += -lvocoder -framework AVFoundation
+ios:QMAKE_TARGET_BUNDLE_PREFIX = com.dudetronics
+ios:QMAKE_BUNDLE = droidstar
+ios:VERSION = 0.43.20
+ios:QMAKE_ASSET_CATALOGS += Images.xcassets
ios:QMAKE_INFO_PLIST = Info.plist
VERSION_BUILD='$(shell cd $$PWD;git rev-parse --short HEAD)'
DEFINES += VERSION_NUMBER=\"\\\"$${VERSION_BUILD}\\\"\"
@@ -41,7 +45,6 @@ HEADERS += \
SHA256.h \
YSFConvolution.h \
YSFFICH.h \
- androidserialport.h \
audioengine.h \
cbptc19696.h \
cgolay2087.h \
@@ -58,12 +61,12 @@ HEADERS += \
nxdncodec.h \
p25codec.h \
refcodec.h \
- serialambe.h \
- serialmodem.h \
vocoder_plugin.h \
xrfcodec.h \
ysfcodec.h
+android:HEADERS += androidserialport.h
macx:HEADERS += micpermission.h
+!ios:HEADERS += serialambe.h serialmodem.h
SOURCES += \
CRCenc.cpp \
@@ -73,7 +76,6 @@ SOURCES += \
SHA256.cpp \
YSFConvolution.cpp \
YSFFICH.cpp \
- androidserialport.cpp \
audioengine.cpp \
cbptc19696.cpp \
cgolay2087.cpp \
@@ -90,10 +92,10 @@ SOURCES += \
nxdncodec.cpp \
p25codec.cpp \
refcodec.cpp \
- serialambe.cpp \
- serialmodem.cpp \
xrfcodec.cpp \
ysfcodec.cpp
+android:SOURCES += androidserialport.cpp
+!ios:SOURCES += serialambe.cpp serialmodem.cpp
!contains(DEFINES, USE_EXTERNAL_CODEC2){
HEADERS += \
codec2/codec2_api.h \
diff --git a/Images.xcassets/.DS_Store b/Images.xcassets/.DS_Store
new file mode 100755
index 0000000..c117109
Binary files /dev/null and b/Images.xcassets/.DS_Store differ
diff --git a/Images.xcassets/._.DS_Store b/Images.xcassets/._.DS_Store
new file mode 100755
index 0000000..2b80cc6
Binary files /dev/null and b/Images.xcassets/._.DS_Store differ
diff --git a/Images.xcassets/AppIcon.appiconset/1024.png b/Images.xcassets/AppIcon.appiconset/1024.png
new file mode 100755
index 0000000..e3b9faa
Binary files /dev/null and b/Images.xcassets/AppIcon.appiconset/1024.png differ
diff --git a/Images.xcassets/AppIcon.appiconset/120-1.png b/Images.xcassets/AppIcon.appiconset/120-1.png
new file mode 100755
index 0000000..c99d531
Binary files /dev/null and b/Images.xcassets/AppIcon.appiconset/120-1.png differ
diff --git a/Images.xcassets/AppIcon.appiconset/120.png b/Images.xcassets/AppIcon.appiconset/120.png
new file mode 100755
index 0000000..c99d531
Binary files /dev/null and b/Images.xcassets/AppIcon.appiconset/120.png differ
diff --git a/Images.xcassets/AppIcon.appiconset/152.png b/Images.xcassets/AppIcon.appiconset/152.png
new file mode 100755
index 0000000..870d6e2
Binary files /dev/null and b/Images.xcassets/AppIcon.appiconset/152.png differ
diff --git a/Images.xcassets/AppIcon.appiconset/167.png b/Images.xcassets/AppIcon.appiconset/167.png
new file mode 100755
index 0000000..6c023b3
Binary files /dev/null and b/Images.xcassets/AppIcon.appiconset/167.png differ
diff --git a/Images.xcassets/AppIcon.appiconset/180.png b/Images.xcassets/AppIcon.appiconset/180.png
new file mode 100755
index 0000000..246cdff
Binary files /dev/null and b/Images.xcassets/AppIcon.appiconset/180.png differ
diff --git a/Images.xcassets/AppIcon.appiconset/20.png b/Images.xcassets/AppIcon.appiconset/20.png
new file mode 100755
index 0000000..796624f
Binary files /dev/null and b/Images.xcassets/AppIcon.appiconset/20.png differ
diff --git a/Images.xcassets/AppIcon.appiconset/29.png b/Images.xcassets/AppIcon.appiconset/29.png
new file mode 100755
index 0000000..8ff4d44
Binary files /dev/null and b/Images.xcassets/AppIcon.appiconset/29.png differ
diff --git a/Images.xcassets/AppIcon.appiconset/40-1.png b/Images.xcassets/AppIcon.appiconset/40-1.png
new file mode 100755
index 0000000..dd43063
Binary files /dev/null and b/Images.xcassets/AppIcon.appiconset/40-1.png differ
diff --git a/Images.xcassets/AppIcon.appiconset/40-2.png b/Images.xcassets/AppIcon.appiconset/40-2.png
new file mode 100755
index 0000000..dd43063
Binary files /dev/null and b/Images.xcassets/AppIcon.appiconset/40-2.png differ
diff --git a/Images.xcassets/AppIcon.appiconset/40.png b/Images.xcassets/AppIcon.appiconset/40.png
new file mode 100755
index 0000000..dd43063
Binary files /dev/null and b/Images.xcassets/AppIcon.appiconset/40.png differ
diff --git a/Images.xcassets/AppIcon.appiconset/58-1.png b/Images.xcassets/AppIcon.appiconset/58-1.png
new file mode 100755
index 0000000..84987a6
Binary files /dev/null and b/Images.xcassets/AppIcon.appiconset/58-1.png differ
diff --git a/Images.xcassets/AppIcon.appiconset/58.png b/Images.xcassets/AppIcon.appiconset/58.png
new file mode 100755
index 0000000..84987a6
Binary files /dev/null and b/Images.xcassets/AppIcon.appiconset/58.png differ
diff --git a/Images.xcassets/AppIcon.appiconset/60.png b/Images.xcassets/AppIcon.appiconset/60.png
new file mode 100755
index 0000000..652a7fb
Binary files /dev/null and b/Images.xcassets/AppIcon.appiconset/60.png differ
diff --git a/Images.xcassets/AppIcon.appiconset/76.png b/Images.xcassets/AppIcon.appiconset/76.png
new file mode 100755
index 0000000..f7e1ba2
Binary files /dev/null and b/Images.xcassets/AppIcon.appiconset/76.png differ
diff --git a/Images.xcassets/AppIcon.appiconset/80-1.png b/Images.xcassets/AppIcon.appiconset/80-1.png
new file mode 100755
index 0000000..7bd7c17
Binary files /dev/null and b/Images.xcassets/AppIcon.appiconset/80-1.png differ
diff --git a/Images.xcassets/AppIcon.appiconset/80.png b/Images.xcassets/AppIcon.appiconset/80.png
new file mode 100755
index 0000000..7bd7c17
Binary files /dev/null and b/Images.xcassets/AppIcon.appiconset/80.png differ
diff --git a/Images.xcassets/AppIcon.appiconset/87.png b/Images.xcassets/AppIcon.appiconset/87.png
new file mode 100755
index 0000000..ccd0d33
Binary files /dev/null and b/Images.xcassets/AppIcon.appiconset/87.png differ
diff --git a/Images.xcassets/AppIcon.appiconset/Contents.json b/Images.xcassets/AppIcon.appiconset/Contents.json
new file mode 100755
index 0000000..e594077
--- /dev/null
+++ b/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,116 @@
+{
+ "images" : [
+ {
+ "filename" : "40.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "20x20"
+ },
+ {
+ "filename" : "60.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "20x20"
+ },
+ {
+ "filename" : "58.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "29x29"
+ },
+ {
+ "filename" : "87.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "29x29"
+ },
+ {
+ "filename" : "80.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "40x40"
+ },
+ {
+ "filename" : "120.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "40x40"
+ },
+ {
+ "filename" : "120-1.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "60x60"
+ },
+ {
+ "filename" : "180.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "60x60"
+ },
+ {
+ "filename" : "20.png",
+ "idiom" : "ipad",
+ "scale" : "1x",
+ "size" : "20x20"
+ },
+ {
+ "filename" : "40-1.png",
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "20x20"
+ },
+ {
+ "filename" : "29.png",
+ "idiom" : "ipad",
+ "scale" : "1x",
+ "size" : "29x29"
+ },
+ {
+ "filename" : "58-1.png",
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "29x29"
+ },
+ {
+ "filename" : "40-2.png",
+ "idiom" : "ipad",
+ "scale" : "1x",
+ "size" : "40x40"
+ },
+ {
+ "filename" : "80-1.png",
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "40x40"
+ },
+ {
+ "filename" : "76.png",
+ "idiom" : "ipad",
+ "scale" : "1x",
+ "size" : "76x76"
+ },
+ {
+ "filename" : "152.png",
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "76x76"
+ },
+ {
+ "filename" : "167.png",
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "83.5x83.5"
+ },
+ {
+ "filename" : "1024.png",
+ "idiom" : "ios-marketing",
+ "scale" : "1x",
+ "size" : "1024x1024"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/Info.plist b/Info.plist
index d21492b..5c798f2 100755
--- a/Info.plist
+++ b/Info.plist
@@ -2,23 +2,46 @@
- CFBundleExecutable
+ CFBundleDisplayName
DroidStar
- CFBundleIconFile
-
+ CFBundleExecutable
+ ${EXECUTABLE_NAME}
+ CFBundleIconName
+ AppIcon
+ CFBundleIcons
+
+ CFBundleIcons~ipad
+
CFBundleIdentifier
- com.dudetronics.droidstar
+ $(PRODUCT_BUNDLE_IDENTIFIER)
+ CFBundleName
+ ${PRODUCT_NAME}
CFBundlePackageType
APPL
+ CFBundleShortVersionString
+ $(QMAKE_SHORT_VERSION)
CFBundleSignature
- ????
- NSMicrophoneUsageDescription
- You know you want to...
+ ${QMAKE_PKGINFO_TYPEINFO}
+ CFBundleVersion
+ $(QMAKE_FULL_VERSION)
+ LSRequiresIPhoneOS
+
+ MinimumOSVersion
+ ${IPHONEOS_DEPLOYMENT_TARGET}
NOTE
This file was generated by Qt/QMake.
- NSPrincipalClass
- NSApplication
- NSSupportsAutomaticGraphicsSwitching
-
+ NSCameraUsageDescription
+ This app uses the microphone to transmit audio
+ NSMicrophoneUsageDescription
+ You know you want to...
+ UILaunchStoryboardName
+ LaunchScreen
+ UISupportedInterfaceOrientations
+
+ UIInterfaceOrientationPortrait
+ UIInterfaceOrientationPortraitUpsideDown
+ UIInterfaceOrientationLandscapeLeft
+ UIInterfaceOrientationLandscapeRight
+
diff --git a/Info.plist.mac b/Info.plist.mac
new file mode 100755
index 0000000..d21492b
--- /dev/null
+++ b/Info.plist.mac
@@ -0,0 +1,24 @@
+
+
+
+
+ CFBundleExecutable
+ DroidStar
+ CFBundleIconFile
+
+ CFBundleIdentifier
+ com.dudetronics.droidstar
+ CFBundlePackageType
+ APPL
+ CFBundleSignature
+ ????
+ NSMicrophoneUsageDescription
+ You know you want to...
+ NOTE
+ This file was generated by Qt/QMake.
+ NSPrincipalClass
+ NSApplication
+ NSSupportsAutomaticGraphicsSwitching
+
+
+
diff --git a/codec.cpp b/codec.cpp
index 8d6f10e..fa10494 100644
--- a/codec.cpp
+++ b/codec.cpp
@@ -246,6 +246,8 @@ bool Codec::load_vocoder_plugin()
#endif
#else
#if defined(Q_OS_IOS)
+ QString config_path = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/dudetronics";
+ QString voc = config_path + "/vocoder_plugin." + QSysInfo::productType() + "." + QSysInfo::currentCpuArchitecture();
if(QFileInfo::exists(voc)){
m_mbevocoder = new VocoderPlugin();
return true;
diff --git a/refcodec.cpp b/refcodec.cpp
index 2cf050e..aff8b8f 100755
--- a/refcodec.cpp
+++ b/refcodec.cpp
@@ -671,7 +671,9 @@ void REFCodec::process_rx_data()
for(int i = 0; i < s; ++i){
out.append(m_rxmodemq.dequeue());
}
+#if !defined(Q_OS_IOS)
m_modem->write(out);
+#endif
}
}