Version 2.1.0

Author: aramg

Makefile

@@ -35,16 +35,16 @@ package:
 	@echo "usage: RELEASE=2. make package"
 
 else
-JPEG    =
+JPEG    = -I/opt/libjpeg-turbo/include
+USBMUXD = -I/opt/libimobiledevice/include
 LIBAV   = -L/opt/ffmpeg4/lib -lswscale -lavutil
-USBMUXD =
 
 SRC += /opt/libimobiledevice/lib/libusbmuxd.a
 SRC += /opt/libimobiledevice/lib/libplist-2.0.a
 SRC += /opt/libjpeg-turbo/lib64/libturbojpeg.a
 
 .PHONY: package
-package: clean all
+package: all
 	zip "droidcam_$(RELEASE).zip" \
 		LICENSE README* icon2.png  \
 		droidcam* install* uninstall* \

src/common.h

@@ -9,8 +9,8 @@
 #ifndef _COMMON_H_
 #define _COMMON_H_
 
-#define APP_VER_INT 200
-#define APP_VER_STR "2.0.0"
+#define APP_VER_INT 210
+#define APP_VER_STR "2.1.0"
 
 #define MSG_ERROR(str)     ShowError("Error",str)
 #define MSG_LASTERROR(str) ShowError(str,strerror(errno))
@@ -33,8 +33,11 @@ void ShowError(const char*, const char*);
 #define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0]))
 
 #define errprint(...) fprintf(stderr, __VA_ARGS__)
-#define voidprint(...) /* */
-#define dbgprint      voidprint
+#ifdef DEBUG
+#define dbgprint      errprint
+#else
+#define dbgprint(...) /* */
+#endif
 
 #define VIDEO_INBUF_SZ 4096
 #define AUDIO_INBUF_SZ 32

src/droidcam.c

@@ -420,10 +420,6 @@ static void parse_args(int argc, char *argv[]) {
 	exit(1);
 }
 
-// TODO: this is broken on Debian
-// Seems AppIndicator's deprecated and there is no real alternatives
-// Example discussion: https://github.com/dino/dino/issues/98
-#if 1
 static void add_indicator(GtkWidget *window) {
 	AppIndicator *indicator = app_indicator_new("droidcam", APP_ICON_FILE, APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
 	GtkWidget *menu = gtk_menu_new();
@@ -448,7 +444,6 @@ static void add_indicator(GtkWidget *window) {
 	g_signal_connect(G_OBJECT(show_menu_item), "activate", G_CALLBACK(show_window), window);
 	g_signal_connect(G_OBJECT(exit_menu_item), "activate", G_CALLBACK(exit_window), window);
 }
-#endif
 
 int main(int argc, char *argv[])
 {