- Implement youtube-dl settings

Adrian · Adrian · commit 904f0f428174 · 2020-01-19T17:30:28.000+01:00
- Fix langs encoding
diff --git a/AIMPYouTube.cpp b/AIMPYouTube.cpp
@@ -13,6 +13,7 @@
 #include "PlayerHook.h"
 #include "FileSystem.h"
 #include "ArtworkProvider.h"
+#include "YouTubeDL.h"
 #include <set>
 #include <ctime>
 
@@ -146,6 +147,10 @@ HRESULT WINAPI Plugin::Initialize(IAIMPCore *Core) {
     StartMonitorTimer();
     UpdatePlaylistMenu();
 
+    YouTubeDL::Params  = Config::GetString(L"YouTubeDLParams", YouTubeDL::Params);
+    YouTubeDL::Timeout = Config::GetInt32(L"YouTubeDLTimeout", YouTubeDL::Timeout);
+    YouTubeDL::Force   = Config::GetInt32(L"YouTubeDLAlways", 0);
+
     return S_OK;
 }
 
diff --git a/AIMPYouTube.rc b/AIMPYouTube.rc
@@ -52,10 +52,10 @@ FONT 8, "Tahoma", 400, 0, 0
 {
     GROUPBOX        "YouTube", IDC_MAINFRAME, 0, 0, 309, 258, 0, WS_EX_LEFT
     GROUPBOX        "YouTube account", IDC_AUTHGROUPBOX, 7, 19, 300, 80, 0, WS_EX_LEFT
-    CONTROL         "", IDC_USERNAME, "Static", NOT WS_GROUP | SS_LEFTNOWORDWRAP, 85, 29, 200, 17, WS_EX_LEFT
-    CONTROL         "", IDC_USERINFO, "Static", NOT WS_GROUP | SS_LEFTNOWORDWRAP, 85, 46, 200, 50, WS_EX_LEFT
+    CONTROL         "", IDC_USERNAME, WC_STATIC, NOT WS_GROUP | SS_LEFTNOWORDWRAP, 85, 29, 200, 17, WS_EX_LEFT
+    CONTROL         "", IDC_USERINFO, WC_STATIC, NOT WS_GROUP | SS_LEFTNOWORDWRAP, 85, 46, 200, 50, WS_EX_LEFT
     PUSHBUTTON      "", IDC_CONNECTBTN, 230, 76, 70, 18, BS_BITMAP, WS_EX_LEFT | WS_TABSTOP
-    CONTROL         "", IDC_AVATAR, "Static", SS_BITMAP | SS_REALSIZEIMAGE, 14, 31, 100, 100, WS_EX_LEFT
+    CONTROL         "", IDC_AVATAR, WC_STATIC, SS_BITMAP | SS_REALSIZEIMAGE, 14, 31, 100, 100, WS_EX_LEFT
     GROUPBOX        "Monitor added URLs", IDC_MONITORGROUPBOX, 7, 105, 300, 61, 0, WS_EX_LEFT
     AUTOCHECKBOX    "Check for new tracks on AIMP startup", IDC_CHECKONSTARTUP, 15, 134, 250, 8, 0, WS_EX_LEFT | WS_TABSTOP
     AUTOCHECKBOX    "Check for new tracks every", IDC_CHECKEVERY, 15, 149, 104, 8, 0, WS_EX_LEFT | WS_TABSTOP
@@ -64,7 +64,16 @@ FONT 8, "Tahoma", 400, 0, 0
     LTEXT           "hours", IDC_HOURS, 162, 149, 100, 8, SS_LEFT, WS_EX_LEFT
     AUTOCHECKBOX    "Monitor user's playlists", IDC_MONITORPLAYLISTS, 15, 119, 250, 8, 0, WS_EX_LEFT | WS_TABSTOP
     LTEXT           "Manage track exclusions", IDC_MANAGEEXCLUSIONS, 20, 244, 285, 8, SS_LEFT | SS_NOTIFY, WS_EX_LEFT
-    LTEXT           "aimp_YouTube v1.1", IDC_VERSION, 30, 244, 285, 8, SS_LEFT | SS_NOTIFY, WS_EX_LEFT
+    GROUPBOX        "youtube-dl", IDC_YTDLGROUPBOX, 7, 170, 300, 64, 0, WS_EX_LEFT
+    PUSHBUTTON      "Update", IDC_YTDLUPDATE, 254, 216, 50, 14, BS_BITMAP, WS_EX_LEFT | WS_TABSTOP
+    LTEXT           "Parameters", IDC_YTDLPARAMSTEXT, 16, 198, 38, 9, SS_LEFT, WS_EX_LEFT
+    LTEXT           "Timeout", IDC_YTDLTIMEOUTTEXT, 16, 215, 26, 9, SS_LEFT, WS_EX_LEFT
+    LTEXT           "seconds", IDC_SECONDS, 101, 215, 99, 9, SS_LEFT
+    EDITTEXT        IDC_YTDLTIMEOUT, 58, 212, 30, 14, ES_AUTOHSCROLL | ES_NUMBER, WS_EX_LEFT | WS_TABSTOP
+    CONTROL         "", IDC_YTDLTIMEOUTSPIN, UPDOWN_CLASS, UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_HOTTRACK | UDS_SETBUDDYINT, 87, 212, 11, 15, WS_EX_LEFT | WS_TABSTOP
+    AUTOCHECKBOX    "Always use youtube-dl", IDC_YTDLFORCE, 15, 183, 250, 8, 0, WS_EX_LEFT | WS_TABSTOP
+    EDITTEXT        IDC_YTDLPARAMS, 58, 195, 137, 14, ES_AUTOHSCROLL, WS_EX_LEFT
+    LTEXT           "aimp_YouTube v1.3", IDC_VERSION, 30, 244, 285, 8, SS_LEFT | SS_NOTIFY, WS_EX_LEFT
 }
 
 
