From ae2672247c228cdb5160363ecd04304199e6818e Mon Sep 17 00:00:00 2001 From: Flamefire Date: Sat, 10 May 2014 18:33:43 +0200 Subject: [PATCH 01/14] Sacrifice a bit of detection accuracy for speed --- Vocaluxe/Lib/Sound/Record/PitchTracker/CPtAKF.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtAKF.cs b/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtAKF.cs index 842fdb22..c47ff51f 100644 --- a/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtAKF.cs +++ b/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtAKF.cs @@ -4,8 +4,8 @@ using System.Runtime.InteropServices; namespace Vocaluxe.Lib.Sound.Record.PitchTracker { /// - /// Pitchtracker (Pt) that uses autocorrelation (AKF) and AMDF - /// Quite fast and perfect in artificial tests, but may fail in real world scenarios (e.g. missing fundamental) + /// Pitchtracker (Pt) that uses autocorrelation (AKF) and AMDF + /// Quite fast and perfect in artificial tests, but may fail in real world scenarios (e.g. missing fundamental) /// class CPtAKF : CPitchTracker { @@ -34,7 +34,7 @@ namespace Vocaluxe.Lib.Sound.Record.PitchTracker private IntPtr _Instance; - public CPtAKF(uint step = 400) + public CPtAKF(uint step = 1024) { _Instance = PtAKF_Create(step); } From e975d0d5c5dd261c038764a07057d6a1c3c49ebb Mon Sep 17 00:00:00 2001 From: Flamefire Date: Sat, 10 May 2014 18:35:52 +0200 Subject: [PATCH 02/14] Remove OMP usage, it leads to performance issues at runtime on machines with few cores (e.g. 2) --- PitchTracker/PitchTracker.vcxproj | 2 -- PitchTracker/ptAKF.cpp | 4 ---- 2 files changed, 6 deletions(-) diff --git a/PitchTracker/PitchTracker.vcxproj b/PitchTracker/PitchTracker.vcxproj index 65ce0ada..06c0b94c 100644 --- a/PitchTracker/PitchTracker.vcxproj +++ b/PitchTracker/PitchTracker.vcxproj @@ -135,7 +135,6 @@ Speed Fast false - true Windows @@ -158,7 +157,6 @@ true Speed Fast - true Windows diff --git a/PitchTracker/ptAKF.cpp b/PitchTracker/ptAKF.cpp index 27251d72..913e0cce 100644 --- a/PitchTracker/ptAKF.cpp +++ b/PitchTracker/ptAKF.cpp @@ -179,15 +179,11 @@ int PtAKF::_GetNote(float samples[_SampleCt], float* restrict maxVolume, float w float maxWeight = 0.f; //TODO: When using FFT this can be speed up a lot by only checking around the AKF peaks - #pragma omp parallel for schedule(static) for (int toneIndex = 0; toneIndex <= _MaxHalfTone; toneIndex++){ float curWeight = _AnalyzeByTone(samples, samplesWindowed, toneIndex); weights[toneIndex] = curWeight; - } - for (int toneIndex = 0; toneIndex <= _MaxHalfTone; toneIndex++){ - float curWeight = weights[toneIndex]; if(curWeight > maxWeight){ maxWeight = curWeight; } From eef512ae98c728c5367a2baf3771413bf33407a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Thu, 12 Jun 2014 13:47:04 +0200 Subject: [PATCH 03/14] Added config-file for Transifex Client. --- .tx/config | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .tx/config diff --git a/.tx/config b/.tx/config new file mode 100644 index 00000000..14f2ba0e --- /dev/null +++ b/.tx/config @@ -0,0 +1,39 @@ +[main] +host = https://www.transifex.com +minimum_perc = 25 + +[vocaluxe.challenge] +file_filter = Output/PartyModes/Challenge/Languages/.xml +source_file = Output/PartyModes/Challenge/Languages/English.xml +source_lang = English +lang_map = en:English, cs:Czech, de:German, es:Spanish, fr:French, sv:Swedish, nl:Dutch, ast:Asturian, tr:Turkish, hu:Hungarian, it:Italian, ca:Catalan +type = ANDROID + +[vocaluxe.challenge-medley] +file_filter = Output/PartyModes/ChallengeMedley/Languages/.xml +source_file = Output/PartyModes/ChallengeMedley/Languages/English.xml +source_lang = English +lang_map = en:English, cs:Czech, de:German, es:Spanish, fr:French, sv:Swedish, nl:Dutch, ast:Asturian, tr:Turkish, hu:Hungarian, it:Italian, ca:Catalan +type = ANDROID + +[vocaluxe.game] +file_filter = Output/Languages/.xml +source_file = Output/Languages/English.xml +source_lang = English +lang_map = en:English, cs:Czech, de:German, es:Spanish, fr:French, sv:Swedish, nl:Dutch, ast:Asturian, tr:Turkish, hu:Hungarian, it:Italian, ca:Catalan +type = ANDROID + +[vocaluxe.tictactoe] +file_filter = Output/PartyModes/TicTacToe/Languages/.xml +source_file = Output/PartyModes/TicTacToe/Languages/English.xml +source_lang = English +lang_map = en:English, cs:Czech, de:German, es:Spanish, fr:French, sv:Swedish, nl:Dutch, ast:Asturian, tr:Turkish, hu:Hungarian, it:Italian, ca:Catalan +type = ANDROID + +[vocaluxe.webinterface] +file_filter = Vocaluxe/Website/locales/.json +source_file = Vocaluxe/Website/locales/en.json +source_lang = en +lang_map = en:English, cs:Czech, de:German, es:Spanish, fr:French, sv:Swedish, nl:Dutch, ast:Asturian, tr:Turkish, hu:Hungarian, it:Italian, ca:Catalan +type = KEYVALUEJSON + From 4f38ac66db323391d55f251f136614aa3eb1ec40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Thu, 12 Jun 2014 13:48:24 +0200 Subject: [PATCH 04/14] Language-Update. Thx to all translators! --- Output/Languages/Czech.xml | 6 +- Output/Languages/Dutch.xml | 4 - Output/Languages/English.xml | 5 +- Output/Languages/French.xml | 4 +- Output/Languages/German.xml | 9 +- Output/Languages/Hungarian.xml | 3 - Output/Languages/Italian.xml | 198 ++++++++++++++++++ Output/Languages/Spanish.xml | 47 ++++- Output/Languages/Swedish.xml | 8 +- Output/Languages/Turkish.xml | 3 - .../Challenge/Languages/English.xml | 1 + .../Challenge/Languages/Italian.xml | 18 ++ .../Challenge/Languages/Spanish.xml | 2 + .../ChallengeMedley/Languages/English.xml | 1 + .../ChallengeMedley/Languages/Italian.xml | 15 ++ .../ChallengeMedley/Languages/Spanish.xml | 2 + .../TicTacToe/Languages/English.xml | 1 + .../TicTacToe/Languages/Italian.xml | 16 ++ .../TicTacToe/Languages/Spanish.xml | 1 + Vocaluxe/Website/locales/es.json | 80 +++++++ Vocaluxe/Website/locales/it.json | 80 +++++++ 21 files changed, 481 insertions(+), 23 deletions(-) create mode 100644 Output/Languages/Italian.xml create mode 100644 Output/PartyModes/Challenge/Languages/Italian.xml create mode 100644 Output/PartyModes/ChallengeMedley/Languages/Italian.xml create mode 100644 Output/PartyModes/TicTacToe/Languages/Italian.xml create mode 100644 Vocaluxe/Website/locales/es.json create mode 100644 Vocaluxe/Website/locales/it.json diff --git a/Output/Languages/Czech.xml b/Output/Languages/Czech.xml index d4895f48..b1a67a15 100644 --- a/Output/Languages/Czech.xml +++ b/Output/Languages/Czech.xml @@ -30,6 +30,7 @@ Host Obyčejný uživatel Správce + Uživatel klávesnice Software OpenGL Direct3D @@ -205,9 +206,9 @@ Pozadí obrazu Náhled obrazu Obrazové záznamy během přehrávání - Zobrazit nynější obrazový záznam k hudbě na pozadí + Zobrazit obrazový záznam k nynější hudbě na pozadí Kamery - Schopnosti kamer + Rozlišení kamery Přizpůsobení obrazovky Stiskněte Ctrl + Alt + Shift + šipky pro upravení obrazovky Ctrl + Alt + Shift + 0 pro vrácení úprav zpět na výchozí hodnoty @@ -217,4 +218,5 @@ Dole vpravo Hlasitost Adresa serveru + Server neběží. Prověřte, prosím, config.xml! diff --git a/Output/Languages/Dutch.xml b/Output/Languages/Dutch.xml index 8d959590..22bbdc6a 100644 --- a/Output/Languages/Dutch.xml +++ b/Output/Languages/Dutch.xml @@ -194,13 +194,9 @@ Gedrag Laden Covers Songtekstopties Stijl - Positie songteksten Video-opties Videoachtergronden Videopreview Video tijdens zingen - Toon huidige achtergrondmuziekvideo - Webcams - Webcaminstellingen Volume diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml index b7360541..1cafa62a 100644 --- a/Output/Languages/English.xml +++ b/Output/Languages/English.xml @@ -1,3 +1,4 @@ + English Vocaluxe @@ -81,7 +82,7 @@ Bottom Top Top and bottom - Dynamic + Dynamic Loading Total Songs @@ -96,7 +97,7 @@ Description Author Version - Can't load this party-mode. + Can\'t load this party-mode. There are no mics configured! Target audience No teams diff --git a/Output/Languages/French.xml b/Output/Languages/French.xml index 5873c73b..149f908c 100644 --- a/Output/Languages/French.xml +++ b/Output/Languages/French.xml @@ -30,6 +30,7 @@ Invité Utilisateur normal Administrateur + Clavier d\'Utilisateur Logiciel OpenGL Direct3D @@ -207,7 +208,7 @@ Vidéos pendant que l\'on chante Afficher la vidéo de la musique de fond Webcams - Configuration Webcam + Résolution de la Webcam Ajustements de l\'écran Appuyer sur CTR + ALT + SHIFT + Flèches pour ajuster l\'écran CTR + ALT + SHIFT + 0 pour réinitialiser @@ -217,4 +218,5 @@ Bas droit Volume Adresse du serveur + Le serveur ne fonctionne pas. Merci de vérifier config.xml ! diff --git a/Output/Languages/German.xml b/Output/Languages/German.xml index 52859778..50ffef0a 100644 --- a/Output/Languages/German.xml +++ b/Output/Languages/German.xml @@ -1,4 +1,4 @@ - + Deutsch Vocaluxe @@ -30,7 +30,7 @@ Gast Normaler Benutzer Administrator - Tastatursteuerer + Tastatur Software OpenGL Direct3D @@ -201,12 +201,12 @@ Cover Ladeverhalten Songtexteinstellungen Stil - Songtext-Position + Lyrics Position Videoeinstellungen Video-Hintergründe Video-Vorschau Videos während des Singens - Videos der Hintergrundmusik + Zeige Video zur Hintergrundmusik Webcams Webcam-Auflösung Anzeigeanpassungen @@ -218,4 +218,5 @@ Unten rechts Lautstärke Serveradresse + Server läuft derzeit nicht. Bitte überprüfe die config.xml! diff --git a/Output/Languages/Hungarian.xml b/Output/Languages/Hungarian.xml index 3756f68e..5515e2d4 100644 --- a/Output/Languages/Hungarian.xml +++ b/Output/Languages/Hungarian.xml @@ -190,8 +190,5 @@ Animált Háttér Videó Előnézet Videó Éneklés Közben - Jelenlegi Háttérzene Videó Mutatása - Webkamerák - Webkamera Tulajdonságok Hangerő diff --git a/Output/Languages/Italian.xml b/Output/Languages/Italian.xml new file mode 100644 index 00000000..8c899d6e --- /dev/null +++ b/Output/Languages/Italian.xml @@ -0,0 +1,198 @@ + + + Italiano + Vocaluxe + e + Esci + Salva + Indietro + Inizia + Flussi audio + Flussi video + Texture + Tono Abs + Volume massimo + Canzoni caricate + Mouse + Normale + Duetto + Medley + Versione breve + Eroe vocale + Superstar + Il cantante + Stella nascente + Promettente + Aspirante + Dilletante + Stonato + Ospite + Utente normale + Amministratore + Software + OpenGL + Direct3D + Bassissimo + Basso + Medio + Alto + Altissimo + Off + On + Solo FPS + Livello 1 + Livello 2 + Livello 3 + Max + Elenco + Dreidel + Libro + Su richiesta + All\'avvio + Dinamico + Nessuno + Casuale + Cartella + Artista + Lettera artista + Lettera Titolo + Edizione + Genere + Anno + Decade + Lingua + Facile + Normale + Difficile + Corrente + Rimanente + Totale + Normale + Espanso + Musica personale e musica di sfondo + Nessuna musica personale + Solo musica personale + Tutto + Solo nomi e avatar + Niente + Dinamico + Caricamento + Totale + Canzoni + Caricato + Menu principale + Canta + Festa + Opzioni + Profili + Seleziona modalità festa + Modalità festa + Descrizione + Autore + Versione + Impossibile caricare questa modalità festa. + Target di riferimento + Nessuna squadra + Numero di squadre + Numero di giocatori + Selezione giocatore + Giocatore + 1 giocatore + 2 giocatori + 3 giocatori + 4 giocatori + 5 giocatori + 6 giocatori + Attenzione: Non c\'è nessun microfono assegnato al giocatore %v! + Attenzione: Non c\'è nessun microfono assegnato ai giocatori %v! + Attenzione: Non c\'è nessun profilo assegnato al giocatore %v! + Attenzione: Non c\'è nessun profilo assegnato ai giocatori %v! + Selezione canzone + Canta + Aggiungi alla playlist + Chiudi + Seleziona una canzone casuale + Seleziona una categoria casuale + Canta tutte le canzoni + Canta tutte le canzoni visibili + Apri playlist + Canta un medley casuale + Canta canzoni medley + Nuova playlist + Opzioni canzone + Cerca: + Nessuna lingua + Nessun anno + Nessun genere + Nessuna edizione + Tutte le canzoni + (%v Canzoni) + (%v Canzone) + %a - %t + Pausa + Smetti di cantare + Continua + Salta questa canzone + Punteggi + Voto + Punti + Difficoltà + Punteggio complessivo + Punteggio più alto + Profili + Nome giocatore + Difficoltà gioco + Avatar + Ruolo utente + Attivo + Nuovo + Elimina + Scatta un istantanea + Salva istantanea + Elimina istantanea + Webcam + Menu opzioni + Gioco + Suono + Registrazione + Video + Testi + Tema + Indirizzo server + Opzioni gioco + Lingua + Debug livello + Menu canzone + Ordine canzone + Schede + Difficoltà gioco + Modalità a tempo + Opzioni registrazione + Dispositivo + Input + Canale 1 + Canale 2 + Ritardo microfono + Attenzione: Ad un giocatore sono assegnati due microfoni. + Test ritardo + Opzioni suono + Musica di sfondo + Volume musica di sfondo + Sorgente musica di sfondo + Anteprima volume musica + Volume musica di gioco + Opzioni tema + Tema + Skin + Tema cover + Mostra note-linee + Mostra Aiuto-Tono + Look timer + Opzioni testi + Stile + Posizione testi + Opzioni video + Anteprima video + Volume + Indirizzo server + diff --git a/Output/Languages/Spanish.xml b/Output/Languages/Spanish.xml index 558e20bc..06ce81a0 100644 --- a/Output/Languages/Spanish.xml +++ b/Output/Languages/Spanish.xml @@ -12,10 +12,13 @@ Texturas ToneAbs Volumen Máx + Canciones cargadas Mouse + Uso de memoria Normal Dueto Medley + Versión corta Héroe Vocal Superestrella Vocalista Principal @@ -24,6 +27,10 @@ Aspirante Amateur Sordo + Invitado + Usuario normal + Administrador + Teclado de usuario Software OpenGL Direct3D @@ -57,6 +64,7 @@ Año Década Idioma + Fecha añadida Fácil Normal Difícil @@ -68,6 +76,13 @@ Canciones del juego y tema Vocaluxe Sin canciones del juego Solo canciones del juego + Todas + Solo nombres y avatares + Nada + Abajo + Arriba + Arriba y abajo + Dinámico Cargando... Total Canciones @@ -83,6 +98,7 @@ TODO: Author TODO: Version TODO: Can\'t load this party-mode. + ¡No hay micrófonos configurados! TODO: Target audience TODO: No Teams TODO: Number of teams @@ -108,6 +124,7 @@ TODO: Sing all songs TODO: Sing all visible songs TODO: Open playlist + Seleccionar TODO: Sing a random medley TODO: Sing medley-songs TODO: New Playlist @@ -120,27 +137,37 @@ Todas las Canciones (%v Canciones) (%v Canción) + %a - %t Pausa Dejar de cantar Continuar + Saltar esta canción Resultados Rating Puntuación Dificultad + Puntuación total Alta Puntuación Perfiles Nombre del Jugador Dificultad del Juego Avatar + Rol de usuario Activa Nuevo Eliminar + Capturar pantalla + Guardar captura de pantalla + Eliminar captura de pantalla + Cámara web Opciones del Menú Juego Sonido Grabación Video + Letras Estilos + Dirección del servidor Opciones del Juego Idioma Nivel de Depuración @@ -161,6 +188,8 @@ Música de Fondo Volumen de la Música de Fondo Origen de la Música de Fondo + Volumen de la música de la vista previa + Volumen de la música del juego Opciones de Estilo Estilo Skin @@ -168,10 +197,26 @@ Mostrar Líneas de las Notas Mostrar Guía de Tonos Aspecto del Timer + Desvanecer información del jugador Comportamiento de la Carga de Carátulas + Opciones de la letra + Estilo + Posición de la letra Opciones de Video Videos de Fondo Previsualización del Video Videos al Cantar - TODO: Display current backgroundmusic video + Mostrar el vídeo de fondo actual + Cámaras web + Resolución cámara web + Ajustes de pantalla + Pulsa CTRL + ALT + SHIFT + Flechas para ajustar la pantalla + CTRL + ALT + SHIFT + 0 para reiniciar + Arriba izquierda + Abajo derecha + Abajo izquierda + Abajo derecha + Volúmen + Dirección del servidor + El servidor no esta funcionando. ¡Por favor revisa el archivo config.xml! diff --git a/Output/Languages/Swedish.xml b/Output/Languages/Swedish.xml index aae0a1a7..2b364a94 100644 --- a/Output/Languages/Swedish.xml +++ b/Output/Languages/Swedish.xml @@ -30,6 +30,7 @@ Gäst Normal Användare Administratör + Tangentbord Användare Mjukvara OpenGL Direct3D @@ -200,14 +201,14 @@ Beteende För Hur Omslag Laddas Låttext Alternativ Utseende - Text position + Textposition Video Alternativ Video Bakgrund Video Förhandsvisning Video Samtidigt Med Låt - Visa nuvarande Video för Bakgrundsmusik + Visa Video för nuvarande Bakgrundsmusik Webkameror - Webkamera Kapacitet + Webkamera Upplösning Skärmjusteringar Tryck CTRL + ALT +SHIFT + Pilar för att justera skärmen CTRL + ALT + SHIFT + 0 för att återställa @@ -217,4 +218,5 @@ Nederst till höger Volym Server adress + Servern kan inte nås. Var god kontrollera config.xml! diff --git a/Output/Languages/Turkish.xml b/Output/Languages/Turkish.xml index dff41110..e56f01e0 100644 --- a/Output/Languages/Turkish.xml +++ b/Output/Languages/Turkish.xml @@ -190,8 +190,5 @@ Video Arka Planları Video Önizleme Şarkı Söylerken Videoları Gösterme - Mevcut Arka Plan Müziği Videosunu Göster - Web Kameraları - Web Kameraları Özellikleri Ses diff --git a/Output/PartyModes/Challenge/Languages/English.xml b/Output/PartyModes/Challenge/Languages/English.xml index 7134cee0..b343b452 100644 --- a/Output/PartyModes/Challenge/Languages/English.xml +++ b/Output/PartyModes/Challenge/Languages/English.xml @@ -1,3 +1,4 @@ + English Challenge Mode diff --git a/Output/PartyModes/Challenge/Languages/Italian.xml b/Output/PartyModes/Challenge/Languages/Italian.xml new file mode 100644 index 00000000..936ed185 --- /dev/null +++ b/Output/PartyModes/Challenge/Languages/Italian.xml @@ -0,0 +1,18 @@ + + + Italiano + Prossimo + Indietro + Inizia + Esci + Si + No + Numero di giocatori + Numero di microfoni + Selezione casuale + Pos + Nome + Vittorie + Punteggio + Vuoi davvero uscire? + diff --git a/Output/PartyModes/Challenge/Languages/Spanish.xml b/Output/PartyModes/Challenge/Languages/Spanish.xml index bf38f012..60b91f04 100644 --- a/Output/PartyModes/Challenge/Languages/Spanish.xml +++ b/Output/PartyModes/Challenge/Languages/Spanish.xml @@ -16,7 +16,9 @@ TODO: Number of mics TODO: Number of rounds TODO: Challenge Mode: Choose Player + Seleccionar aleatoriamente TODO: Challenge Mode: Overview + Posición TODO: Name TODO: Rounds TODO: Wins diff --git a/Output/PartyModes/ChallengeMedley/Languages/English.xml b/Output/PartyModes/ChallengeMedley/Languages/English.xml index bbe904d3..4ce10c84 100644 --- a/Output/PartyModes/ChallengeMedley/Languages/English.xml +++ b/Output/PartyModes/ChallengeMedley/Languages/English.xml @@ -1,3 +1,4 @@ + English Challenge Medley Mode diff --git a/Output/PartyModes/ChallengeMedley/Languages/Italian.xml b/Output/PartyModes/ChallengeMedley/Languages/Italian.xml new file mode 100644 index 00000000..92e619c7 --- /dev/null +++ b/Output/PartyModes/ChallengeMedley/Languages/Italian.xml @@ -0,0 +1,15 @@ + + + Prossimo + Indietro + Inizia + Esci + Si + No + Selezione casuale + Pos + Nome + Vittorie + Punteggio + Vuoi davvero uscire? + diff --git a/Output/PartyModes/ChallengeMedley/Languages/Spanish.xml b/Output/PartyModes/ChallengeMedley/Languages/Spanish.xml index dac7d587..90c91f7e 100644 --- a/Output/PartyModes/ChallengeMedley/Languages/Spanish.xml +++ b/Output/PartyModes/ChallengeMedley/Languages/Spanish.xml @@ -16,7 +16,9 @@ TODO: Number of mics TODO: Number of rounds TODO: Challenge Medley Mode: Choose Player + Seleccionar aleatoriamente TODO: Challenge Medley Mode: Overview + Posición TODO: Name TODO: Rounds TODO: Wins diff --git a/Output/PartyModes/TicTacToe/Languages/English.xml b/Output/PartyModes/TicTacToe/Languages/English.xml index 0f499d1e..9dda8f3c 100644 --- a/Output/PartyModes/TicTacToe/Languages/English.xml +++ b/Output/PartyModes/TicTacToe/Languages/English.xml @@ -1,3 +1,4 @@ + English Tic-Tac-Toe diff --git a/Output/PartyModes/TicTacToe/Languages/Italian.xml b/Output/PartyModes/TicTacToe/Languages/Italian.xml new file mode 100644 index 00000000..7f1f3c8e --- /dev/null +++ b/Output/PartyModes/TicTacToe/Languages/Italian.xml @@ -0,0 +1,16 @@ + + + Tic-Tac-Toe + Si + No + Inizia + Canzoni + Squadra + Playlist + Categoria + Tutte le canzoni + Squadra 1 + Squadra 2 + Selezione casuale + Tic-Tac-Toe + diff --git a/Output/PartyModes/TicTacToe/Languages/Spanish.xml b/Output/PartyModes/TicTacToe/Languages/Spanish.xml index 4fb1d359..fa6e2c8a 100644 --- a/Output/PartyModes/TicTacToe/Languages/Spanish.xml +++ b/Output/PartyModes/TicTacToe/Languages/Spanish.xml @@ -25,6 +25,7 @@ TODO: Tic-Tac-Toe: Choose Player TODO: Team 1 TODO: Team 2 + Seleccionar aleatoriamente TODO: Tic-Tac-Toe TODO: Choose a field. TODO: Next player diff --git a/Vocaluxe/Website/locales/es.json b/Vocaluxe/Website/locales/es.json new file mode 100644 index 00000000..35b38409 --- /dev/null +++ b/Vocaluxe/Website/locales/es.json @@ -0,0 +1,80 @@ +{ + "loginName": "Usuario:", + "loginPassword": "Contraseña:", + "loginButton": "Iniciar sesión", + "registerButton": "Crear perfil", + "discoverReadQrButton": "Escanear código QR", + "mainPageYourProfileLink": "Tu perfil", + "mainPageYourProfileLinkDesc": "Editar tu perfil", + "mainPageCurrentSongLink": "Canción actual", + "mainPageCurrentSongLinkDesc": "Mostrar información sobre la canción actual", + "mainPageSelectSong": "Todas las canciones", + "mainPageSelectSongDesc": "Lista de las canciones disponibles", + "mainPageSelectPlaylist": "Todas las listas de reproducción", + "mainPageSelectPlaylistDesc": "Lista de todas las listas de reproducción", + "mainPageSelectProfile": "Pefiles", + "mainPageSelectProfileDesc": "Mostrar todos los perfiles", + "mainPageTakePhotoLink": "Hacer foto", + "mainPageTakePhotoLinkDesc": "Hacer una foto y mostrarla al final de la ronda actual", + "mainPageKeyboard": "Teclado", + "mainPageKeyboardDesc": "Enviar teclas", + "mainPageSelectUserAdmin": "Administración", + "mainPageSelectUserAdminDesc": "Configurar derechos de usuario", + "mainPageLogoutLink": "Cerrar sesión", + "mainPageLogoutLinkDesc": "Cerrar la sesión", + "selectProfileHeader": "Todos los perfiles", + "displayProfileHeader": "Perfil", + "displayProfileName": "Nombre:", + "displayProfilePlayerType": "Tipo de usuario:", + "displayProfilePlayerTypeNormal": "Normal", + "displayProfilePlayerTypeGuest": "Invitado", + "displayProfilePlayerDifficulty": "Dificultad:", + "displayProfilePlayerDifficultyEasy": "Fácil", + "displayProfilePlayerDifficultyNormal": "Normal", + "displayProfilePlayerDifficultyHard": "Difícil", + "displayProfilePlayerPassword": "Nueva contraseña:", + "displayProfilePlayerSaveButton": "Guardar y subir", + "displaySongHeader": "Ninguna canción ahora", + "displaySongArtist": "Artista:", + "displaySongGenre": "Género:", + "displaySongYear": "Año:", + "displaySongLanguage": "Idioma:", + "displaySongIsDuet": "Dueto:", + "popupVideoClose": "Cerrar", + "selectSongHeader": "Todas las canciones", + "keyboardHeader": "Teclado", + "keyboardButtonUp": "arriba", + "keyboardButtonLeft": "izquierda", + "keyboardButtonRight": "derecha", + "keyboardButtonDown": "abajo", + "keyboardButtonEscape": "escape", + "keyboardButtonTab": "tabulación", + "keyboardButtonReturn": "intro", + "keyboardButtonKeys": "Para enviar otras teclas escribe aquí:", + "selectUserAdminHeader": "Todos los perfiles", + "displayUserAdminHeader": "Perfil", + "displayUserAdminContentSaveButton": "Guardar", + "selectPlaylistHeader": "Seleccionar una lista de reproducción", + "displayPlaylistHeader": "Lista de reproducción", + "displayPlaylistSaveButton": "Guardar", + "selectPlaylistAddPlaylistButton": "Añadir", + "Loading (external)...": "Cargando (externo)...", + "Loading...": "Cargando...", + "Creating...": "Creando...", + "Error...": "Error...", + "No connection": "Sin conexión", + "No session": "Sin sesión", + "Uploading photo...": "Subiendo foto...", + "Getting current song...": "Obteniendo la canción actual...", + "Login...": "Iniciando sesión...", + "Creating profile...": "Creando pefil...", + "This is not a valid name.": "Este no es un nombre válido.", + "Uploading profile...": "Subiendo perfil...", + "songs": "canciones", + "YourName": "Tu nombre", + "discoverConnectHeader": "Conectar al servidor", + "discoverConnectServerAddress": "Dirección del servidor:", + "discoverConnectButton": "Conectar", + "Checking...": "Comprobando...", + "timeout": "Tiempo de espera" +} \ No newline at end of file diff --git a/Vocaluxe/Website/locales/it.json b/Vocaluxe/Website/locales/it.json new file mode 100644 index 00000000..a757def3 --- /dev/null +++ b/Vocaluxe/Website/locales/it.json @@ -0,0 +1,80 @@ +{ + "loginName": "Utente:", + "loginPassword": "Password:", + "loginButton": "Entra", + "registerButton": "Crea profilo", + "discoverReadQrButton": "Scansione codice QR", + "mainPageYourProfileLink": "Tuo profilo", + "mainPageYourProfileLinkDesc": "Modifica il tuo profilo", + "mainPageCurrentSongLink": "Canzone corrente", + "mainPageCurrentSongLinkDesc": "Visualizza informazioni sulla canzone corrente", + "mainPageSelectSong": "Tutte le canzoni", + "mainPageSelectSongDesc": "Elenca tutte le canzoni disponibili", + "mainPageSelectPlaylist": "Tutte le playlist", + "mainPageSelectPlaylistDesc": "Elenca tutte le playlist", + "mainPageSelectProfile": "Profili", + "mainPageSelectProfileDesc": "Mostra tutti i profili", + "mainPageTakePhotoLink": "Scatta una foto", + "mainPageTakePhotoLinkDesc": "Scatta una foto e visualizzala alla fine del turno corrente", + "mainPageKeyboard": "Tastiera", + "mainPageKeyboardDesc": "Invio tasti", + "mainPageSelectUserAdmin": "Amministrazione", + "mainPageSelectUserAdminDesc": "Configura diritti utente", + "mainPageLogoutLink": "Esci", + "mainPageLogoutLinkDesc": "Chiudi la sessione", + "selectProfileHeader": "Tutti i profili", + "displayProfileHeader": "Profilo", + "displayProfileName": "Nome:", + "displayProfilePlayerType": "Tipo giocatore:", + "displayProfilePlayerTypeNormal": "Normale", + "displayProfilePlayerTypeGuest": "Ospite", + "displayProfilePlayerDifficulty": "Difficoltà:", + "displayProfilePlayerDifficultyEasy": "Facile", + "displayProfilePlayerDifficultyNormal": "Normale", + "displayProfilePlayerDifficultyHard": "Difficile", + "displayProfilePlayerPassword": "Nuova password:", + "displayProfilePlayerSaveButton": "Salva e carica", + "displaySongHeader": "Nessuna canzone corrente", + "displaySongArtist": "Artista:", + "displaySongGenre": "Genere:", + "displaySongYear": "Anno:", + "displaySongLanguage": "Lingua:", + "displaySongIsDuet": "Duetto:", + "popupVideoClose": "Chiudi", + "selectSongHeader": "Tutte le canzoni", + "keyboardHeader": "Tastiera", + "keyboardButtonUp": "su", + "keyboardButtonLeft": "sinistra", + "keyboardButtonRight": "destra", + "keyboardButtonDown": "giu", + "keyboardButtonEscape": "escape", + "keyboardButtonTab": "tab", + "keyboardButtonReturn": "invio", + "keyboardButtonKeys": "Per inviare altri tasti scrivi qui:", + "selectUserAdminHeader": "Tutti i profili", + "displayUserAdminHeader": "Profilo", + "displayUserAdminContentSaveButton": "Salva", + "selectPlaylistHeader": "Seleziona una playlist", + "displayPlaylistHeader": "Playlist", + "displayPlaylistSaveButton": "Salva", + "selectPlaylistAddPlaylistButton": "Aggiungi", + "Loading (external)...": "Caricamento(esterno)...", + "Loading...": "Caricamento...", + "Creating...": "Creazione...", + "Error...": "Errore...", + "No connection": "Nessuna connessione", + "No session": "Nessuna sessione", + "Uploading photo...": "Caricamento foto...", + "Getting current song...": "Recupero canzone corrente...", + "Login...": "Login...", + "Creating profile...": "Creazione profilo...", + "This is not a valid name.": "Questo nome non è valido.", + "Uploading profile...": "Caricamento profilo...", + "songs": "canzoni", + "YourName": "Tuo nome", + "discoverConnectHeader": "Connetti al server", + "discoverConnectServerAddress": "Indirizzo server:", + "discoverConnectButton": "Connetti", + "Checking...": "Controllo...", + "timeout": "Timeout" +} \ No newline at end of file From 5d8628d8a013f37323856e549f8855cc07a344ee Mon Sep 17 00:00:00 2001 From: Flamefire Date: Fri, 1 Aug 2014 15:31:49 +0200 Subject: [PATCH 05/14] Fix cursor disappearing --- Vocaluxe/Base/CCursor.cs | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/Vocaluxe/Base/CCursor.cs b/Vocaluxe/Base/CCursor.cs index ecb0738c..46a6e2b1 100644 --- a/Vocaluxe/Base/CCursor.cs +++ b/Vocaluxe/Base/CCursor.cs @@ -17,6 +17,7 @@ using System; using System.Diagnostics; +using System.Drawing; using VocaluxeLib; using VocaluxeLib.Draw; @@ -27,6 +28,7 @@ namespace Vocaluxe.Base private int _MouseMoveDiffMin = CSettings.MouseMoveDiffMinActive; private CFading _Fading; private CTexture _Cursor; + private Point _LastDiffPos; private readonly Stopwatch _Movetimer = new Stopwatch(); @@ -67,9 +69,16 @@ namespace Vocaluxe.Base public void UpdatePosition(int x, int y) { - if (Math.Abs(_Cursor.Rect.X - x) > _MouseMoveDiffMin || - Math.Abs(_Cursor.Rect.Y - y) > _MouseMoveDiffMin) + if (Math.Abs(_LastDiffPos.X - x) > _MouseMoveDiffMin || + Math.Abs(_LastDiffPos.Y - y) > _MouseMoveDiffMin) + { + //This will restart the timer and show the cursor if required Activate(); + //Use that point so cursor is deactivated only when there is no move by the diff value from this position the the given offTime + //Using the curent cursor position won't work because there will only be moves by 1 in most cases + _LastDiffPos.X = x; + _LastDiffPos.Y = y; + } _Cursor.Rect.X = x; _Cursor.Rect.Y = y; @@ -111,10 +120,12 @@ namespace Vocaluxe.Base public void Activate() { - if (IsActive) + // Here we need to restart the timer in all cases but only set fading and diff if we are not yet active + bool active = IsActive; + _Movetimer.Restart(); + if (active) return; _MouseMoveDiffMin = CSettings.MouseMoveDiffMinActive; - _Movetimer.Restart(); _Fade(1f, 0.2f); } From ba7627513eeb5631626266ea572ed72728d85df2 Mon Sep 17 00:00:00 2001 From: Flamefire Date: Fri, 1 Aug 2014 16:01:27 +0200 Subject: [PATCH 06/14] Fix wrong argument order for Song loading (fixes wrong song start time in preview) --- VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs index 7d1f0be2..8677cc92 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs @@ -524,7 +524,7 @@ namespace VocaluxeLib.Menu.SongMenu return; //TODO: Using prescan here causes Vocaluxe to hang a bit on loading the song but we need the length below - int stream = CBase.Sound.Load(Path.Combine(song.Folder, song.MP3FileName), true); + int stream = CBase.Sound.Load(Path.Combine(song.Folder, song.MP3FileName), false, true); float startposition = song.Preview.StartTime; float length = CBase.Sound.GetLength(stream); From f2bd61937fb6900430b5e2501f2278685d26aac5 Mon Sep 17 00:00:00 2001 From: Flamefire Date: Fri, 1 Aug 2014 16:26:21 +0200 Subject: [PATCH 07/14] Loop preview song and video --- Vocaluxe/Base/CMain.cs | 5 +++++ VocaluxeLib/IBasic.cs | 9 +++++---- VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs | 3 ++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Vocaluxe/Base/CMain.cs b/Vocaluxe/Base/CMain.cs index f8d0b073..a47c74a7 100644 --- a/Vocaluxe/Base/CMain.cs +++ b/Vocaluxe/Base/CMain.cs @@ -769,6 +769,11 @@ namespace Vocaluxe.Base { return CVideo.Close(videoStream); } + + public void SetLoop(int streamID, bool loop = true) + { + CVideo.SetLoop(streamID, loop); + } } class CBsound : ISound diff --git a/VocaluxeLib/IBasic.cs b/VocaluxeLib/IBasic.cs index 739bbdf7..9d84374d 100644 --- a/VocaluxeLib/IBasic.cs +++ b/VocaluxeLib/IBasic.cs @@ -248,10 +248,11 @@ namespace VocaluxeLib public interface IVideo { int Load(string videoFileName); - bool Skip(int videoStream, float startPosition, float videoGap); - bool GetFrame(int videoStream, ref CTexture videoTexture, float time, out float videoTime); - bool IsFinished(int videoStream); - bool Close(int videoStream); + bool Skip(int streamID, float startPosition, float videoGap); + bool GetFrame(int streamID, ref CTexture videoTexture, float time, out float videoTime); + bool IsFinished(int streamID); + bool Close(int streamID); + void SetLoop(int streamID, bool loop = true); } public interface ISound diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs index 8677cc92..e7f260f9 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs @@ -524,7 +524,7 @@ namespace VocaluxeLib.Menu.SongMenu return; //TODO: Using prescan here causes Vocaluxe to hang a bit on loading the song but we need the length below - int stream = CBase.Sound.Load(Path.Combine(song.Folder, song.MP3FileName), false, true); + int stream = CBase.Sound.Load(Path.Combine(song.Folder, song.MP3FileName), true, true); float startposition = song.Preview.StartTime; float length = CBase.Sound.GetLength(stream); @@ -551,6 +551,7 @@ namespace VocaluxeLib.Menu.SongMenu _PreviewVideoStream = CBase.Video.Load(Path.Combine(song.Folder, song.VideoFileName)); if (_PreviewVideoStream == -1) return; + CBase.Video.SetLoop(_PreviewVideoStream); CBase.Video.Skip(_PreviewVideoStream, startposition, song.VideoGap); _VideoFading = new CFading(0f, 1f, 3f); } From fcdd58f8279d448384dc4601902bca05282819d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Sat, 2 Aug 2014 11:09:25 +0200 Subject: [PATCH 08/14] Fix some language-files. --- Output/PartyModes/ChallengeMedley/Languages/Italian.xml | 1 + Output/PartyModes/TicTacToe/Languages/Italian.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/Output/PartyModes/ChallengeMedley/Languages/Italian.xml b/Output/PartyModes/ChallengeMedley/Languages/Italian.xml index 92e619c7..7247406d 100644 --- a/Output/PartyModes/ChallengeMedley/Languages/Italian.xml +++ b/Output/PartyModes/ChallengeMedley/Languages/Italian.xml @@ -1,5 +1,6 @@ + Italiano Prossimo Indietro Inizia diff --git a/Output/PartyModes/TicTacToe/Languages/Italian.xml b/Output/PartyModes/TicTacToe/Languages/Italian.xml index 7f1f3c8e..9ef9c84b 100644 --- a/Output/PartyModes/TicTacToe/Languages/Italian.xml +++ b/Output/PartyModes/TicTacToe/Languages/Italian.xml @@ -1,5 +1,6 @@ + Italiano Tic-Tac-Toe Si No From f43116073d5f58b2e45ce8ecca386ecafb31e1fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Sat, 2 Aug 2014 11:16:35 +0200 Subject: [PATCH 09/14] Loads faster if song-folder doesn't exist. --- Vocaluxe/Base/CSongs.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Vocaluxe/Base/CSongs.cs b/Vocaluxe/Base/CSongs.cs index 36d0d6f2..2bf74681 100644 --- a/Vocaluxe/Base/CSongs.cs +++ b/Vocaluxe/Base/CSongs.cs @@ -20,6 +20,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Threading; +using System.IO; using VocaluxeLib; using VocaluxeLib.Songs; @@ -340,9 +341,12 @@ namespace Vocaluxe.Base var files = new List(); foreach (string p in CConfig.SongFolders) { - string path = p; - files.AddRange(CHelper.ListFiles(path, "*.txt", true, true)); - files.AddRange(CHelper.ListFiles(path, "*.txd", true, true)); + if (Directory.Exists(p)) + { + string path = p; + files.AddRange(CHelper.ListFiles(path, "*.txt", true, true)); + files.AddRange(CHelper.ListFiles(path, "*.txd", true, true)); + } } CLog.StopBenchmark("List Songs"); From f837c329ec11daa402b9e07cf03fea7a62d3311c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Sat, 2 Aug 2014 18:35:22 +0200 Subject: [PATCH 10/14] Webserver: Show message if there is a problem with init. --- ClientServerLib/ClientServerLib/CServer.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ClientServerLib/ClientServerLib/CServer.cs b/ClientServerLib/ClientServerLib/CServer.cs index 3403a092..2f5f0e78 100644 --- a/ClientServerLib/ClientServerLib/CServer.cs +++ b/ClientServerLib/ClientServerLib/CServer.cs @@ -20,6 +20,7 @@ using System.Diagnostics; using System.ServiceModel; using System.ServiceModel.Web; using System.Net; +using System.Windows.Forms; namespace ServerLib { @@ -159,6 +160,7 @@ namespace ServerLib catch (CommunicationException) { _Host.Abort(); + MessageBox.Show("Problem while initialization of webserver. You may use a different port (Change in config.xml)"); } } else From 342731084bf7717e6e5604c8236a61624d5e1c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Sun, 3 Aug 2014 13:13:15 +0200 Subject: [PATCH 11/14] Update of .gitignore --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a12662d6..16bf32ec 100644 --- a/.gitignore +++ b/.gitignore @@ -58,5 +58,7 @@ Output/Vocaluxe_x64.exe /Output/VocaluxeServerConfig.exe /Output/VocaluxeServerConfig.exe.config /PhoneGap/ -/Output/Profiles +/Output/Profiles/*.xml PitchTracker.dll +*.log +Thumbs.db \ No newline at end of file From ed6a84516802096ad231cdb1d88060d442590b46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Sun, 3 Aug 2014 14:56:07 +0200 Subject: [PATCH 12/14] Do some cleanup (remove unneeded, old client-server-stuff), another update of .gitignore --- .gitignore | 61 ++-- ClientServerLib/AndroidRemote.sln | 24 -- ClientServerLib/AndroidRemote/MainActivity.cs | 285 --------------- .../Newtonsoft.Json.MonoDroid.dll | Bin 325120 -> 0 bytes .../Properties/AndroidManifest.xml | 8 - .../AndroidRemote/Properties/AssemblyInfo.cs | 28 -- .../Resources/AboutResources.txt | 44 --- .../Resources/Resource.designer.cs | 175 --------- .../AndroidRemote/Resources/drawable/Icon.png | Bin 61770 -> 0 bytes .../AndroidRemote/Resources/layout/Main.axml | 71 ---- .../Resources/values/Strings.xml | 17 - .../AndroidRemote/Vocaluxe App.csproj | 163 --------- ClientServerLib/ClientServerLib.sln | 42 --- .../ClientTest/ClientTest.Designer.cs | 337 ------------------ ClientServerLib/ClientTest/ClientTest.cs | 284 --------------- ClientServerLib/ClientTest/ClientTest.csproj | 103 ------ ClientServerLib/ClientTest/ClientTest.resx | 123 ------- ClientServerLib/ClientTest/Program.cs | 21 -- .../ClientTest/Properties/AssemblyInfo.cs | 36 -- .../Properties/Resources.Designer.cs | 71 ---- .../ClientTest/Properties/Resources.resx | 117 ------ .../Properties/Settings.Designer.cs | 30 -- .../ClientTest/Properties/Settings.settings | 7 - .../CDiscover.cs | 0 .../ClientServerLib => ServerLib}/CServer.cs | 0 .../CWebservice.cs | 0 .../DataStructs.cs | 0 .../ICWebservice.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../ServerLib.csproj | 0 .../ClientServerLib => ServerLib}/Session.cs | 0 .../SessionControl.cs | 0 .../UserRights.cs | 0 .../UserRoleControl.cs | 0 .../UserRoles.cs | 0 .../bin/Newtonsoft.Json.dll | Bin Vocaluxe.sln | 2 +- Vocaluxe/Vocaluxe.csproj | 2 +- 38 files changed, 28 insertions(+), 2023 deletions(-) delete mode 100644 ClientServerLib/AndroidRemote.sln delete mode 100644 ClientServerLib/AndroidRemote/MainActivity.cs delete mode 100644 ClientServerLib/AndroidRemote/Newtonsoft.Json.MonoDroid.dll delete mode 100644 ClientServerLib/AndroidRemote/Properties/AndroidManifest.xml delete mode 100644 ClientServerLib/AndroidRemote/Properties/AssemblyInfo.cs delete mode 100644 ClientServerLib/AndroidRemote/Resources/AboutResources.txt delete mode 100644 ClientServerLib/AndroidRemote/Resources/Resource.designer.cs delete mode 100644 ClientServerLib/AndroidRemote/Resources/drawable/Icon.png delete mode 100644 ClientServerLib/AndroidRemote/Resources/layout/Main.axml delete mode 100644 ClientServerLib/AndroidRemote/Resources/values/Strings.xml delete mode 100644 ClientServerLib/AndroidRemote/Vocaluxe App.csproj delete mode 100644 ClientServerLib/ClientServerLib.sln delete mode 100644 ClientServerLib/ClientTest/ClientTest.Designer.cs delete mode 100644 ClientServerLib/ClientTest/ClientTest.cs delete mode 100644 ClientServerLib/ClientTest/ClientTest.csproj delete mode 100644 ClientServerLib/ClientTest/ClientTest.resx delete mode 100644 ClientServerLib/ClientTest/Program.cs delete mode 100644 ClientServerLib/ClientTest/Properties/AssemblyInfo.cs delete mode 100644 ClientServerLib/ClientTest/Properties/Resources.Designer.cs delete mode 100644 ClientServerLib/ClientTest/Properties/Resources.resx delete mode 100644 ClientServerLib/ClientTest/Properties/Settings.Designer.cs delete mode 100644 ClientServerLib/ClientTest/Properties/Settings.settings rename {ClientServerLib/ClientServerLib => ServerLib}/CDiscover.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/CServer.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/CWebservice.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/DataStructs.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/ICWebservice.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/Properties/AssemblyInfo.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/ServerLib.csproj (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/Session.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/SessionControl.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/UserRights.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/UserRoleControl.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/UserRoles.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/bin/Newtonsoft.Json.dll (100%) diff --git a/.gitignore b/.gitignore index 16bf32ec..b7c9123c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,26 +1,12 @@ obj -Output/Songs +PitchTracker.dll +Thumbs.db *.mp4 *.pdb -/Output/Benchmark.log -/Output/CoverDB.sqlite -/Output/HighscoreDB.sqlite -/Output/PartyModes/*/Code/* -/Output/Vocaluxe.exe* -/Output/Vocaluxe.vshost.exe* -/Output/VocaluxeLib.dll -*.psess -/*.vsp -/*.ctl -/Output/Registration.xml -/Vocaluxe.suo *.csproj.user *.vcxproj.user -/Output/Config.xml *.ipch *.log -/Output/Playlists/*.xml -GstreamerHelper.dll *.tlog *.suo *.obj @@ -35,30 +21,35 @@ GstreamerHelper.dll *.codeanalysis* *.nativecodeanalysis* *.lastcodeanalysissucceeded -/PartyModes/*/*/*.dll *.Cache -/GstreamerHelper/bin/* -/VocaluxeLib/bin -ClientServerLib.dll -ClientTest.exe +*.psess *.vshost.* *.userprefs -AndroidRemote.dll.mdb -/ClientServerLib/AndroidRemote/bin/Newtonsoft.Json.MonoDroid.dll -/ClientServerLib/AndroidRemote/bin/AndroidRemote.dll -/ClientServerLib/ClientTest/bin/Debug/Newtonsoft.Json.dll -*.apk +/*.vsp +/*.ctl +/Output/Config.xml +/Output/CoverDB.sqlite +/Output/HighscoreDB.sqlite /Output/ClientServerLib.dll -Installer/VocaluxeSetup_0.3.0Beta.exe -Output/Vocaluxe_x64.exe -/WebserverInitalConfig/bin/Release +/Output/Vocaluxe.exe* +/Output/Vocaluxe_x64.exe* +/Output/Vocaluxe.vshost.exe* +/Output/VocaluxeLib.dll +/Output/VocaluxeServerConfig.exe +/Output/VocaluxeServerConfig.exe.config /Output/Photos /Output/Screenshots /Output/Website -/Output/VocaluxeServerConfig.exe -/Output/VocaluxeServerConfig.exe.config -/PhoneGap/ +/Output/Songs +/Output/Playlists/*.xml /Output/Profiles/*.xml -PitchTracker.dll -*.log -Thumbs.db \ No newline at end of file +/Output/PartyModes/*/Code/* +/PartyModes/*/*/*.dll +/VocaluxeLib/bin +/ServerLib/bin/ClientServerLib.dll +/Installer/setup-cache +/Installer/setup-SetupFiles +/Installer/VocaluxeSetup_0.3.0Beta.exe +/Installer/Vocaluxe*.rar +/WebserverInitalConfig/bin +/PhoneGap/ \ No newline at end of file diff --git a/ClientServerLib/AndroidRemote.sln b/ClientServerLib/AndroidRemote.sln deleted file mode 100644 index 321f91d1..00000000 --- a/ClientServerLib/AndroidRemote.sln +++ /dev/null @@ -1,24 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vocaluxe App", "AndroidRemote\Vocaluxe App.csproj", "{D97EF6F3-7C3F-439F-B022-647948E206D2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D97EF6F3-7C3F-439F-B022-647948E206D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D97EF6F3-7C3F-439F-B022-647948E206D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D97EF6F3-7C3F-439F-B022-647948E206D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D97EF6F3-7C3F-439F-B022-647948E206D2}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = AndroidRemote\Vocaluxe App.csproj - Policies = $0 - $0.DotNetNamingPolicy = $1 - $1.DirectoryNamespaceAssociation = None - $1.ResourceNamePolicy = FileFormatDefault - EndGlobalSection -EndGlobal diff --git a/ClientServerLib/AndroidRemote/MainActivity.cs b/ClientServerLib/AndroidRemote/MainActivity.cs deleted file mode 100644 index 9c86ac57..00000000 --- a/ClientServerLib/AndroidRemote/MainActivity.cs +++ /dev/null @@ -1,285 +0,0 @@ -using System; -using System.Collections.Generic; - -using Android.App; -using Android.Content; -using Android.Content.PM; -using Android.Graphics; -using Android.Runtime; -using Android.Views; -using Android.Widget; -using Android.OS; -using Android.Provider; - -using ClientServerLib; -using Vocaluxe.Base.Server; - -namespace org.vocaluxe.app -{ - [Activity (Label = "Vocaluxe App", MainLauncher = true, ConfigurationChanges=Android.Content.PM.ConfigChanges.Orientation)] - public class Activity1 : Activity - { - private readonly int REQUEST_TAKE_PICTURE = 1; - private readonly int REQUEST_PICK_PICTURE = 2; - - CClient client = new CClient(); - CDiscover discover; - Button bConnect; - Button bSendAvatar; - Button bSendProfile; - - TextView tIP; - TextView tPassword; - - ProgressDialog pDialog; - - byte[] fileBytes; - - Java.IO.File file; - Java.IO.File file2; - Java.IO.File dir; - System.IO.FileStream fs; - - bool sendProfile; - - protected override void OnCreate (Bundle bundle) - { - base.OnCreate (bundle); - - SetContentView (Resource.Layout.Main); - pDialog = new ProgressDialog (this); - pDialog.SetCancelable (false); - - bConnect = FindViewById