Version 2.4.3 (Client Only)

aramg · aramg · commit e873e48ec0b9 · 2026-01-07T12:32:42.000-08:00
Add 'Use WiFi IP' selection
diff --git a/data/edit.svg b/data/edit.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?><svg width="48px" height="48px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.2799 6.40005L11.7399 15.94C10.7899 16.89 7.96987 17.33 7.33987 16.7C6.70987 16.07 7.13987 13.25 8.08987 12.3L17.6399 2.75002C17.8754 2.49308 18.1605 2.28654 18.4781 2.14284C18.7956 1.99914 19.139 1.92124 19.4875 1.9139C19.8359 1.90657 20.1823 1.96991 20.5056 2.10012C20.8289 2.23033 21.1225 2.42473 21.3686 2.67153C21.6147 2.91833 21.8083 3.21243 21.9376 3.53609C22.0669 3.85976 22.1294 4.20626 22.1211 4.55471C22.1128 4.90316 22.0339 5.24635 21.8894 5.5635C21.7448 5.88065 21.5375 6.16524 21.2799 6.40005V6.40005Z" stroke="#fff" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11 4H6C4.93913 4 3.92178 4.42142 3.17163 5.17157C2.42149 5.92172 2 6.93913 2 8V18C2 19.0609 2.42149 20.0783 3.17163 20.8284C3.92178 21.5786 4.93913 22 6 22H17C19.21 22 20 20.2 20 18V13" stroke="#fff" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/data/loading.svg b/data/loading.svg
@@ -1,5 +1,5 @@
 <!-- By Sam Herbert (@sherb), for everyone. More @ http://goo.gl/7AJzbL -->
-<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+<svg width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
     <defs>
         <linearGradient x1="8.042%" y1="0%" x2="65.682%" y2="23.865%" id="a">
             <stop stop-color="#fff" stop-opacity="0" offset="0%"/>
diff --git a/data/locale/de-DE.ini b/data/locale/de-DE.ini
@@ -11,3 +11,5 @@ EnableAudio="Audio aktivieren"
 SyncAV="Audio/Video synchronisieren"
 BadResolution="Ungültige Auflösung."
 AllowHWAccel="AVC/H.264 Hardwarebeschleunigung erlauben"
+Yes="Ja"
+No="Nein"
diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini
@@ -21,3 +21,5 @@ ErrorRemove="Error removing source for replacement!\nRestart DroidCam Client."
 NoName="Device name empty"
 NoWifiIP="WiFi IP empty"
 EnableAudioHint="Check to enable audio capture from the phone.\nAudio quality and latency may vary.\nUsing DroidCam for video only is recommended."
+Yes="Yes"
+No="No"
diff --git a/data/locale/es-ES.ini b/data/locale/es-ES.ini
@@ -20,3 +20,4 @@ ErrorRemove="¡Error al eliminar la fuente para el reemplazo!\nReinicie el clien
 NoName="Nombre del dispositivo vacío"
 NoWifiIP="IP WiFi vacía"
 EnableAudioHint="Marque para habilitar la captura de audio desde el teléfono.\nLa calidad del audio y la latencia pueden variar.\nRecomienda utilizar DroidCam solo para vídeo."
+Yes="Sí"
diff --git a/data/locale/fr-FR.ini b/data/locale/fr-FR.ini
@@ -11,3 +11,5 @@ EnableAudio="Activer l'audio"
 SyncAV="Sync Audio/Vidéo"
 BadResolution="Valeurs de Résolution non-valides."
 AllowHWAccel="Autoriser l'accélération matérielle AVC/H.264"
+Yes="Oui"
+No="Non"
diff --git a/data/locale/hi-IN.ini b/data/locale/hi-IN.ini
@@ -20,3 +20,5 @@ ErrorRemove="प्रतिस्थापन के लिए स्रोत
 NoName="डिवाइस का नाम रिक्त"
 NoWifiIP="WiFi IP रिक्त"
 EnableAudioHint="फ़ोन से ऑडियो कैप्चर सक्षम करने के लिए जाँच करें.\nऑडियो की गुणवत्ता और विलंबता भिन्न हो सकती है.\nकेवल वीडियो के लिए DroidCam का उपयोग करने की अनुशंसा की जाती है."