@@ -75,7 +84,7 @@ CAPTION "Dialog"
 FONT 8, "Ms Shell Dlg"
 {
     GROUPBOX        "Exclusions", IDC_EXCLUSIONSGROUPBOX, 5, 5, 362, 273, 0, WS_EX_LEFT
-        CONTROL         "", IDC_LISTVIEW, WC_LISTVIEW, WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_REPORT | LVS_AUTOARRANGE, 12, 17, 349, 255, WS_EX_LEFT
-        DEFPUSHBUTTON   "OK", IDOK, 320, 284, 50, 14, 0, WS_EX_LEFT
+    CONTROL         "", IDC_LISTVIEW, WC_LISTVIEW, WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_REPORT | LVS_AUTOARRANGE, 12, 17, 349, 255, WS_EX_LEFT
+    DEFPUSHBUTTON   "OK", IDOK, 320, 284, 50, 14, 0, WS_EX_LEFT
 }
 
diff --git a/AIMPYouTube.vcxproj b/AIMPYouTube.vcxproj
@@ -27,7 +27,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/ExclusionsDialog.cpp b/ExclusionsDialog.cpp
@@ -18,7 +18,7 @@ HRESULT SetExplorerTheme(HWND hwnd) {
         if (!setWindowTheme)
             setWindowTheme = (SetWindowThemeFuncPtr)GetProcAddress(DLL, "SetWindowTheme");
 
-        if (setWindowTheme) 
+        if (setWindowTheme)
             return setWindowTheme(hwnd, L"Explorer", NULL);
     }
     return E_FAIL;
@@ -121,7 +121,7 @@ BOOL CALLBACK ExclusionsDialog::DlgProc(HWND hwnd, UINT Msg, WPARAM wParam, LPAR
             SetWindowText (hwnd,                         Plugin::instance()->Lang(L"YouTube.Exclusions\\Title").c_str());
             SetDlgItemText(hwnd, IDOK,                   Plugin::instance()->Lang(L"YouTube.Exclusions\\OK").c_str());
             SetDlgItemText(hwnd, IDC_EXCLUSIONSGROUPBOX, Plugin::instance()->Lang(L"YouTube.Exclusions\\Header").c_str());
-            
+
             auto lv = GetDlgItem(hwnd, IDC_LISTVIEW);
 
             SetWindowSubclass(GetDlgItem(hwnd, IDC_EXCLUSIONSGROUPBOX), OptionsDialog::GroupBoxProc, 0, 0); SendDlgItemMessage(hwnd, IDC_EXCLUSIONSGROUPBOX, WM_SUBCLASSINIT, 0, 0);
@@ -210,11 +210,10 @@ LRESULT CALLBACK ExclusionsDialog::ListViewProc(HWND hWnd, UINT uMsg, WPARAM wPa
                         Config::SaveExtendedConfig();
                     }
                 } break;
-            }
-            break;
+            } break;
         case WM_NCDESTROY:
             RemoveWindowSubclass(hWnd, ListViewProc, uIdSubclass);
-            break;
+        break;
     }
     return DefSubclassProc(hWnd, uMsg, wParam, lParam);
-}
+}
diff --git a/Langs/belarusian_official.lng b/Langs/belarusian_official.lng
@@ -37,6 +37,10 @@ MonitorURLs=Маніторынг дададзеных URL-адрасоў
 MonitorUserPlaylists=Маніторынг плэйлістоў карыстальніка
 CheckAtStartup=Праверка новых трэкаў пры запуску AIMP
 CheckEvery=Праверка новых трэкаў| (Перыяд у гадзінах)
+YoutubeDLTimeout=Timeout|seconds
+YoutubeDLAlways=Always use youtube-dl
+YoutubeDLUpdate=Update
+YoutubeDLParameters=Parameters
 
 [YouTube.Playlists]
 Favorites=Абранае
diff --git a/Langs/czech.lng b/Langs/czech.lng
@@ -37,6 +37,10 @@ MonitorURLs=Hlídat přidané URL adresy
 MonitorUserPlaylists=Hlídat uživatelovy playlisty
 CheckAtStartup=Kontrolovat nové skladby při spuštění přehrávače AIMP
 CheckEvery=Kontrolovat nové skladby každých|hodin
+YoutubeDLTimeout=Timeout|seconds
+YoutubeDLAlways=Always use youtube-dl
+YoutubeDLUpdate=Update
+YoutubeDLParameters=Parameters
 
 [YouTube.Playlists]
 Favorites=Oblíbené
diff --git a/Langs/dutch.lng b/Langs/dutch.lng
@@ -39,6 +39,10 @@ General=Algemeen
 MonitorURLs=Toegevoegde URL's controleren
 MonitorUserPlaylists=Afspeellijst van gebruiker controleren
 Title=YouTube
+YoutubeDLTimeout=Timeout|seconds
+YoutubeDLAlways=Always use youtube-dl
+YoutubeDLUpdate=Update
+YoutubeDLParameters=Parameters
 
 [YouTube.Playlists]
 Favorites=Favorieten
diff --git a/Langs/eesti.lng b/Langs/eesti.lng
@@ -37,6 +37,10 @@ MonitorURLs=Jälgi lisatud linke
 MonitorUserPlaylists=Jägi kasutaja esitusloendit
 CheckAtStartup=Kontrolli uuemate lugude olemasolu AIMPi käivitamisel
 CheckEvery=Kontrolli uuemate lugude olemasolu iga|tunni järel
+YoutubeDLTimeout=Timeout|seconds
+YoutubeDLAlways=Always use youtube-dl
+YoutubeDLUpdate=Update
+YoutubeDLParameters=Parameters
 
 [YouTube.Playlists]
 Favorites=Lemmikud
diff --git a/Langs/english.lng b/Langs/english.lng
@@ -37,6 +37,10 @@ MonitorURLs=Monitor added URLs
 MonitorUserPlaylists=Monitor user's playlists
 CheckAtStartup=Check for new tracks on AIMP startup
 CheckEvery=Check for new tracks every|hours
+YoutubeDLTimeout=Timeout|seconds
+YoutubeDLAlways=Always use youtube-dl
+YoutubeDLUpdate=Update
+YoutubeDLParameters=Parameters
 
 [YouTube.Playlists]
 Favorites=Favorites
diff --git a/Langs/espanol-AR.lng b/Langs/espanol-AR.lng
@@ -37,6 +37,10 @@ MonitorURLs=Monitorear direcciones web agregadas
 MonitorUserPlaylists=Monitorear listas de reproducción del usuario
 CheckAtStartup=Buscar nuevos temas al iniciar AIMP
 CheckEvery=Buscar nuevos temas cada|horas