+Yes="हां"
+No="नहीं"
diff --git a/data/locale/id-ID.ini b/data/locale/id-ID.ini
@@ -20,3 +20,5 @@ ErrorRemove="Terjadi kesalahan saat menghapus sumber yang akan diganti!\nMulai u
 NoName="Nama perangkat kosong"
 NoWifiIP="IP WiFi kosong"
 EnableAudioHint="Centang untuk mengaktifkan perekaman audio dari telepon.\nKualitas audio dan latensi dapat bervariasi.\nDisarankan menggunakan DroidCam hanya untuk video."
+Yes="Ya"
+No="Tidak"
diff --git a/data/locale/ja-JP.ini b/data/locale/ja-JP.ini
@@ -11,3 +11,5 @@ EnableAudio="Audioを有効化"
 SyncAV="ビデオと音声を同期"
 BadResolution="解像度の値が不正です。"
 AllowHWAccel="AVC/H.264のハードウェアアクセラレーションを有効化"
+Yes="はい"
+No="いいえ"
diff --git a/data/locale/nl-NL.ini b/data/locale/nl-NL.ini
@@ -11,3 +11,5 @@ EnableAudio="Audio inschakelen"
 SyncAV="Audio/Video synchroniseren"
 BadResolution="Resolutie Ongeldige."
 AllowHWAccel="AVC-/H.264-hardwareversnelling gebruiken"
+Yes="Ja"
+No="Nee"
diff --git a/data/locale/pl-PL.ini b/data/locale/pl-PL.ini
@@ -21,3 +21,5 @@ ErrorRemove="Błąd podczas usuwania źródła do wymiany!\nZrestartuj Klienta D
 NoName="Nazwa urządzenia pusta"
 NoWifiIP="WiFi IP jest puste"
 EnableAudioHint="Zaznacz, aby włączyć przechwytywanie dźwięku z telefonu.\nJakość dźwięku i opóźnienie mogą się różnić.\nZaleca się używanie DroidCam tylko do wideo."
+Yes="Tak"
+No="Nie"
diff --git a/data/locale/pt-BR.ini b/data/locale/pt-BR.ini
@@ -20,3 +20,5 @@ ErrorRemove="Erro ao remover a fonte para substituição!\nReinicie o cliente Dr
 NoName="Nome do dispositivo vazio"
 NoWifiIP="IP WiFi vazio"
 EnableAudioHint="Marque para habilitar a captura de áudio do telefone.\nA qualidade do áudio e a latência podem variar.\nÉ recomendado usar o DroidCam somente para vídeo."
+Yes="Sim"
+No="Não"
diff --git a/data/locale/ru-RU.ini b/data/locale/ru-RU.ini
@@ -11,3 +11,5 @@ EnableAudio="Включить аудио"
 SyncAV="Синхронизировать Видео/Аудио"
 AllowHWAccel="Разрешить аппаратное ускорение AVC/H.264"
 BadResolution="Разрешение Неверное."
+Yes="Да"
+No="Нет"
diff --git a/data/locale/zh-CN.ini b/data/locale/zh-CN.ini
@@ -20,3 +20,5 @@ ErrorRemove="删除旧源时出错！\n请重启 DroidCam 客户端。"
 NoName="设备名称为空"
 NoWifiIP="WiFi IP 地址为空"
 EnableAudioHint="勾选此项以启用从手机捕获音频。\n音频质量和延迟可能有所不同。\n建议仅使用 DroidCam 进行视频传输。"
+Yes="是"
+No="否"
diff --git a/data/smartphone.svg b/data/smartphone.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48"><path fill="#fff" d="M13 46q-1.2 0-2.1-.9-.9-.9-.9-2.1V5q0-1.2.9-2.1.9-.9 2.1-.9h22q1.2 0 2.1.9.9.9.9 2.1v38q0 1.2-.9 2.1-.9.9-2.1.9Zm0-7.5h22v-29H13Zm0 3V43h22v-1.5Zm0-35h22V5H13ZM13 5v1.5V5Zm0 38v-1.5V43Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="48px" width="48px"><path fill="#fff" d="M13 46q-1.2 0-2.1-.9-.9-.9-.9-2.1V5q0-1.2.9-2.1.9-.9 2.1-.9h22q1.2 0 2.1.9.9.9.9 2.1v38q0 1.2-.9 2.1-.9.9-2.1.9Zm0-7.5h22v-29H13Zm0 3V43h22v-1.5Zm0-35h22V5H13ZM13 5v1.5V5Zm0 38v-1.5V43Z"/></svg>
diff --git a/src/droidcam.rc b/src/droidcam.rc
@@ -1,5 +1,5 @@
 1 VERSIONINFO