+YoutubeDLTimeout=Timeout|seconds
+YoutubeDLAlways=Always use youtube-dl
+YoutubeDLUpdate=Update
+YoutubeDLParameters=Parameters
 
 [YouTube.Playlists]
 Favorites=Favoritos
diff --git a/Langs/german.lng b/Langs/german.lng
@@ -37,6 +37,10 @@ MonitorURLs=Überwache die URLs
 MonitorUserPlaylists=Überwache die eigenen Playlists
 CheckAtStartup=Überprüfe auf neue Titel beim Programmstart
 CheckEvery=Prüfe auf neue Titel jede|Stunde
+YoutubeDLTimeout=Timeout|seconds
+YoutubeDLAlways=Always use youtube-dl
+YoutubeDLUpdate=Update
+YoutubeDLParameters=Parameters
 
 [YouTube.Playlists]
 Favorites=Favoriten
diff --git a/Langs/hungarian.lng b/Langs/hungarian.lng
@@ -37,6 +37,10 @@ MonitorURLs=Hozzáadott URL-ek figyelése
 MonitorUserPlaylists=Felhasználó listáinak figyelése
 CheckAtStartup=Új számok keresése AIMP indításakor
 CheckEvery=Új számok keresése|óránként
+YoutubeDLTimeout=Timeout|seconds
+YoutubeDLAlways=Always use youtube-dl
+YoutubeDLUpdate=Update
+YoutubeDLParameters=Parameters
 
 [YouTube.Playlists]
 Favorites=Kedvencek
diff --git a/Langs/italian.lng b/Langs/italian.lng
@@ -37,6 +37,10 @@ MonitorURLs=Monitor URL aggiunti
 MonitorUserPlaylists=Monitor playlist utente
 CheckAtStartup=Controlla nuove tracce all'avvio di AIMP
 CheckEvery=Controlla nuove tracce ogni|ore
+YoutubeDLTimeout=Timeout|seconds
+YoutubeDLAlways=Always use youtube-dl
+YoutubeDLUpdate=Update
+YoutubeDLParameters=Parameters
 
 [YouTube.Playlists]
 Favorites=Favoriti
diff --git a/Langs/korean.lng b/Langs/korean.lng
@@ -37,6 +37,10 @@ MonitorURLs=추가된 URL 모니터링
 MonitorUserPlaylists=사용자의 재생 목록 모니터링
 CheckAtStartup=AIMP 시작시 새 트랙 확인
 CheckEvery=매번 새로운 트랙 확인|시간
+YoutubeDLTimeout=Timeout|seconds
+YoutubeDLAlways=Always use youtube-dl
+YoutubeDLUpdate=Update
+YoutubeDLParameters=Parameters
 
 [YouTube.Playlists]
 Favorites=즐겨찾기
diff --git a/Langs/lithuanian.lng b/Langs/lithuanian.lng
@@ -37,6 +37,10 @@ MonitorURLs=Rodyti pridėtus URLs
 MonitorUserPlaylists=Rodyti vartotojo grojaraščius
 CheckAtStartup=Patikrinti naujus įrašys paleidžiant AIMP
 CheckEvery=Patikrinti naujus įrašus kas|valandas
+YoutubeDLTimeout=Timeout|seconds
+YoutubeDLAlways=Always use youtube-dl
+YoutubeDLUpdate=Update
+YoutubeDLParameters=Parameters
 
 [YouTube.Playlists]
 Favorites=Mėgstamiausi
diff --git a/Langs/polish.lng b/Langs/polish.lng
@@ -37,6 +37,10 @@ MonitorURLs=Monitoruj dodane adresy
 MonitorUserPlaylists=Monitoruj playlisty użytkownika
 CheckAtStartup=Sprawdzaj czy są nowe utwory przy starcie AIMPa
 CheckEvery=Sprawdzaj nowe utwory co|godzin
+YoutubeDLTimeout=Timeout|sekund
+YoutubeDLAlways=Zawsze używaj youtube-dl
+YoutubeDLUpdate=Aktualizuj
+YoutubeDLParameters=Parametry
 
 [YouTube.Playlists]
 Favorites=Ulubione