-FILEVERSION 2,4,2,0
+FILEVERSION 2,4,3,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
diff --git a/src/plugin.h b/src/plugin.h
@@ -2,7 +2,7 @@
 #pragma once
 #include <obs-module.h>
 
-#define PLUGIN_VERSION_STR "242"
+#define PLUGIN_VERSION_STR "243"
 
 #define xlog(log_level, format, ...) \
         blog(log_level, "[DroidCamOBS] " format, ##__VA_ARGS__)
diff --git a/src/plugin_properties.h b/src/plugin_properties.h
@@ -59,9 +59,12 @@ static const char* Resolutions[] = {
     "1024x768",
     "1280x720",
     "1920x1080",
+    #if DROIDCAM_OVERRIDE
+    #else
     "1920x1440",
     "2560x1440",
     "3840x2160",
+    #endif
 };
 
 #define RESOLUTION_1080 3
diff --git a/src/source.cc b/src/source.cc
@@ -1343,7 +1343,9 @@ obs_properties_t *source_properties(void *data) {
         OBS_COMBO_FORMAT_STRING);
     for (size_t i = 0; i < ARRAY_LEN(Resolutions); i++) {
         obs_property_list_add_string(cp, Resolutions[i], Resolutions[i]);
+        #if DROIDCAM_OVERRIDE==0
         if (!uhd_unlock && i == RESOLUTION_1080) break;
+        #endif
     }
 
     obs_property_set_modified_callback2(cp, video_parms_changed, data);
diff --git a/src/ui/AddDevice.cpp b/src/ui/AddDevice.cpp
@@ -34,6 +34,8 @@ inline static void retainSize(QWidget *item) {
 }
 
 AddDevice::AddDevice(QWidget *parent) : QDialog(parent),
+    refresh_count(0),
+    enable_audio(false),
     loadingSvg(this),
     ui(new Ui_AddDeviceDC)
 {
@@ -55,6 +57,12 @@ AddDevice::AddDevice(QWidget *parent) : QDialog(parent),
         bfree(file);
     }
 
+    file = obs_module_file("edit.svg");
+    if (file) {
+        editIcon.addFile(file, QSize(96, 96));
+        bfree(file);
+    }
+
     ui->setupUi(this);
     Qt::WindowFlags flags = windowFlags();
     flags &= ~Qt::WindowContextHelpButtonHint;
@@ -68,8 +76,6 @@ AddDevice::AddDevice(QWidget *parent) : QDialog(parent),
     ui->refresh_button->setVisible(false);
     ui->horizontalLayout1->addWidget(&loadingSvg);
 
-    refresh_count = 0;
-    enable_audio = false;
     ui->enableAudio_checkBox->connect(ui->enableAudio_checkBox,
         &QCheckBox::stateChanged, [=] (int state) {
             enable_audio = state == Qt::Checked;
@@ -78,6 +84,10 @@ AddDevice::AddDevice(QWidget *parent) : QDialog(parent),
     ui->deviceList_widget->connect(ui->deviceList_widget,
         &QListWidget::itemSelectionChanged, [=]() {
             int active = ui->deviceList_widget->currentRow();
+            if (active == (ui->deviceList_widget->count()-1)
+                && !ui->addDevice_button->isVisible())
+                AddDeviceManually();
+
             ui->addDevice_button->setVisible(active >= 0);
         });
 
@@ -153,8 +163,10 @@ void AddDevice::AddDeviceManually() {
     QLineEdit nameInput(&dialog);
     QLineEdit wifiInput(&dialog);
 
-    QString label0 = QString(obs_module_text("Device"));
+    QString label0 = QString(TEXT_DEVICE);
     form.addWidget(new QLabel(label0));
+    nameInput.setText(label0);
+    nameInput.selectAll();
     form.addWidget(&nameInput);
 
     form.addWidget(new QLabel("WiFi IP"));
@@ -179,7 +191,6 @@ void AddDevice::AddDeviceManually() {
 
     dialog.setWindowTitle(QString(obs_module_text("AddADevice")));
     if (dialog.exec() != QDialog::Accepted) {
-        refresh_count --;
         return;
     }
 
@@ -212,7 +223,6 @@ void AddDevice::AddDeviceManually() {
     QListWidgetItem item(phoneIcon, nameInput.text());
     item.setData(Qt::UserRole, QVariant::fromValue((void*)info));
     AddNewDevice(&item);
-
     bfree(info);
     enable_audio = ui->enableAudio_checkBox->checkState() == Qt::Checked;
 }
@@ -221,7 +231,9 @@ void AddDevice::AddListEntry(const char *name, void* data) {
     if (!isVisible())
         return;
 
-    QListWidgetItem *item = new QListWidgetItem(phoneIcon, name, ui->deviceList_widget);
+    QIcon& icon = (strcmp(name, TEXT_USE_WIFI) == 0)
+        ? editIcon : phoneIcon;
+    QListWidgetItem *item = new QListWidgetItem(icon, name, ui->deviceList_widget);
     item->setData(Qt::UserRole, QVariant::fromValue(data));
     QFont font = item->font();
     font.setPointSize(14);
@@ -239,6 +251,7 @@ void AddDevice::ClearList() {
 
 void AddDevice::ReloadList() {
     if (refresh_count > 2) {
+        refresh_count = 2;
         AddDeviceManually();
         return;
     }
@@ -275,19 +288,15 @@ void ReloadThread::run() {
         for (size_t i = 0; i < obs_property_list_item_count(list); i++) {
             const char *name = obs_property_list_item_name(list, i);
             const char *value = obs_property_list_item_string(list, i);
-            if (!(name && value))
-                continue;
-
-            if (strncmp(value, opt_use_wifi, strlen(opt_use_wifi)) == 0)
-                continue;
-
-            auto info = (DeviceInfo *) bzalloc(sizeof(DeviceInfo));
-            info->id = value;
-            info->port = DEFAULT_PORT;
-            info->ip = "";
-            resolve_device_type(info, parent->dummy_source_context);
-            if (info->type != DeviceType::NONE && parent->isVisible())
+
+            if (name && value && parent->isVisible()) {
+                auto info = (DeviceInfo *) bzalloc(sizeof(DeviceInfo));
+                info->id = value;
+                info->port = DEFAULT_PORT;
+                info->ip = "";
+                resolve_device_type(info, parent->dummy_source_context);
                 emit AddListEntry(name, info);
+            }
         }
     }
 }
@@ -336,6 +345,11 @@ void AddDevice::AddNewDevice(QListWidgetItem *item) {
     const char* device_name = text.constData();
     ilog("want to add: %s", device_name);
 
+    if (strcmp(device_name, TEXT_USE_WIFI) == 0) {
+        AddDeviceManually();
+        return;
+    }
+
     obs_enum_sources([](void *data, obs_source_t *source) -> bool {
         const char *sid = obs_source_get_id(source);
         const char *name = obs_source_get_name(source);
@@ -386,6 +400,8 @@ void AddDevice::AddNewDevice(QListWidgetItem *item) {
         QString msg = QString(obs_module_text("AlreadyExist")).arg(device_name);
         QMessageBox mb(QMessageBox::Information, title, msg,
             QMessageBox::StandardButtons(QMessageBox::Yes | QMessageBox::No), this);
+        mb.setButtonText(QMessageBox::Yes, QString(obs_module_text("Yes")));
+        mb.setButtonText(QMessageBox::No, QString(obs_module_text("No")));
         mb.setDefaultButton(QMessageBox::No);
 
         if (mb.exec() != QMessageBox::Yes)
@@ -411,6 +427,9 @@ void AddDevice::AddNewDevice(QListWidgetItem *item) {
 }
 
 void AddDevice::AddSourceInternal(DeviceInfo* device_info, const char* device_name) {
+    if (device_info->type == DeviceType::NONE)
+        return;
+
     char resolution[16];
     obs_video_info ovi;
     obs_data_t *settings = obs_data_create();
diff --git a/src/ui/AddDevice.h b/src/ui/AddDevice.h
@@ -29,6 +29,7 @@ public slots:
 public:
     QSvgWidget loadingSvg;
     QIcon phoneIcon;
+    QIcon editIcon;
     void *dummy_droidcam_source;
     void *dummy_source_context;
     void *dummy_properties;