diff --git a/Langs/romanian.lng b/Langs/romanian.lng
@@ -1,4 +1,4 @@
-[FILE]
+﻿[FILE]
 Author=Andronachi Marian
 Name=Română (RO)
 VersionID=0
@@ -37,6 +37,10 @@ MonitorURLs=Monitorizează adresele url adăugate
 MonitorUserPlaylists=Monitorizează lista de redare ale utilizatorilor.
 CheckAtStartup=Verifică daca sunt melodii noi când pornește AIMP.
 CheckEvery=Verifică daca sunt melodii noi la fiecare|(de) ore.
+YoutubeDLTimeout=Timeout|seconds
+YoutubeDLAlways=Always use youtube-dl
+YoutubeDLUpdate=Update
+YoutubeDLParameters=Parameters
 
 [YouTube.Playlists]
 Favorites=Favorite
diff --git a/Langs/russian.lng b/Langs/russian.lng
@@ -37,6 +37,10 @@ MonitorURLs=Мониторинг добавленных URL-адресов
 MonitorUserPlaylists=Мониторинг плейлистов пользователя
 CheckAtStartup=Проверка новых треков при запуске AIMP
 CheckEvery=Проверка новых треков| (Период в часах)
+YoutubeDLTimeout=Timeout|seconds
+YoutubeDLAlways=Always use youtube-dl
+YoutubeDLUpdate=Update
+YoutubeDLParameters=Parameters
 
 [YouTube.Playlists]
 Favorites=Избранное
diff --git a/Langs/slovak.lng b/Langs/slovak.lng
@@ -37,6 +37,10 @@ MonitorURLs=Kontrolovať pridané URL adresy
 MonitorUserPlaylists=Kontrolovať playlisty používateľa
 CheckAtStartup=Kontrolovať nové skladby pri spustení prehrávača AIMP
 CheckEvery=Kontrolovať nové skladby každých |hodín
+YoutubeDLTimeout=Timeout|seconds
+YoutubeDLAlways=Always use youtube-dl
+YoutubeDLUpdate=Update
+YoutubeDLParameters=Parameters
 
 [YouTube.Playlists]
 Favorites=Obľúbené
diff --git a/Langs/turkish.lng b/Langs/turkish.lng
@@ -1,4 +1,4 @@
-[FILE]
+﻿[FILE]
 Author=Bilâl AFŞAR
 Name=Türkçe (TR)
 VersionID=0
@@ -37,6 +37,10 @@ MonitorURLs=Takip edilen adresler
 MonitorUserPlaylists=Takip edilen kullanıcı müzik listeleri
 CheckAtStartup=AIMP başladığında yeni parça kontrolü yap
 CheckEvery=Yeni parça kontrolünü her|saatte yap
+YoutubeDLTimeout=Timeout|seconds
+YoutubeDLAlways=Always use youtube-dl
+YoutubeDLUpdate=Update
+YoutubeDLParameters=Parameters
 
 [YouTube.Playlists]
 Favorites=Beğenilenler
diff --git a/Langs/ukrainian.lng b/Langs/ukrainian.lng
@@ -37,6 +37,10 @@ MonitorURLs=Моніторинг доданих посилань
 MonitorUserPlaylists=Моніторинг списиків відтворення користувача
 CheckAtStartup=Перевіряти наявність нових треків при запуску AIMP
 CheckEvery=Перевіряти наявність нових треків кожні|годин
+YoutubeDLTimeout=Timeout|seconds
+YoutubeDLAlways=Always use youtube-dl
+YoutubeDLUpdate=Update
+YoutubeDLParameters=Parameters
 
 [YouTube.Playlists]
 Favorites=Улюблене
diff --git a/OptionsDialog.cpp b/OptionsDialog.cpp
diff --git a/Tools.cpp b/Tools.cpp
diff --git a/Tools.h b/Tools.h
diff --git a/YouTubeAPI.cpp b/YouTubeAPI.cpp
diff --git a/YouTubeAPI.h b/YouTubeAPI.h
diff --git a/YouTubeDL.cpp b/YouTubeDL.cpp
diff --git a/YouTubeDL.h b/YouTubeDL.h
diff --git a/resource.h b/resource.h
