Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into newAcinerella + use newer ffmepg version

Browse Source 
# Conflicts:
#	Vocaluxe/Vocaluxe.csproj
#	Vocaluxe/packages.config
This commit is contained in:
lukeIam committed 2016-12-20 16:31:09 +01:00
2 parents e4deacf0b6 ae656ba727
commit 2dcf20c8c8
70 files changed
+1335 -602
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.appveyor/gitDescribe.ps1
+1 -1
View File
@@ -1,6 +1,6 @@
if($Env:APPVEYOR_PULL_REQUEST_NUMBER)
{
$Env:VersionTag = "PR_$Env:APPVEYOR_PULL_REQUEST_NUMBER"
$Env:VersionTag = "0.0.0-na-PR_$Env:APPVEYOR_PULL_REQUEST_NUMBER"
Return $Env:VersionTag
}
.gitignore
+6
View File
@@ -1,6 +1,8 @@
obj
PitchTracker.dll
Thumbs.db
.transifexrc
tx.exe
*.mp4
*.pdb
*.csproj.user
@@ -26,6 +28,8 @@ Thumbs.db
*.vshost.*
*.userprefs
*.user
*.VC.db
*.VC.opendb
/*.vsp
/*.ctl
/Output/Config.xml
@@ -63,3 +67,5 @@ Thumbs.db
/packages
/Output/x64
/Output/x86
/PitchTracker/bin
/PitchTracker/obj
Output/Languages/Asturian.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="language">Inglés</string>
<string name="language">Asturianu</string>
<string name="TR_PROGRAM_NAME">Vocaluxe</string>
<string name="TR_GENERAL_AND">y</string>
<string name="TR_BUTTON_EXIT">Colar</string>
Output/Languages/Czech.xml
-3
View File
@@ -46,7 +46,6 @@
<string name="TR_CONFIG_LEVEL2">Úroveň 2</string>
<string name="TR_CONFIG_LEVEL3">Úroveň 3</string>
<string name="TR_CONFIG_LEVEL_MAX">Nejvíce</string>
<string name="TR_CONFIG_LIST">Seznam</string>
<string name="TR_CONFIG_DREIDEL">Drejdl (čtyřboká kostka)</string>
<string name="TR_CONFIG_TILE_BOARD">Herní deska</string>
<string name="TR_CONFIG_BOOK">Kniha</string>
@@ -182,8 +181,6 @@
<string name="TR_SCREENORECORD_OPTIONS">Nastavení nahrávání</string>
<string name="TR_SCREENORECORD_DEVICE">Zařízení</string>
<string name="TR_SCREENORECORD_INPUT">Vstup</string>
<string name="TR_SCREENORECORD_CHANNEL_1">Kanál 1</string>
<string name="TR_SCREENORECORD_CHANNEL_2">Kanál 2</string>
<string name="TR_SCREENORECORD_MIC_DELAY">Zpoždění mikrofonu</string>
<string name="TR_SCREENORECORD_MIC_WARNING">Varování: Alespoň jeden hráčům je přiřazen ke dvěma mikrofonům.</string>
<string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Zkouška zpoždění</string>
Output/Languages/Dutch.xml
-3
View File
@@ -46,7 +46,6 @@
<string name="TR_CONFIG_LEVEL2">Niveau 2</string>
<string name="TR_CONFIG_LEVEL3">Niveau 3</string>
<string name="TR_CONFIG_LEVEL_MAX">Max</string>
<string name="TR_CONFIG_LIST">Lijst</string>
<string name="TR_CONFIG_DREIDEL">Dreidel</string>
<string name="TR_CONFIG_TILE_BOARD">Tegels</string>
<string name="TR_CONFIG_BOOK">Boek</string>
@@ -182,8 +181,6 @@
<string name="TR_SCREENORECORD_OPTIONS">Opname-opties</string>
<string name="TR_SCREENORECORD_DEVICE">Apparaat</string>
<string name="TR_SCREENORECORD_INPUT">Input</string>
<string name="TR_SCREENORECORD_CHANNEL_1">Kanaal 1</string>
<string name="TR_SCREENORECORD_CHANNEL_2">Kanaal 2</string>
<string name="TR_SCREENORECORD_MIC_DELAY">Microfoonvertraging</string>
<string name="TR_SCREENORECORD_MIC_WARNING">Waarschuwing: Ten minste één speler is toegewezen aan twee microfoons.</string>
<string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Vertragingstest</string>
Output/Languages/English.xml
+73 -61
View File
@@ -11,7 +11,7 @@
<string name="TR_DEBUG_VIDEO_STREAMS">Video streams</string>
<string name="TR_DEBUG_TEXTURES">Textures</string>
<string name="TR_DEBUG_TONE_ABS">ToneAbs</string>
<string name="TR_DEBUG_MAX_VOLUME">Max Volume</string>
<string name="TR_DEBUG_MAX_VOLUME">Max volume</string>
<string name="TR_DEBUG_SONGS">Loaded songs</string>
<string name="TR_DEBUG_MOUSE">Mouse</string>
<string name="TR_DEBUG_MEMORY">Memory usage</string>
@@ -28,9 +28,9 @@
<string name="TR_RATING_AMATEUR">Amateur</string>
<string name="TR_RATING_TONE_DEAF">Tone Deaf</string>
<string name="TR_USERROLE_GUEST">Guest</string>
<string name="TR_USERROLE_NORMAL">Normal User</string>
<string name="TR_USERROLE_NORMAL">Normal user</string>
<string name="TR_USERROLE_ADMIN">Administrator</string>
<string name="TR_USERROLE_KEYBOARDUSER">Keyboard User</string>
<string name="TR_USERROLE_KEYBOARDUSER">Keyboard user</string>
<string name="TR_CONFIG_SOFTWARE">Software</string>
<string name="TR_CONFIG_OPENGL">OpenGL</string>
<string name="TR_CONFIG_DIRECT3D">Direct3D</string>
@@ -46,19 +46,19 @@
<string name="TR_CONFIG_LEVEL2">Level 2</string>
<string name="TR_CONFIG_LEVEL3">Level 3</string>
<string name="TR_CONFIG_LEVEL_MAX">Max</string>
<string name="TR_CONFIG_LIST">Song List</string>
<string name="TR_CONFIG_LIST">List</string>
<string name="TR_CONFIG_DREIDEL">Dreidel</string>
<string name="TR_CONFIG_TILE_BOARD">TileBoard</string>
<string name="TR_CONFIG_TILE_BOARD">Tiles</string>
<string name="TR_CONFIG_BOOK">Book</string>
<string name="TR_CONFIG_COVERLOADING_ONDEMAND">On Demand</string>
<string name="TR_CONFIG_COVERLOADING_ATSTART">At Startup</string>
<string name="TR_CONFIG_COVERLOADING_ONDEMAND">On demand</string>
<string name="TR_CONFIG_COVERLOADING_ATSTART">At startup</string>
<string name="TR_CONFIG_COVERLOADING_DYNAMIC">Dynamic</string>
<string name="TR_CONFIG_NONE">None</string>
<string name="TR_CONFIG_RANDOM">Random</string>
<string name="TR_CONFIG_FOLDER">Folder</string>
<string name="TR_CONFIG_ARTIST">Artist</string>
<string name="TR_CONFIG_ARTIST_LETTER">Artist Letter</string>
<string name="TR_CONFIG_TITLE_LETTER">Title Letter</string>
<string name="TR_CONFIG_ARTIST_LETTER">Artist by letter</string>
<string name="TR_CONFIG_TITLE_LETTER">Title by letter</string>
<string name="TR_CONFIG_EDITION">Edition</string>
<string name="TR_CONFIG_GENRE">Genre</string>
<string name="TR_CONFIG_YEAR">Year</string>
@@ -73,20 +73,26 @@
<string name="TR_CONFIG_TIMERMODE_TOTAL">Total</string>
<string name="TR_CONFIG_TIMERLOOK_NORMAL">Normal</string>
<string name="TR_CONFIG_TIMERLOOK_EXPANDED">Expanded</string>
<string name="TR_CONFIG_OWN_MUSIC">Own Music and Background Music</string>
<string name="TR_CONFIG_NO_OWN_MUSIC">No own Music</string>
<string name="TR_CONFIG_ONLY_OWN_MUSIC">Only own Music</string>
<string name="TR_CONFIG_HIGHSCORE_LIST_ALL">List all</string>
<string name="TR_CONFIG_HIGHSCORE_LIST_BEST">List best</string>
<string name="TR_CONFIG_OWN_MUSIC">Own music and background-music</string>
<string name="TR_CONFIG_NO_OWN_MUSIC">No own music</string>
<string name="TR_CONFIG_ONLY_OWN_MUSIC">Only own music</string>
<string name="TR_CONFIG_ONLY_SONG">Only selected song</string>
<string name="TR_CONFIG_FADEPLAYERINFO_ALL">All</string>
<string name="TR_CONFIG_FADEPLAYERINFO_INFO">Only names and avatars</string>
<string name="TR_CONFIG_FADEPLAYERINFO_OFF">Nothing</string>
<string name="TR_CONFIG_LYRICSTYLE_FILL">Fill</string>
<string name="TR_CONFIG_LYRICSTYLE_JUMP">Jump</string>
<string name="TR_CONFIG_LYRICSTYLE_SLIDE">Slide</string>
<string name="TR_CONFIG_LYRICSTYLE_ZOOM">Zoom</string>
<string name="TR_CONFIG_LYRICSPOSITION_BOTTOM">Bottom</string>
<string name="TR_CONFIG_LYRICSPOSITION_TOP">Top</string>
<string name="TR_CONFIG_LYRICSPOSITION_BOTH">Top and bottom</string>
<string name="TR_CONFIG_LYRICSPOSITION_DYNAMIC">Dynamic</string>
<string name="TR_SCREENLOAD_LOADING">Loading</string>
<string name="TR_SCREENLOAD_TOTAL">Total</string>
<string name="TR_SCREENLOAD_SONGS">Songs</string>
<string name="TR_SCREENLOAD_SONGS">songs</string>
<string name="TR_SCREENLOAD_LOADED">loaded</string>
<string name="TR_SCREENMAIN_MENU">Main Menu</string>
<string name="TR_SCREENMAIN_BUTTON_SING">Sing</string>
@@ -94,8 +100,8 @@
<string name="TR_SCREENMAIN_BUTTON_OPTIONS">Options</string>
<string name="TR_SCREENMAIN_BUTTON_PROFILES">Profiles</string>
<string name="TR_SCREENMAIN_TEXT_NOPROFILES">No profiles found!</string>
<string name="TR_SCREENPARTY_TITLE">Party Mode Selection</string>
<string name="TR_SCREENPARTY_MODES">Party Mode</string>
<string name="TR_SCREENPARTY_TITLE">Party-Mode Selection</string>
<string name="TR_SCREENPARTY_MODES">Party-mode</string>
<string name="TR_SCREENPARTY_DESCRIPTION">Description</string>
<string name="TR_SCREENPARTY_AUTHOR">Author</string>
<string name="TR_SCREENPARTY_VERSION">Version</string>
@@ -108,12 +114,12 @@
<string name="TR_SCREENPARTY_NUMPLAYERS">Number of players</string>
<string name="TR_SCREENNAMES_MENU">Player Selection</string>
<string name="TR_SCREENNAMES_PLAYER">Player</string>
<string name="TR_SCREENNAMES_1PLAYER">1 Player</string>
<string name="TR_SCREENNAMES_2PLAYER">2 Player</string>
<string name="TR_SCREENNAMES_3PLAYER">3 Player</string>
<string name="TR_SCREENNAMES_4PLAYER">4 Player</string>
<string name="TR_SCREENNAMES_5PLAYER">5 Player</string>
<string name="TR_SCREENNAMES_6PLAYER">6 Player</string>
<string name="TR_SCREENNAMES_1PLAYER">1 player</string>
<string name="TR_SCREENNAMES_2PLAYER">2 players</string>
<string name="TR_SCREENNAMES_3PLAYER">3 players</string>
<string name="TR_SCREENNAMES_4PLAYER">4 players</string>
<string name="TR_SCREENNAMES_5PLAYER">5 players</string>
<string name="TR_SCREENNAMES_6PLAYER">6 players</string>
<string name="TR_SCREENNAMES_WARNING_MICS_SG">Warning: There is no mic assigned to player %v!</string>
<string name="TR_SCREENNAMES_WARNING_MICS_PL">Warning: There are no mics assigned to players %v!</string>
<string name="TR_SCREENNAMES_WARNING_PROFILES_SG">Warning: There is no profile assigned to player %v!</string>
@@ -130,16 +136,16 @@
<string name="TR_SCREENSONG_BUTTON_OPEN_SELECTED_ITEM">Select</string>
<string name="TR_SCREENSONG_BUTTON_RANDOMMEDLEY">Sing a random medley</string>
<string name="TR_SCREENSONG_BUTTON_STARTMEDLEY">Sing medley-songs</string>
<string name="TR_SCREENSONG_NEWPLAYLIST">New Playlist</string>
<string name="TR_SCREENSONG_NEWPLAYLIST">New playlist</string>
<string name="TR_SCREENSONG_SONGOPTIONS">Song Options</string>
<string name="TR_SCREENSONG_SEARCH">Search:</string>
<string name="TR_SCREENSONG_NOLANGUAGE">No Language</string>
<string name="TR_SCREENSONG_NOLANGUAGE">No language</string>
<string name="TR_SCREENSONG_NOYEAR">No Year</string>
<string name="TR_SCREENSONG_NOGENRE">No Genre</string>
<string name="TR_SCREENSONG_NOEDITION">No Edition</string>
<string name="TR_SCREENSONG_ALLSONGS">All Songs</string>
<string name="TR_SCREENSONG_NUMSONGS">(%v Songs)</string>
<string name="TR_SCREENSONG_NUMSONG">(%v Song)</string>
<string name="TR_SCREENSONG_NUMSONGS">(%v songs)</string>
<string name="TR_SCREENSONG_NUMSONG">(%v song)</string>
<string name="TR_SCREENSONG_ARTIST_TITLE">%a - %t</string>
<string name="TR_SCREENSING_PAUSE">Pause</string>
<string name="TR_SCREENSING_BUTTON_CANCEL">Stop singing</string>
@@ -152,18 +158,18 @@
<string name="TR_SCREENSCORE_OVERALLSCORE">Overall score</string>
<string name="TR_SCREENHIGHSCORE_HIGHSCORE">Highscore</string>
<string name="TR_SCREENPROFILES_PROFILES">Profiles</string>
<string name="TR_SCREENPROFILES_PLAYERNAME">Player Name</string>
<string name="TR_SCREENPROFILES_GAMEDIFFICULTY">Game Difficulty</string>
<string name="TR_SCREENPROFILES_PLAYERNAME">Player name</string>
<string name="TR_SCREENPROFILES_GAMEDIFFICULTY">Game difficulty</string>
<string name="TR_SCREENPROFILES_AVATAR">Avatar</string>
<string name="TR_SCREENPROFILES_USERROLE">User Role</string>
<string name="TR_SCREENPROFILES_USERROLE">User role</string>
<string name="TR_SCREENPROFILES_ACTIVE">Active</string>
<string name="TR_SCREENPROFILES_BUTTON_NEW">New</string>
<string name="TR_SCREENPROFILES_BUTTON_DELETE">Delete</string>
<string name="TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT">Take Snapshot</string>
<string name="TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT">Save Snapshot</string>
<string name="TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT">Delete Snapshot</string>
<string name="TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT">Take snapshot</string>
<string name="TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT">Save snapshot</string>
<string name="TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT">Delete snapshot</string>
<string name="TR_SCREENPROFILES_BUTTON_WEBCAM">Webcam</string>
<string name="TR_SCREENO_OPTIONS">Menu Options</string>
<string name="TR_SCREENO_OPTIONS">Options</string>
<string name="TR_SCREENO_BUTTON_GAME">Game</string>
<string name="TR_SCREENO_BUTTON_SOUND">Sound</string>
<string name="TR_SCREENO_BUTTON_RECORD">Record</string>
@@ -173,48 +179,54 @@
<string name="TR_SCREENOGAME_BUTTON_SERVER">Server address</string>
<string name="TR_SCREENOGAME_OPTIONS">Game Options</string>
<string name="TR_SCREENOGAME_LANGUAGE">Language</string>
<string name="TR_SCREENOGAME_DEBUGLEVEL">Debug Level</string>
<string name="TR_SCREENOGAME_SONGMENU">Song Menu</string>
<string name="TR_SCREENOGAME_SONGSORTING">Song Sorting</string>
<string name="TR_SCREENOGAME_DEBUGLEVEL">Debug level</string>
<string name="TR_SCREENOGAME_SONGMENU">Song-menu style</string>
<string name="TR_SCREENOGAME_SONGSORTING">Song sorting</string>
<string name="TR_SCREENOGAME_TABS">Tabs</string>
<string name="TR_SCREENOGAME_DIFFICULTY">Game Difficulty</string>
<string name="TR_SCREENOGAME_TIMERMODE">Timer-Mode</string>
<string name="TR_SCREENOGAME_DIFFICULTY">Game difficulty</string>
<string name="TR_SCREENOGAME_TIMERMODE">Timer mode</string>
<string name="TR_SCREENOGAME_HIGHSCORESTYLE">Highscore style</string>
<string name="TR_SCREENORECORD_OPTIONS">Record Options</string>
<string name="TR_SCREENORECORD_DEVICE">Device</string>
<string name="TR_SCREENORECORD_INPUT">Input</string>
<string name="TR_SCREENORECORD_CHANNEL_1">Channel 1</string>
<string name="TR_SCREENORECORD_CHANNEL_2">Channel 2</string>
<string name="TR_SCREENORECORD_MIC_DELAY">Mic Delay</string>
<string name="TR_SCREENORECORD_PLAYER_1">Player 1</string>
<string name="TR_SCREENORECORD_PLAYER_2">Player 2</string>
<string name="TR_SCREENORECORD_PLAYER_3">Player 3</string>
<string name="TR_SCREENORECORD_PLAYER_4">Player 4</string>
<string name="TR_SCREENORECORD_PLAYER_5">Player 5</string>
<string name="TR_SCREENORECORD_PLAYER_6">Player 6</string>
<string name="TR_SCREENORECORD_MIC_DELAY">Mic delay</string>
<string name="TR_SCREENORECORD_MIC_WARNING">Warning: At least one player is assigned to two mics.</string>
<string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Delay Test</string>
<string name="TR_SCREENOSOUND_OPTIONS">Options Sound</string>
<string name="TR_SCREENOSOUND_BACKGROUNDMUSIC">Background Music</string>
<string name="TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME">Background Music Volume</string>
<string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Background Music Source</string>
<string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Preview Music Volume</string>
<string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Game Music Volume</string>
<string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Delay test</string>
<string name="TR_SCREENOSOUND_OPTIONS">Sound Options</string>
<string name="TR_SCREENOSOUND_BACKGROUNDMUSIC">Background music</string>
<string name="TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME">Background-music volume</string>
<string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Background-music source</string>
<string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Preview-music volume</string>
<string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Game-music volume</string>
<string name="TR_SCREENOSOUND_KARAOKEEFFECT">Karaoke effect</string>
<string name="TR_SCREENOTHEME_OPTIONS">Theme Options</string>
<string name="TR_SCREENOTHEME_THEME">Theme</string>
<string name="TR_SCREENOTHEME_SKIN">Skin</string>
<string name="TR_SCREENOTHEME_COVERTHEME">Cover Theme</string>
<string name="TR_SCREENOTHEME_NOTELINES">Show Note-Lines</string>
<string name="TR_SCREENOTHEME_TONEHELPER">Show Tone-Helper</string>
<string name="TR_SCREENOTHEME_TIMERLOOK">Timer-Look</string>
<string name="TR_SCREENOTHEME_FADEINFO">Fade player-info</string>
<string name="TR_SCREENOTHEME_COVERLOADING">Cover Loading Behavior</string>
<string name="TR_SCREENOTHEME_COVERTHEME">Cover theme</string>
<string name="TR_SCREENOTHEME_NOTELINES">Show note lines</string>
<string name="TR_SCREENOTHEME_TONEHELPER">Show tone-helper</string>
<string name="TR_SCREENOTHEME_TIMERLOOK">Timeline mode</string>
<string name="TR_SCREENOTHEME_FADEINFO">Fade player info</string>
<string name="TR_SCREENOTHEME_COVERLOADING">Cover-loading behavior</string>
<string name="TR_SCREENOLYRICS_OPTIONS">Lyrics Options</string>
<string name="TR_SCREENOLYRICS_STYLE">Style</string>
<string name="TR_SCREENOLYRICS_STYLE">Animation style</string>
<string name="TR_SCREENOLYRICS_POSITION">Lyrics position</string>
<string name="TR_SCREENOVIDEO_OPTIONS">Video Options</string>
<string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Video Backgrounds</string>
<string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Video Preview</string>
<string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Video backgrounds</string>
<string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Video preview</string>
<string name="TR_SCREENOVIDEO_VIDEOINSONGS">Videos while singing</string>
<string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Display current backgroundmusic video</string>
<string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Display current background-music video</string>
<string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webcams</string>
<string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webcam-Resolution</string>
<string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Screen adjustments</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Press CTR + ALT (+ SHIFT) + Arrows|\"+\" to adjust screen</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTR + ALT + 0 to reset</string>
<string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webcam resolution</string>
<string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Adjust screen</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Press CTRL + ALT (+ SHIFT) + Arrows to adjust screen</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTRL + ALT + 0 to reset</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Top left</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Top right</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Bottom left</string>
Output/Languages/French.xml
-3
View File
@@ -46,7 +46,6 @@
<string name="TR_CONFIG_LEVEL2">Niveau 2</string>
<string name="TR_CONFIG_LEVEL3">Niveau 3</string>
<string name="TR_CONFIG_LEVEL_MAX">Max</string>
<string name="TR_CONFIG_LIST">Liste</string>
<string name="TR_CONFIG_DREIDEL">Caroussel</string>
<string name="TR_CONFIG_TILE_BOARD">Damier</string>
<string name="TR_CONFIG_BOOK">Livre</string>
@@ -182,8 +181,6 @@
<string name="TR_SCREENORECORD_OPTIONS">Options d'Enregistrement</string>
<string name="TR_SCREENORECORD_DEVICE">Appareil</string>
<string name="TR_SCREENORECORD_INPUT">Entrée</string>
<string name="TR_SCREENORECORD_CHANNEL_1">Canal 1</string>
<string name="TR_SCREENORECORD_CHANNEL_2">Canal 2</string>
<string name="TR_SCREENORECORD_MIC_DELAY">Retard du Micro</string>
<string name="TR_SCREENORECORD_MIC_WARNING">Attention: Au moins un des joueurs est assigné à 2 micros.</string>
<string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Test du Retard</string>
Output/Languages/German.xml
+8 -4
View File
@@ -46,7 +46,7 @@
<string name="TR_CONFIG_LEVEL2">Level 2</string>
<string name="TR_CONFIG_LEVEL3">Level 3</string>
<string name="TR_CONFIG_LEVEL_MAX">Maximal</string>
<string name="TR_CONFIG_LIST">Songliste</string>
<string name="TR_CONFIG_LIST">Song-Liste</string>
<string name="TR_CONFIG_DREIDEL">Dreidel</string>
<string name="TR_CONFIG_TILE_BOARD">TileBoard</string>
<string name="TR_CONFIG_BOOK">Book</string>
@@ -101,7 +101,7 @@
<string name="TR_SCREENPARTY_VERSION">Version</string>
<string name="TR_SCREENPARTY_ERROR">Dieser Party-Modus konnte nicht geladen werden.</string>
<string name="TR_SCREENPARTY_ERROR_MICS">Es sind keine Mikros konfiguriert!</string>
<string name="TR_SCREENPARTY_ERROR_MIC_NUM">Für diesen Party-Modus werden %d Mikros benötigt!</string>
<string name="TR_SCREENPARTY_ERROR_MIC_NUM">Für diesen Modus werden %d Mikrofone benötigt!</string>
<string name="TR_SCREENPARTY_TARGETAUDIENCE">Zielgruppe</string>
<string name="TR_SCREENPARTY_NOTEAMS">Keine Teams</string>
<string name="TR_SCREENPARTY_NUMTEAMS">Anzahl der Teams</string>
@@ -182,8 +182,12 @@
<string name="TR_SCREENORECORD_OPTIONS">Aufnahmeeinstellungen</string>
<string name="TR_SCREENORECORD_DEVICE">Soundkarte</string>
<string name="TR_SCREENORECORD_INPUT">Eingang</string>
<string name="TR_SCREENORECORD_CHANNEL_1">Kanal 1</string>
<string name="TR_SCREENORECORD_CHANNEL_2">Kanal 2</string>
<string name="TR_SCREENORECORD_PLAYER_1">Spieler 1</string>
<string name="TR_SCREENORECORD_PLAYER_2">Spieler 2</string>
<string name="TR_SCREENORECORD_PLAYER_3">Spieler 3</string>
<string name="TR_SCREENORECORD_PLAYER_4">Spieler 4</string>
<string name="TR_SCREENORECORD_PLAYER_5">Spieler 5</string>
<string name="TR_SCREENORECORD_PLAYER_6">Spieler 6</string>
<string name="TR_SCREENORECORD_MIC_DELAY">Mikrofon-Verzögerung</string>
<string name="TR_SCREENORECORD_MIC_WARNING">Warnung: Momentan sind einem Spieler zwei Mikrofone zugeordnet!</string>
<string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Verzögerungs-Test</string>
Output/Languages/Hungarian.xml
+38 -13
View File
@@ -9,11 +9,12 @@
<string name="TR_BUTTON_START">Kiválasztás</string>
<string name="TR_DEBUG_AUDIO_STREAMS">Audio streams</string>
<string name="TR_DEBUG_VIDEO_STREAMS">Video streams</string>
<string name="TR_DEBUG_TEXTURES">Textures</string>
<string name="TR_DEBUG_TEXTURES">Textúrák</string>
<string name="TR_DEBUG_TONE_ABS">ToneAbs</string>
<string name="TR_DEBUG_MAX_VOLUME">Max Volume</string>
<string name="TR_DEBUG_SONGS">Loaded songs</string>
<string name="TR_DEBUG_MOUSE">Mouse</string>
<string name="TR_DEBUG_MAX_VOLUME">Max Hangerő</string>
<string name="TR_DEBUG_SONGS">Betöltött dalok</string>
<string name="TR_DEBUG_MOUSE">Egér</string>
<string name="TR_DEBUG_MEMORY">Memóriahasználat</string>
<string name="TR_GAMEMODE_NORMAL">Normál</string>
<string name="TR_GAMEMODE_DUET">Duett</string>
<string name="TR_GAMEMODE_MEDLEY">Dalrészlet</string>
@@ -26,6 +27,9 @@
<string name="TR_RATING_WANNABE">Fejlődőképes</string>
<string name="TR_RATING_AMATEUR">Amatőr</string>
<string name="TR_RATING_TONE_DEAF">Botfülű</string>
<string name="TR_USERROLE_GUEST">Vendég</string>
<string name="TR_USERROLE_NORMAL">Normál felhasználó</string>
<string name="TR_USERROLE_ADMIN">Adminisztrátor</string>
<string name="TR_CONFIG_SOFTWARE">Szoftveres</string>
<string name="TR_CONFIG_OPENGL">OpenGL</string>
<string name="TR_CONFIG_DIRECT3D">Direct3D</string>
@@ -36,12 +40,11 @@
<string name="TR_CONFIG_TEXTURE_HIGHEST">Legmagasabb</string>
<string name="TR_CONFIG_OFF">Ki</string>
<string name="TR_CONFIG_ON">Be</string>
<string name="TR_CONFIG_ONLY_FPS">Only FPS</string>
<string name="TR_CONFIG_LEVEL1">Level 1</string>
<string name="TR_CONFIG_LEVEL2">Level 2</string>
<string name="TR_CONFIG_LEVEL3">Level 3</string>
<string name="TR_CONFIG_ONLY_FPS">Csak FPS</string>
<string name="TR_CONFIG_LEVEL1">1. Szint</string>
<string name="TR_CONFIG_LEVEL2">2. Szint</string>
<string name="TR_CONFIG_LEVEL3">3. Szint</string>
<string name="TR_CONFIG_LEVEL_MAX">Max</string>
<string name="TR_CONFIG_LIST">Lista</string>
<string name="TR_CONFIG_DREIDEL">Körhinta</string>
<string name="TR_CONFIG_TILE_BOARD">Csempe</string>
<string name="TR_CONFIG_BOOK">Könyv</string>
@@ -59,6 +62,7 @@
<string name="TR_CONFIG_YEAR">Év</string>
<string name="TR_CONFIG_DECADE">Évtized</string>
<string name="TR_CONFIG_LANGUAGE">Nyelv</string>
<string name="TR_CONFIG_DATEADDED">Hozzáadva</string>
<string name="TR_CONFIG_EASY">Könnyű</string>
<string name="TR_CONFIG_NORMAL">Normál</string>
<string name="TR_CONFIG_HARD">Nehéz</string>
@@ -70,24 +74,31 @@
<string name="TR_CONFIG_OWN_MUSIC">Saját és Háttérzene</string>
<string name="TR_CONFIG_NO_OWN_MUSIC">Nincs Saját Zene</string>
<string name="TR_CONFIG_ONLY_OWN_MUSIC">Csak Saját zene</string>
<string name="TR_CONFIG_ONLY_SONG">Csak a kiválasztott dal</string>
<string name="TR_CONFIG_FADEPLAYERINFO_ALL">Mindent</string>
<string name="TR_CONFIG_FADEPLAYERINFO_INFO">Csak Nevek és Profilképek</string>
<string name="TR_CONFIG_FADEPLAYERINFO_OFF">Semmit</string>
<string name="TR_CONFIG_LYRICSPOSITION_BOTTOM">Alul</string>
<string name="TR_CONFIG_LYRICSPOSITION_TOP">Felül</string>
<string name="TR_CONFIG_LYRICSPOSITION_BOTH">Felül és alul</string>
<string name="TR_CONFIG_LYRICSPOSITION_DYNAMIC">Dinamikusan</string>
<string name="TR_SCREENLOAD_LOADING">Betöltés</string>
<string name="TR_SCREENLOAD_TOTAL">Összes</string>
<string name="TR_SCREENLOAD_SONGS">Dalok</string>
<string name="TR_SCREENLOAD_TOTAL">Összesen</string>
<string name="TR_SCREENLOAD_SONGS">dal</string>
<string name="TR_SCREENLOAD_LOADED">betöltve</string>
<string name="TR_SCREENMAIN_MENU">Főmenü</string>
<string name="TR_SCREENMAIN_BUTTON_SING">Éneklés</string>
<string name="TR_SCREENMAIN_BUTTON_PARTY">Buli</string>
<string name="TR_SCREENMAIN_BUTTON_OPTIONS">Beállítások</string>
<string name="TR_SCREENMAIN_BUTTON_PROFILES">Profilok</string>
<string name="TR_SCREENMAIN_TEXT_NOPROFILES">Nincsenek profilok! </string>
<string name="TR_SCREENPARTY_TITLE">Parti Mód Választás</string>
<string name="TR_SCREENPARTY_MODES">Parti Mód</string>
<string name="TR_SCREENPARTY_DESCRIPTION">Leírás</string>
<string name="TR_SCREENPARTY_AUTHOR">Készítő</string>
<string name="TR_SCREENPARTY_VERSION">Verzió</string>
<string name="TR_SCREENPARTY_ERROR">Nem Betölthető Parti Mód.</string>
<string name="TR_SCREENPARTY_ERROR_MICS">Nincs mikrofon beállítva! </string>
<string name="TR_SCREENPARTY_TARGETAUDIENCE">Célközönség</string>
<string name="TR_SCREENPARTY_NOTEAMS">Csapatok Nélkül</string>
<string name="TR_SCREENPARTY_NUMTEAMS">Csapatok Száma</string>
@@ -113,6 +124,7 @@
<string name="TR_SCREENSONG_BUTTON_SINGALL">Összes Dal Éneklése</string>
<string name="TR_SCREENSONG_BUTTON_SINGALLVISIBLE">Itt látható Dalok Éneklése</string>
<string name="TR_SCREENSONG_BUTTON_OPENPLAYLIST">Lista Megnyitása</string>
<string name="TR_SCREENSONG_BUTTON_OPEN_SELECTED_ITEM">Kiválaszt</string>
<string name="TR_SCREENSONG_BUTTON_RANDOMMEDLEY">Véletlenszerű Dalrészlet Éneklése</string>
<string name="TR_SCREENSONG_BUTTON_STARTMEDLEY">Dalrészletek Éneklése</string>
<string name="TR_SCREENSONG_NEWPLAYLIST">Új Lista</string>
@@ -125,6 +137,7 @@
<string name="TR_SCREENSONG_ALLSONGS">Minden Dal</string>
<string name="TR_SCREENSONG_NUMSONGS">(%v Dal)</string>
<string name="TR_SCREENSONG_NUMSONG">(%v Dal)</string>
<string name="TR_SCREENSONG_ARTIST_TITLE">%a - %t</string>
<string name="TR_SCREENSING_PAUSE">Szünet</string>
<string name="TR_SCREENSING_BUTTON_CANCEL">Befejezés</string>
<string name="TR_SCREENSING_BUTTON_CONTINUE">Folytatás</string>
@@ -139,6 +152,7 @@
<string name="TR_SCREENPROFILES_PLAYERNAME">Játékos Neve</string>
<string name="TR_SCREENPROFILES_GAMEDIFFICULTY">Nehézségi Szint</string>
<string name="TR_SCREENPROFILES_AVATAR">Profilkép</string>
<string name="TR_SCREENPROFILES_USERROLE">Szerepkor</string>
<string name="TR_SCREENPROFILES_ACTIVE">Jelenlegi</string>
<string name="TR_SCREENPROFILES_BUTTON_NEW">Új</string>
<string name="TR_SCREENPROFILES_BUTTON_DELETE">Törlés</string>
@@ -153,6 +167,7 @@
<string name="TR_SCREENO_BUTTON_VIDEO">Kép</string>
<string name="TR_SCREENO_BUTTON_LYRICS">Dalszöveg</string>
<string name="TR_SCREENO_BUTTON_THEME">Téma</string>
<string name="TR_SCREENOGAME_BUTTON_SERVER">Szerver címe</string>
<string name="TR_SCREENOGAME_OPTIONS">Játék Beállítások</string>
<string name="TR_SCREENOGAME_LANGUAGE">Nyelv</string>
<string name="TR_SCREENOGAME_DEBUGLEVEL">Debug Level</string>
@@ -164,8 +179,6 @@
<string name="TR_SCREENORECORD_OPTIONS">Mikrofon Beállítások</string>
<string name="TR_SCREENORECORD_DEVICE">Eszköz</string>
<string name="TR_SCREENORECORD_INPUT">Bemenet</string>
<string name="TR_SCREENORECORD_CHANNEL_1">Csatorna 1</string>
<string name="TR_SCREENORECORD_CHANNEL_2">Csatorna 2</string>
<string name="TR_SCREENORECORD_MIC_DELAY">Mikrofon Késleltetés</string>
<string name="TR_SCREENORECORD_MIC_WARNING">Figyelem: Egy játékos két mikrofont használ.</string>
<string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Késleltetés Tesztelése</string>
@@ -186,9 +199,21 @@
<string name="TR_SCREENOTHEME_COVERLOADING">Borító Betöltés</string>
<string name="TR_SCREENOLYRICS_OPTIONS">Dalszöveg Beállítások</string>
<string name="TR_SCREENOLYRICS_STYLE">Stílus</string>
<string name="TR_SCREENOLYRICS_POSITION">Dalszöveg helyzete</string>
<string name="TR_SCREENOVIDEO_OPTIONS">Képi Beállítások</string>
<string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Animált Háttér</string>
<string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Videó Előnézet</string>
<string name="TR_SCREENOVIDEO_VIDEOINSONGS">Videó Éneklés Közben</string>
<string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Jelenlegi Háttérzene Videó Mutatása</string>
<string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webkamerák</string>
<string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webkamera-felbontás</string>
<string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Képernyő pozicionálás</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">Visszaállítás: CTRL + ALT + 0</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Bal felső</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Jobb felső</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Bal alsó</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMRIGHT">Jobb alsó</string>
<string name="TR_SCREENPVOLUMECONTROL_VOLUME">Hangerő</string>
<string name="TR_SCREENPSERVERQR_ADDRESS">Szerver címe</string>
<string name="TR_SCREENPSERVERQR_NOTRUNNING">A szerver nem fut. Ellenőrizd a config.xml-t! </string>
</resources>
Output/Languages/Italian.xml
+5 -3
View File
@@ -46,7 +46,7 @@
<string name="TR_CONFIG_LEVEL2">Livello 2</string>
<string name="TR_CONFIG_LEVEL3">Livello 3</string>
<string name="TR_CONFIG_LEVEL_MAX">Max</string>
<string name="TR_CONFIG_LIST">Elenco</string>
<string name="TR_CONFIG_LIST">Lista canzoni</string>
<string name="TR_CONFIG_DREIDEL">Dreidel</string>
<string name="TR_CONFIG_TILE_BOARD">Scacchiera</string>
<string name="TR_CONFIG_BOOK">Libro</string>
@@ -93,6 +93,7 @@
<string name="TR_SCREENMAIN_BUTTON_PARTY">Festa</string>
<string name="TR_SCREENMAIN_BUTTON_OPTIONS">Opzioni</string>
<string name="TR_SCREENMAIN_BUTTON_PROFILES">Profili</string>
<string name="TR_SCREENMAIN_TEXT_NOPROFILES">Nessun profilo trovato!</string>
<string name="TR_SCREENPARTY_TITLE">Seleziona modalità festa</string>
<string name="TR_SCREENPARTY_MODES">Modalità festa</string>
<string name="TR_SCREENPARTY_DESCRIPTION">Descrizione</string>
@@ -100,6 +101,7 @@
<string name="TR_SCREENPARTY_VERSION">Versione</string>
<string name="TR_SCREENPARTY_ERROR">Impossibile caricare questa modalità festa.</string>
<string name="TR_SCREENPARTY_ERROR_MICS">Nessun microfono configurato!</string>
<string name="TR_SCREENPARTY_ERROR_MIC_NUM">%d microfoni richiesti per questa party-mode!</string>
<string name="TR_SCREENPARTY_TARGETAUDIENCE">Target di riferimento</string>
<string name="TR_SCREENPARTY_NOTEAMS">Nessuna squadra</string>
<string name="TR_SCREENPARTY_NUMTEAMS">Numero di squadre</string>
@@ -180,8 +182,6 @@
<string name="TR_SCREENORECORD_OPTIONS">Opzioni registrazione</string>
<string name="TR_SCREENORECORD_DEVICE">Dispositivo</string>
<string name="TR_SCREENORECORD_INPUT">Input</string>
<string name="TR_SCREENORECORD_CHANNEL_1">Canale 1</string>
<string name="TR_SCREENORECORD_CHANNEL_2">Canale 2</string>
<string name="TR_SCREENORECORD_MIC_DELAY">Ritardo microfono</string>
<string name="TR_SCREENORECORD_MIC_WARNING">Attenzione: Ad un giocatore sono assegnati due microfoni.</string>
<string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Test ritardo</string>
@@ -211,6 +211,8 @@
<string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webcam</string>
<string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Risoluzione-Webcam</string>
<string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Sistemazione schermo</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Premi CTR + ALT (+ SHIFT) + Freccia|\"+\" per sistemare lo schermo</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTR + ALT + 0 per ripristinare</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Sopra a sinistra</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Sopra a destra</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Sotto a sinistra</string>
Output/Languages/Portuguese.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="language">Inglês</string>
<string name="language">Português</string>
<string name="TR_PROGRAM_NAME">Vocaluxe</string>
<string name="TR_GENERAL_AND">e</string>
<string name="TR_BUTTON_EXIT">Sair</string>
Output/Languages/Spanish.xml
-3
View File
@@ -46,7 +46,6 @@
<string name="TR_CONFIG_LEVEL2">Nivel 2</string>
<string name="TR_CONFIG_LEVEL3">Nivel 3</string>
<string name="TR_CONFIG_LEVEL_MAX">Máx</string>
<string name="TR_CONFIG_LIST">Lista</string>
<string name="TR_CONFIG_DREIDEL">Dreidel</string>
<string name="TR_CONFIG_TILE_BOARD">Cuadrícula</string>
<string name="TR_CONFIG_BOOK">Libro</string>
@@ -182,8 +181,6 @@
<string name="TR_SCREENORECORD_OPTIONS">Opciones de Grabación</string>
<string name="TR_SCREENORECORD_DEVICE">Dispositivo</string>
<string name="TR_SCREENORECORD_INPUT">Entrada</string>
<string name="TR_SCREENORECORD_CHANNEL_1">Canal 1</string>
<string name="TR_SCREENORECORD_CHANNEL_2">Canal 2</string>
<string name="TR_SCREENORECORD_MIC_DELAY">Retraso del Micrófono</string>
<string name="TR_SCREENORECORD_MIC_WARNING">Advertencia: Al menos un jugador ha sido asignado a dos micrófonos.</string>
<string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Prueba de Retraso</string>
Output/Languages/Swedish.xml
+117 -106
View File
@@ -12,25 +12,25 @@
<string name="TR_DEBUG_TEXTURES">Texturer</string>
<string name="TR_DEBUG_TONE_ABS">ToneAbs</string>
<string name="TR_DEBUG_MAX_VOLUME">Max Volym</string>
<string name="TR_DEBUG_SONGS">Laddade sånger</string>
<string name="TR_DEBUG_SONGS">Laddade låtar</string>
<string name="TR_DEBUG_MOUSE">Mus</string>
<string name="TR_DEBUG_MEMORY">Minnesanvändning</string>
<string name="TR_GAMEMODE_NORMAL">Normal</string>
<string name="TR_GAMEMODE_DUET">Duett</string>
<string name="TR_GAMEMODE_MEDLEY">Medley</string>
<string name="TR_GAMEMODE_SHORTSONG">Kort version</string>
<string name="TR_RATING_VOCAL_HERO">Vokal Hjälte</string>
<string name="TR_RATING_VOCAL_HERO">Sånghjälte</string>
<string name="TR_RATING_SUPERSTAR">Superstjärna</string>
<string name="TR_RATING_LEAD_SINGER">Frontsångare</string>
<string name="TR_RATING_RISING_STAR">Stigande Stjärna</string>
<string name="TR_RATING_HOPEFUL">Hoppfullt</string>
<string name="TR_RATING_WANNABE">Vill Gärna</string>
<string name="TR_RATING_RISING_STAR">Stigande stjärna</string>
<string name="TR_RATING_HOPEFUL">Hoppfull</string>
<string name="TR_RATING_WANNABE">Novis</string>
<string name="TR_RATING_AMATEUR">Amatör</string>
<string name="TR_RATING_TONE_DEAF">Tondöv</string>
<string name="TR_USERROLE_GUEST">Gäst</string>
<string name="TR_USERROLE_NORMAL">Normal Användare</string>
<string name="TR_USERROLE_NORMAL">Normal användare</string>
<string name="TR_USERROLE_ADMIN">Administratör</string>
<string name="TR_USERROLE_KEYBOARDUSER">Tangentbord Användare</string>
<string name="TR_USERROLE_KEYBOARDUSER">Tangentbordsanvändare</string>
<string name="TR_CONFIG_SOFTWARE">Mjukvara</string>
<string name="TR_CONFIG_OPENGL">OpenGL</string>
<string name="TR_CONFIG_DIRECT3D">Direct3D</string>
@@ -41,185 +41,196 @@
<string name="TR_CONFIG_TEXTURE_HIGHEST">Högsta</string>
<string name="TR_CONFIG_OFF">Av</string>
<string name="TR_CONFIG_ON">På</string>
<string name="TR_CONFIG_ONLY_FPS">Endast FPS</string>
<string name="TR_CONFIG_ONLY_FPS">Endast bildfrekvens</string>
<string name="TR_CONFIG_LEVEL1">Nivå 1</string>
<string name="TR_CONFIG_LEVEL2">Nivå 2</string>
<string name="TR_CONFIG_LEVEL3">Nivå 3</string>
<string name="TR_CONFIG_LEVEL_MAX">Max</string>
<string name="TR_CONFIG_LIST">Låtlista</string>
<string name="TR_CONFIG_LIST">Lista</string>
<string name="TR_CONFIG_DREIDEL">Dreidel</string>
<string name="TR_CONFIG_TILE_BOARD">Bricktavla</string>
<string name="TR_CONFIG_TILE_BOARD">Rutnät</string>
<string name="TR_CONFIG_BOOK">Bok</string>
<string name="TR_CONFIG_COVERLOADING_ONDEMAND">På Begäran</string>
<string name="TR_CONFIG_COVERLOADING_ATSTART">Vid Uppstart</string>
<string name="TR_CONFIG_COVERLOADING_ONDEMAND">På begäran</string>
<string name="TR_CONFIG_COVERLOADING_ATSTART">Vid uppstart</string>
<string name="TR_CONFIG_COVERLOADING_DYNAMIC">Dynamiskt</string>
<string name="TR_CONFIG_NONE">Ingen</string>
<string name="TR_CONFIG_RANDOM">Slumpmässig</string>
<string name="TR_CONFIG_FOLDER">Mapp</string>
<string name="TR_CONFIG_ARTIST">Artist</string>
<string name="TR_CONFIG_ARTIST_LETTER">Artist Bokstav</string>
<string name="TR_CONFIG_TITLE_LETTER">Titel Bokstav</string>
<string name="TR_CONFIG_EDITION">Edition</string>
<string name="TR_CONFIG_ARTIST_LETTER">Artist efter bokstav</string>
<string name="TR_CONFIG_TITLE_LETTER">Titel efter bokstav</string>
<string name="TR_CONFIG_EDITION">Utgåva</string>
<string name="TR_CONFIG_GENRE">Genre</string>
<string name="TR_CONFIG_YEAR">År</string>
<string name="TR_CONFIG_DECADE">Årtionde</string>
<string name="TR_CONFIG_LANGUAGE">Språk</string>
<string name="TR_CONFIG_DATEADDED">Tillagd datum</string>
<string name="TR_CONFIG_EASY">Lätt</string>
<string name="TR_CONFIG_NORMAL">Normalt</string>
<string name="TR_CONFIG_HARD">Svårt</string>
<string name="TR_CONFIG_TIMERMODE_CURRENT">Nuvarande</string>
<string name="TR_CONFIG_NORMAL">Medel</string>
<string name="TR_CONFIG_HARD">Svår</string>
<string name="TR_CONFIG_TIMERMODE_CURRENT">Aktuell</string>
<string name="TR_CONFIG_TIMERMODE_REMAINING">Återstående</string>
<string name="TR_CONFIG_TIMERMODE_TOTAL">Totalt</string>
<string name="TR_CONFIG_TIMERMODE_TOTAL">Total</string>
<string name="TR_CONFIG_TIMERLOOK_NORMAL">Normal</string>
<string name="TR_CONFIG_TIMERLOOK_EXPANDED">Utvidgad</string>
<string name="TR_CONFIG_OWN_MUSIC">Egen Musik och Bakgrundsmusik</string>
<string name="TR_CONFIG_NO_OWN_MUSIC">Ingen egen Musik</string>
<string name="TR_CONFIG_ONLY_OWN_MUSIC">Endast egen Musik</string>
<string name="TR_CONFIG_HIGHSCORE_LIST_ALL">Lista alla</string>
<string name="TR_CONFIG_HIGHSCORE_LIST_BEST">Lista bästa</string>
<string name="TR_CONFIG_OWN_MUSIC">Egen musik och bakgrundsmusik</string>
<string name="TR_CONFIG_NO_OWN_MUSIC">Ingen egen musik</string>
<string name="TR_CONFIG_ONLY_OWN_MUSIC">Endast egen musik</string>
<string name="TR_CONFIG_ONLY_SONG">Endast vald låt</string>
<string name="TR_CONFIG_FADEPLAYERINFO_ALL">Alla</string>
<string name="TR_CONFIG_FADEPLAYERINFO_INFO">Endast namn och avatarer</string>
<string name="TR_CONFIG_FADEPLAYERINFO_OFF">Ingenting</string>
<string name="TR_CONFIG_LYRICSTYLE_FILL">Fyll</string>
<string name="TR_CONFIG_LYRICSTYLE_JUMP">Hoppa</string>
<string name="TR_CONFIG_LYRICSTYLE_SLIDE">Svep</string>
<string name="TR_CONFIG_LYRICSTYLE_ZOOM">Zooma</string>
<string name="TR_CONFIG_LYRICSPOSITION_BOTTOM">Nederst</string>
<string name="TR_CONFIG_LYRICSPOSITION_TOP">Överst</string>
<string name="TR_CONFIG_LYRICSPOSITION_BOTH">Överst och nederst</string>
<string name="TR_CONFIG_LYRICSPOSITION_DYNAMIC">Dynamisk</string>
<string name="TR_SCREENLOAD_LOADING">Laddar</string>
<string name="TR_SCREENLOAD_TOTAL">Totalt</string>
<string name="TR_SCREENLOAD_SONGS">Sånger</string>
<string name="TR_SCREENLOAD_LOADED">Laddad</string>
<string name="TR_SCREENMAIN_MENU">Huvud Meny</string>
<string name="TR_SCREENLOAD_SONGS">låtar</string>
<string name="TR_SCREENLOAD_LOADED">laddat</string>
<string name="TR_SCREENMAIN_MENU">Huvudmeny</string>
<string name="TR_SCREENMAIN_BUTTON_SING">Sjung</string>
<string name="TR_SCREENMAIN_BUTTON_PARTY">Party</string>
<string name="TR_SCREENMAIN_BUTTON_OPTIONS">Alternativ</string>
<string name="TR_SCREENMAIN_BUTTON_PROFILES">Profiler</string>
<string name="TR_SCREENMAIN_TEXT_NOPROFILES">Inga profiler funna!</string>
<string name="TR_SCREENPARTY_TITLE">Party Läge Väljare</string>
<string name="TR_SCREENPARTY_MODES">Party Läge</string>
<string name="TR_SCREENPARTY_TITLE">Val av partyläge</string>
<string name="TR_SCREENPARTY_MODES">Partyläge</string>
<string name="TR_SCREENPARTY_DESCRIPTION">Beskrivning</string>
<string name="TR_SCREENPARTY_AUTHOR">Författare</string>
<string name="TR_SCREENPARTY_AUTHOR">Skapare</string>
<string name="TR_SCREENPARTY_VERSION">Version</string>
<string name="TR_SCREENPARTY_ERROR">kan ej ladda detta party läge</string>
<string name="TR_SCREENPARTY_ERROR">Kan ej ladda detta partyläge</string>
<string name="TR_SCREENPARTY_ERROR_MICS">Det finns inga mikrofoner konfigurerade!</string>
<string name="TR_SCREENPARTY_ERROR_MIC_NUM">%d mikrofoner krävs för denna party-mode!</string>
<string name="TR_SCREENPARTY_TARGETAUDIENCE">Mål publik</string>
<string name="TR_SCREENPARTY_ERROR_MIC_NUM">%d mikrofoner krävs för denna partyläge!</string>
<string name="TR_SCREENPARTY_TARGETAUDIENCE">Målgrupp</string>
<string name="TR_SCREENPARTY_NOTEAMS">Inga lag</string>
<string name="TR_SCREENPARTY_NUMTEAMS">Antal lag</string>
<string name="TR_SCREENPARTY_NUMPLAYERS">Antal spelare</string>
<string name="TR_SCREENNAMES_MENU">Spelarväljare</string>
<string name="TR_SCREENNAMES_MENU">Val av spelare</string>
<string name="TR_SCREENNAMES_PLAYER">Spelare</string>
<string name="TR_SCREENNAMES_1PLAYER">Spelare 1</string>
<string name="TR_SCREENNAMES_2PLAYER">Spelare 2</string>
<string name="TR_SCREENNAMES_3PLAYER">Spelare 3</string>
<string name="TR_SCREENNAMES_4PLAYER">Spelare 4</string>
<string name="TR_SCREENNAMES_5PLAYER">Spelare 5</string>
<string name="TR_SCREENNAMES_6PLAYER">Spelare 6</string>
<string name="TR_SCREENNAMES_WARNING_MICS_SG">Varning: Det finns ingen Mic tilldelad Spelare %v!</string>
<string name="TR_SCREENNAMES_WARNING_MICS_PL">Varning: Det finns ingen Micar tilldelad Spelarna %v!</string>
<string name="TR_SCREENNAMES_1PLAYER">1 spelare</string>
<string name="TR_SCREENNAMES_2PLAYER">2 spelare</string>
<string name="TR_SCREENNAMES_3PLAYER">3 spelare</string>
<string name="TR_SCREENNAMES_4PLAYER">4 spelare</string>
<string name="TR_SCREENNAMES_5PLAYER">5 spelare</string>
<string name="TR_SCREENNAMES_6PLAYER">6 spelare</string>
<string name="TR_SCREENNAMES_WARNING_MICS_SG">Varning: Det finns ingen mikrofon tilldelad spelare %v!</string>
<string name="TR_SCREENNAMES_WARNING_MICS_PL">Varning: Det finns inga mikrofoner tilldelade spelare %v!</string>
<string name="TR_SCREENNAMES_WARNING_PROFILES_SG">Varning: Det finns ingen profil för spelare %v!</string>
<string name="TR_SCREENNAMES_WARNING_PROFILES_PL">Varning: Det finns inga profiler för spelare %v!</string>
<string name="TR_SCREENSONG_MENU">Låtval</string>
<string name="TR_SCREENSONG_BUTTON_SING">Sjung</string>
<string name="TR_SCREENSONG_BUTTON_PLAYLIST">Lägg till Spellista</string>
<string name="TR_SCREENSONG_BUTTON_PLAYLIST">Lägg till spellista</string>
<string name="TR_SCREENSONG_BUTTON_CANCEL">Stäng</string>
<string name="TR_SCREENSONG_BUTTON_RANDOM">Välj slumpmässig låt</string>
<string name="TR_SCREENSONG_BUTTON_RANDOMCAT">Välg slumpmässig kategori</string>
<string name="TR_SCREENSONG_BUTTON_RANDOMCAT">Välj slumpmässig kategori</string>
<string name="TR_SCREENSONG_BUTTON_SINGALL">Sjung alla låtar</string>
<string name="TR_SCREENSONG_BUTTON_SINGALLVISIBLE">Sjung alla synliga låtar</string>
<string name="TR_SCREENSONG_BUTTON_OPENPLAYLIST">Öppna spellista</string>
<string name="TR_SCREENSONG_BUTTON_OPEN_SELECTED_ITEM">Välj</string>
<string name="TR_SCREENSONG_BUTTON_RANDOMMEDLEY">Sjung slumpmässig medley</string>
<string name="TR_SCREENSONG_BUTTON_STARTMEDLEY">Sjung medley-låt</string>
<string name="TR_SCREENSONG_NEWPLAYLIST">Ny Spellista</string>
<string name="TR_SCREENSONG_SONGOPTIONS">Låt Alternativ</string>
<string name="TR_SCREENSONG_BUTTON_STARTMEDLEY">Sjung medleylåt</string>
<string name="TR_SCREENSONG_NEWPLAYLIST">Ny spellista</string>
<string name="TR_SCREENSONG_SONGOPTIONS">Låtalternativ</string>
<string name="TR_SCREENSONG_SEARCH">Sök:</string>
<string name="TR_SCREENSONG_NOLANGUAGE">Inget Språk</string>
<string name="TR_SCREENSONG_NOYEAR">Inget År</string>
<string name="TR_SCREENSONG_NOGENRE">Ingen Genre</string>
<string name="TR_SCREENSONG_NOEDITION">Ingen Edition</string>
<string name="TR_SCREENSONG_ALLSONGS">Alla Låtar</string>
<string name="TR_SCREENSONG_NUMSONGS">(%v Låtar)</string>
<string name="TR_SCREENSONG_NUMSONG">(%v Låt)</string>
<string name="TR_SCREENSONG_NOLANGUAGE">Inget språk</string>
<string name="TR_SCREENSONG_NOYEAR">Inget år</string>
<string name="TR_SCREENSONG_NOGENRE">Ingen genre</string>
<string name="TR_SCREENSONG_NOEDITION">Ingen utgåva</string>
<string name="TR_SCREENSONG_ALLSONGS">Alla låtar</string>
<string name="TR_SCREENSONG_NUMSONGS">(%v låtar)</string>
<string name="TR_SCREENSONG_NUMSONG">(%v låt)</string>
<string name="TR_SCREENSONG_ARTIST_TITLE">%a - %t</string>
<string name="TR_SCREENSING_PAUSE">Paus</string>
<string name="TR_SCREENSING_BUTTON_CANCEL">Stoppa Låt</string>
<string name="TR_SCREENSING_BUTTON_CANCEL">Avsluta låt</string>
<string name="TR_SCREENSING_BUTTON_CONTINUE">Fortsätt</string>
<string name="TR_SCREENSING_BUTTON_SKIP">Hoppa över Låt</string>
<string name="TR_SCREENSING_BUTTON_SKIP">Hoppa över låt</string>
<string name="TR_SCREENSCORE_SCORES">Resultat</string>
<string name="TR_SCREENSCORE_RATING">Rankning</string>
<string name="TR_SCREENSCORE_POINTS">Poäng</string>
<string name="TR_SCREENSCORE_GAMEDIFFICULTY">Svårighetsgrad</string>
<string name="TR_SCREENSCORE_OVERALLSCORE">Totalpoäng</string>
<string name="TR_SCREENHIGHSCORE_HIGHSCORE">Highscore</string>
<string name="TR_SCREENHIGHSCORE_HIGHSCORE">Topplista</string>
<string name="TR_SCREENPROFILES_PROFILES">Profiler</string>
<string name="TR_SCREENPROFILES_PLAYERNAME">Spelarnamn</string>
<string name="TR_SCREENPROFILES_GAMEDIFFICULTY">Spelets Svårighetsgrad</string>
<string name="TR_SCREENPROFILES_AVATAR">Avatar</string>
<string name="TR_SCREENPROFILES_GAMEDIFFICULTY">Svårighetsgrad</string>
<string name="TR_SCREENPROFILES_AVATAR">Profilbild</string>
<string name="TR_SCREENPROFILES_USERROLE">Användarroll</string>
<string name="TR_SCREENPROFILES_ACTIVE">Aktiv</string>
<string name="TR_SCREENPROFILES_BUTTON_NEW">Ny</string>
<string name="TR_SCREENPROFILES_BUTTON_DELETE">Ta Bort</string>
<string name="TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT">Ta Ögonblicksbild</string>
<string name="TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT">Spara Ögonblicksbild</string>
<string name="TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT">Ta Bort Ögonblicksbild</string>
<string name="TR_SCREENPROFILES_BUTTON_WEBCAM">Webkamera</string>
<string name="TR_SCREENO_OPTIONS">Meny Alternativ</string>
<string name="TR_SCREENPROFILES_BUTTON_DELETE">Radera</string>
<string name="TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT">Ta ögonblicksbild</string>
<string name="TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT">Spara ögonblicksbild</string>
<string name="TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT">Radera ögonblicksbild</string>
<string name="TR_SCREENPROFILES_BUTTON_WEBCAM">Webbkamera</string>
<string name="TR_SCREENO_OPTIONS">Alternativ</string>
<string name="TR_SCREENO_BUTTON_GAME">Spel</string>
<string name="TR_SCREENO_BUTTON_SOUND">Ljud</string>
<string name="TR_SCREENO_BUTTON_RECORD">Inspelning</string>
<string name="TR_SCREENO_BUTTON_VIDEO">Video</string>
<string name="TR_SCREENO_BUTTON_LYRICS">Låt Text</string>
<string name="TR_SCREENO_BUTTON_LYRICS">Låttext</string>
<string name="TR_SCREENO_BUTTON_THEME">Tema</string>
<string name="TR_SCREENOGAME_BUTTON_SERVER">Server adress</string>
<string name="TR_SCREENOGAME_OPTIONS">Spel Alternativ</string>
<string name="TR_SCREENOGAME_BUTTON_SERVER">Serveradress</string>
<string name="TR_SCREENOGAME_OPTIONS">Spelalternativ</string>
<string name="TR_SCREENOGAME_LANGUAGE">Språk</string>
<string name="TR_SCREENOGAME_DEBUGLEVEL">Felsökningsnivå</string>
<string name="TR_SCREENOGAME_SONGMENU">Låt Meny</string>
<string name="TR_SCREENOGAME_SONGSORTING">Låt Sortering</string>
<string name="TR_SCREENOGAME_SONGMENU">Låtmeny</string>
<string name="TR_SCREENOGAME_SONGSORTING">Låtsortering</string>
<string name="TR_SCREENOGAME_TABS">Flikar</string>
<string name="TR_SCREENOGAME_DIFFICULTY">Spelets Svårighetsgrad</string>
<string name="TR_SCREENOGAME_TIMERMODE">Timer-Läge</string>
<string name="TR_SCREENORECORD_OPTIONS">Inspelnings Alternativ</string>
<string name="TR_SCREENOGAME_DIFFICULTY">Spelets svårighetsgrad</string>
<string name="TR_SCREENOGAME_TIMERMODE">Timerläge</string>
<string name="TR_SCREENOGAME_HIGHSCORESTYLE">Topplistestil</string>
<string name="TR_SCREENORECORD_OPTIONS">Inspelningsalternativ</string>
<string name="TR_SCREENORECORD_DEVICE">Enhet</string>
<string name="TR_SCREENORECORD_INPUT">Ingång</string>
<string name="TR_SCREENORECORD_CHANNEL_1">Kanal 1</string>
<string name="TR_SCREENORECORD_CHANNEL_2">Kanal 2</string>
<string name="TR_SCREENORECORD_MIC_DELAY">Mic Fördröjning</string>
<string name="TR_SCREENORECORD_MIC_WARNING">Varning: Minst en spelare är tilldelad 2 mikrofoner.</string>
<string name="TR_SCREENORECORD_PLAYER_1">Spelare 1</string>
<string name="TR_SCREENORECORD_PLAYER_2">Spelare 2</string>
<string name="TR_SCREENORECORD_PLAYER_3">Spelare 3</string>
<string name="TR_SCREENORECORD_PLAYER_4">Spelare 4</string>
<string name="TR_SCREENORECORD_PLAYER_5">Spelare 5</string>
<string name="TR_SCREENORECORD_PLAYER_6">Spelare 6</string>
<string name="TR_SCREENORECORD_MIC_DELAY">Mikrofonfördröjning</string>
<string name="TR_SCREENORECORD_MIC_WARNING">Varning: Minst en spelare är tilldelad flera mikrofoner.</string>
<string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Fördröjningstest</string>
<string name="TR_SCREENOSOUND_OPTIONS">Alternativ Ljud</string>
<string name="TR_SCREENOSOUND_OPTIONS">Ljudalternativ</string>
<string name="TR_SCREENOSOUND_BACKGROUNDMUSIC">Bakgrundsmusik</string>
<string name="TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME">Bakgrundsmusik Volym</string>
<string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Bakgrundsmusik Källa</string>
<string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Förhandstest Musik Volym</string>
<string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Spel Musik Volym</string>
<string name="TR_SCREENOTHEME_OPTIONS">Tema Alternativ</string>
<string name="TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME">Volym på bakgrundsmusik</string>
<string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Källa för bakgrundsmusik</string>
<string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Volym på förhandsvisning</string>
<string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Volym på musik under spel</string>
<string name="TR_SCREENOTHEME_OPTIONS">Temaalternativ</string>
<string name="TR_SCREENOTHEME_THEME">Tema</string>
<string name="TR_SCREENOTHEME_SKIN">Skin</string>
<string name="TR_SCREENOTHEME_COVERTHEME">Omslag Tema</string>
<string name="TR_SCREENOTHEME_NOTELINES">Visa Not Linjer</string>
<string name="TR_SCREENOTHEME_TONEHELPER">Visa Tone Hjälp</string>
<string name="TR_SCREENOTHEME_TIMERLOOK">Timer Utseende</string>
<string name="TR_SCREENOTHEME_FADEINFO">Tona bort spelar-info</string>
<string name="TR_SCREENOTHEME_COVERLOADING">Beteende För Hur Omslag Laddas</string>
<string name="TR_SCREENOLYRICS_OPTIONS">Låttext Alternativ</string>
<string name="TR_SCREENOLYRICS_STYLE">Utseende</string>
<string name="TR_SCREENOTHEME_SKIN">Skal</string>
<string name="TR_SCREENOTHEME_COVERTHEME">Omslagstema</string>
<string name="TR_SCREENOTHEME_NOTELINES">Visa notlinjer</string>
<string name="TR_SCREENOTHEME_TONEHELPER">Visa tonindikator</string>
<string name="TR_SCREENOTHEME_TIMERLOOK">Tidslinjeläge</string>
<string name="TR_SCREENOTHEME_FADEINFO">Tona spelarinfo</string>
<string name="TR_SCREENOTHEME_COVERLOADING">Omslagsladdning</string>
<string name="TR_SCREENOLYRICS_OPTIONS">Låttextsalternativ</string>
<string name="TR_SCREENOLYRICS_STYLE">Animeringsstil</string>
<string name="TR_SCREENOLYRICS_POSITION">Textposition</string>
<string name="TR_SCREENOVIDEO_OPTIONS">Video Alternativ</string>
<string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Video Bakgrund</string>
<string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Video Förhandsvisning</string>
<string name="TR_SCREENOVIDEO_VIDEOINSONGS">Video Samtidigt Med Låt</string>
<string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Visa Video för nuvarande Bakgrundsmusik</string>
<string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webkameror</string>
<string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webkamera Upplösning</string>
<string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Skärmjusteringar</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Tryck CTR + ALT (+ SHIFT) + Pilar\"+\" för att justera skärmen</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTR + ALT + 0 för att återställa</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Överst till vänster</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Överst till höger</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Nederst till vänster</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMRIGHT">Nederst till höger</string>
<string name="TR_SCREENOVIDEO_OPTIONS">Videoalternativ</string>
<string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Videobakgrund</string>
<string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Videoförhandsvisning</string>
<string name="TR_SCREENOVIDEO_VIDEOINSONGS">Video under spel</string>
<string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Visa video för aktuell bakgrundsmusik</string>
<string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webbkameror</string>
<string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webbkameraupplösning</string>
<string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Justera skärm</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Tryck CTRL + ALT (+ SHIFT) + Pilar för att justera skärmen</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTRL + ALT + 0 för att återställa</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Övre vänster</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Övre höger</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Nedre vänster</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMRIGHT">Nedre höger</string>
<string name="TR_SCREENPVOLUMECONTROL_VOLUME">Volym</string>
<string name="TR_SCREENPSERVERQR_ADDRESS">Server adress</string>
<string name="TR_SCREENPSERVERQR_NOTRUNNING">Servern kan inte nås. Var god kontrollera config.xml!</string>
<string name="TR_SCREENPSERVERQR_ADDRESS">Serveradress</string>
<string name="TR_SCREENPSERVERQR_NOTRUNNING">Servern körs inte. Var god kontrollera config.xml!</string>
</resources>
Output/Languages/Turkish.xml
-3
View File
@@ -41,7 +41,6 @@
<string name="TR_CONFIG_LEVEL2">Seviye 2</string>
<string name="TR_CONFIG_LEVEL3">Seviye 3</string>
<string name="TR_CONFIG_LEVEL_MAX">Max</string>
<string name="TR_CONFIG_LIST">Liste</string>
<string name="TR_CONFIG_DREIDEL">Dreidel</string>
<string name="TR_CONFIG_TILE_BOARD">Döşemeli Pano</string>
<string name="TR_CONFIG_BOOK">Kitap</string>
@@ -164,8 +163,6 @@
<string name="TR_SCREENORECORD_OPTIONS">Kaydetme Seçenekleri</string>
<string name="TR_SCREENORECORD_DEVICE">Aygıt</string>
<string name="TR_SCREENORECORD_INPUT">Giriş</string>
<string name="TR_SCREENORECORD_CHANNEL_1">Kanal 1</string>
<string name="TR_SCREENORECORD_CHANNEL_2">Kanal 2 </string>
<string name="TR_SCREENORECORD_MIC_DELAY">Mikrofon Gecikmesi</string>
<string name="TR_SCREENORECORD_MIC_WARNING">Uyarı: Tek oyuncuya iki mikrofon atandı.</string>
<string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Gecikme Testi</string>
Output/PartyModes/Challenge/Languages/French.xml
+1
View File
@@ -16,6 +16,7 @@
<string name="TR_SCREENCONFIG_NUMMICS">Nombre de micros</string>
<string name="TR_SCREENCONFIG_NUMROUNDS">Nombre de tours</string>
<string name="TR_SCREENNAMES_TITLE">Mode Challenge: Choix des joueurs</string>
<string name="TR_SCREENNAMES_BUTTON_RANDOM">Sélectionner au hasard</string>
<string name="TR_SCREENMAIN_TITLE">Mode Challenge: Résumé</string>
<string name="TR_SCREENMAIN_TABLE_POS">Pos</string>
<string name="TR_SCREENMAIN_TABLE_PLAYERNAME">Nom</string>
Output/PartyModes/Challenge/Languages/Hungarian.xml
+1
View File
@@ -16,6 +16,7 @@
<string name="TR_SCREENCONFIG_NUMMICS">Mikrofonok Száma</string>
<string name="TR_SCREENCONFIG_NUMROUNDS">Körök Száma</string>
<string name="TR_SCREENNAMES_TITLE">Bajnokság Mód: Válassz Játékost</string>
<string name="TR_SCREENNAMES_BUTTON_RANDOM">Véletlenszerű választás</string>
<string name="TR_SCREENMAIN_TITLE">Bajnokság Mód: Áttekintés</string>
<string name="TR_SCREENMAIN_TABLE_POS">Poz</string>
<string name="TR_SCREENMAIN_TABLE_PLAYERNAME">Név</string>
Output/PartyModes/Challenge/Languages/Italian.xml
+2
View File
@@ -15,6 +15,8 @@
<string name="TR_SCREENCONFIG_NUMPLAYERS">Numero di giocatori</string>
<string name="TR_SCREENCONFIG_NUMMICS">Numero di microfoni</string>
<string name="TR_SCREENCONFIG_NUMROUNDS">Numero di turni</string>
<string name="TR_SCREENCONFIG_NUMJOKERS">Numero di giullari</string>
<string name="TR_SCREENCONFIG_REFILLJOKERS">Ricarica i giullari ogni turno</string>
<string name="TR_SCREENNAMES_TITLE">Modalità Sfida: Scegli il Giocatore</string>
<string name="TR_SCREENNAMES_BUTTON_RANDOM">Selezione casuale</string>
<string name="TR_SCREENMAIN_TITLE">Modalità Sfida: Panoramica</string>
Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
+1 -1
View File
@@ -187,7 +187,7 @@
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>1)</Text>
<Text />
</Text>
<Text Name="TextRoundPlayer">
<X>0</X>
Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
+1 -1
View File
@@ -187,7 +187,7 @@
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>1)</Text>
<Text />
</Text>
<Text Name="TextRoundPlayer">
<X>0</X>
Output/Themes/Ambient/Screens/ScreenHighscore.xml
+2 -2
View File
@@ -98,7 +98,7 @@
<X>120</X>
<Y>160</Y>
<Z>0</Z>
<H>42</H>
<H>35</H>
<MaxW>0</MaxW>
<Color Name="StaticColor" />
<SelColor Name="TextSelColor" />
@@ -792,4 +792,4 @@
</ParticleEffect>
</ParticleEffects>
<ScreenSettings />
</Screen>
</Screen>
Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
+57 -1
View File
@@ -2,7 +2,7 @@
<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Informations>
<ScreenName>ScreenOptionsGame</ScreenName>
<ScreenVersion>2</ScreenVersion>
<ScreenVersion>3</ScreenVersion>
</Informations>
<Backgrounds>
<Background Name="Background1">
@@ -191,6 +191,20 @@
<Font>Outline</Font>
<Text>TR_SCREENOGAME_TIMERMODE</Text>
</Text>
<Text Name="Text8">
<X>75</X>
<Y>467</Y>
<Z>0</Z>
<H>27</H>
<MaxW>0</MaxW>
<Color Name="StaticColor" />
<SelColor Name="TextSelColor" />
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENOGAME_HIGHSCORESTYLE</Text>
</Text>
</Texts>
<Buttons>
<Button Name="ButtonExit">
@@ -519,6 +533,48 @@
<TextStyle>Bold</TextStyle>
<NumVisible>3</NumVisible>
</SelectSlide>
<SelectSlide Name="SelectSlideHighscoreStyle">
<Skin/>
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<Rect>
<X>500</X>
<Y>460</Y>
<W>700</W>
<H>50</H>
<Z>0</Z>
</Rect>
<RectArrowLeft>
<X>505</X>
<Y>465</Y>
<W>40</W>
<H>40</H>
<Z>0</Z>
</RectArrowLeft>
<RectArrowRight>
<X>1170</X>
<Y>465</Y>
<W>40</W>
<H>40</H>
<Z>0</Z>
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SelColor Name="SelectSlideSelColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSelColor Name="ArrowSelColor" />
<TextColor Name="TextColor" />
<TextSelColor Name="TextSelColor" />
<TextH>27</TextH>
<TextRelativeX>50</TextRelativeX>
<TextRelativeY>0</TextRelativeY>
<TextMaxW>205.33</TextMaxW>
<TextFont>Outline</TextFont>
<TextStyle>Bold</TextStyle>
<NumVisible>2</NumVisible>
</SelectSlide>
</SelectSlides>
<SingNotes />
<NameSelections />
Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
+428 -42
View File
@@ -2,7 +2,7 @@
<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Informations>
<ScreenName>ScreenOptionsRecord</ScreenName>
<ScreenVersion>4</ScreenVersion>
<ScreenVersion>5</ScreenVersion>
</Informations>
<Backgrounds>
<Background Name="Background1">
@@ -91,7 +91,7 @@
<Z>0</Z>
</Rect>
</Static>
<Static Name="StaticEnergyChannel1">
<Static Name="StaticEnergyPlayer1">
<Skin>EnergyBeam</Skin>
<Color Name="Visible" />
<Rect>
@@ -102,7 +102,7 @@
<Z>0</Z>
</Rect>
</Static>
<Static Name="StaticEnergyChannel2">
<Static Name="StaticEnergyPlayer2">
<Skin>EnergyBeam</Skin>
<Color Name="Visible" />
<Rect>
@@ -112,6 +112,50 @@
<H>16</H>
<Z>0</Z>
</Rect>
</Static>
<Static Name="StaticEnergyPlayer3">
<Skin>EnergyBeam</Skin>
<Color Name="Visible" />
<Rect>
<X>390</X>
<Y>354</Y>
<W>100</W>
<H>16</H>
<Z>0</Z>
</Rect>
</Static>
<Static Name="StaticEnergyPlayer4">
<Skin>EnergyBeam</Skin>
<Color Name="Visible" />
<Rect>
<X>390</X>
<Y>416</Y>
<W>100</W>
<H>16</H>
<Z>0</Z>
</Rect>
</Static>
<Static Name="StaticEnergyPlayer5">
<Skin>EnergyBeam</Skin>
<Color Name="Visible" />
<Rect>
<X>390</X>
<Y>474</Y>
<W>100</W>
<H>16</H>
<Z>0</Z>
</Rect>
</Static>
<Static Name="StaticEnergyPlayer6">
<Skin>EnergyBeam</Skin>
<Color Name="Visible" />
<Rect>
<X>390</X>
<Y>536</Y>
<W>100</W>
<H>16</H>
<Z>0</Z>
</Rect>
</Static>
</Statics>
<Texts>
@@ -145,7 +189,7 @@
</Text>
<Text Name="Text3">
<X>75</X>
<Y>347</Y>
<Y>167</Y>
<Z>0</Z>
<H>27</H>
<MaxW>0</MaxW>
@@ -159,7 +203,7 @@
</Text>
<Text Name="TextWarning">
<X>640</X>
<Y>537</Y>
<Y>615</Y>
<Z>0</Z>
<H>27</H>
<MaxW>970</MaxW>
@@ -171,7 +215,7 @@
<Font>Outline</Font>
<Text>TR_SCREENORECORD_MIC_WARNING</Text>
</Text>
<Text Name="TextChannel1">
<Text Name="TextPlayer1">
<X>75</X>
<Y>227</Y>
<Z>0</Z>
@@ -183,9 +227,9 @@
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENORECORD_CHANNEL_1</Text>
<Text>TR_SCREENORECORD_PLAYER_1</Text>
</Text>
<Text Name="TextChannel2">
<Text Name="TextPlayer2">
<X>75</X>
<Y>287</Y>
<Z>0</Z>
@@ -197,31 +241,143 @@
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENORECORD_CHANNEL_2</Text>
</Text>
<Text Name="TextDelayChannel1">
<X>330</X>
<Y>227</Y>
<Z>-1</Z>
<Text>TR_SCREENORECORD_PLAYER_2</Text>
</Text>
<Text Name="TextPlayer3">
<X>75</X>
<Y>347</Y>
<Z>0</Z>
<H>27</H>
<MaxW>0</MaxW>
<Color Name="StaticColor" />
<SelColor Name="TextSelColor" />
<Align>Right</Align>
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENORECORD_PLAYER_3</Text>
</Text>
<Text Name="TextPlayer4">
<X>75</X>
<Y>407</Y>
<Z>0</Z>
<H>27</H>
<MaxW>0</MaxW>
<Color Name="StaticColor" />
<SelColor Name="TextSelColor" />
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENORECORD_PLAYER_4</Text>
</Text>
<Text Name="TextPlayer5">
<X>75</X>
<Y>467</Y>
<Z>0</Z>
<H>27</H>
<MaxW>0</MaxW>
<Color Name="StaticColor" />
<SelColor Name="TextSelColor" />
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENORECORD_PLAYER_5</Text>
</Text>
<Text Name="TextPlayer6">
<X>75</X>
<Y>527</Y>
<Z>0</Z>
<H>27</H>
<MaxW>0</MaxW>
<Color Name="StaticColor" />
<SelColor Name="TextSelColor" />
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENORECORD_PLAYER_6</Text>
</Text>
<Text Name="TextDelayPlayer1">
<X>320</X>
<Y>227</Y>
<Z>-2</Z>
<H>27</H>
<MaxW>100</MaxW>
<Color Name="StaticColor" />
<SelColor Name="TextSelColor" />
<Align>Center</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text />
</Text>
<Text Name="TextDelayChannel2">
<X>330</X>
<Text Name="TextDelayPlayer2">
<X>320</X>
<Y>287</Y>
<Z>-1</Z>
<Z>-2</Z>
<H>27</H>
<MaxW>0</MaxW>
<MaxW>100</MaxW>
<Color Name="StaticColor" />
<SelColor Name="TextSelColor" />
<Align>Right</Align>
<Align>Center</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text />
</Text>
<Text Name="TextDelayPlayer3">
<X>320</X>
<Y>347</Y>
<Z>-2</Z>
<H>27</H>
<MaxW>100</MaxW>
<Color Name="StaticColor" />
<SelColor Name="TextSelColor" />
<Align>Center</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text />
</Text>
<Text Name="TextDelayPlayer4">
<X>320</X>
<Y>407</Y>
<Z>-2</Z>
<H>27</H>
<MaxW>100</MaxW>
<Color Name="StaticColor" />
<SelColor Name="TextSelColor" />
<Align>Center</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text />
</Text>
<Text Name="TextDelayPlayer5">
<X>320</X>
<Y>467</Y>
<Z>-2</Z>
<H>27</H>
<MaxW>100</MaxW>
<Color Name="StaticColor" />
<SelColor Name="TextSelColor" />
<Align>Center</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text />
</Text>
<Text Name="TextDelayPlayer6">
<X>320</X>
<Y>527</Y>
<Z>-2</Z>
<H>27</H>
<MaxW>100</MaxW>
<Color Name="StaticColor" />
<SelColor Name="TextSelColor" />
<Align>Center</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
@@ -268,7 +424,7 @@
<Skin>Button</Skin>
<SkinSelected>Button</SkinSelected>
<Rect>
<X>355</X>
<X>985</X>
<Y>600</Y>
<W>150</W>
<H>50</H>
@@ -345,7 +501,7 @@
<TextStyle>Bold</TextStyle>
<NumVisible>1</NumVisible>
</SelectSlide>
<SelectSlide Name="SelectSlideRecordChannel1">
<SelectSlide Name="SelectSlideRecordPlayer1">
<Skin/>
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
@@ -387,7 +543,7 @@
<TextStyle>Bold</TextStyle>
<NumVisible>7</NumVisible>
</SelectSlide>
<SelectSlide Name="SelectSlideRecordChannel2">
<SelectSlide Name="SelectSlideRecordPlayer2">
<Skin/>
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
@@ -429,7 +585,7 @@
<TextStyle>Bold</TextStyle>
<NumVisible>7</NumVisible>
</SelectSlide>
<SelectSlide Name="SelectSlideDelay">
<SelectSlide Name="SelectSlideRecordPlayer3">
<Skin/>
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
@@ -466,6 +622,174 @@
<TextH>27</TextH>
<TextRelativeX>50</TextRelativeX>
<TextRelativeY>0</TextRelativeY>
<TextMaxW>154</TextMaxW>
<TextFont>Outline</TextFont>
<TextStyle>Bold</TextStyle>
<NumVisible>7</NumVisible>
</SelectSlide>
<SelectSlide Name="SelectSlideRecordPlayer4">
<Skin/>
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<Rect>
<X>500</X>
<Y>400</Y>
<W>700</W>
<H>50</H>
<Z>0</Z>
</Rect>
<RectArrowLeft>
<X>505</X>
<Y>405</Y>
<W>40</W>
<H>40</H>
<Z>0</Z>
</RectArrowLeft>
<RectArrowRight>
<X>1170</X>
<Y>405</Y>
<W>40</W>
<H>40</H>
<Z>0</Z>
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SelColor Name="SelectSlideSelColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSelColor Name="ArrowSelColor" />
<TextColor Name="TextColor" />
<TextSelColor Name="TextSelColor" />
<TextH>27</TextH>
<TextRelativeX>50</TextRelativeX>
<TextRelativeY>0</TextRelativeY>
<TextMaxW>154</TextMaxW>
<TextFont>Outline</TextFont>
<TextStyle>Bold</TextStyle>
<NumVisible>7</NumVisible>
</SelectSlide>
<SelectSlide Name="SelectSlideRecordPlayer5">
<Skin/>
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<Rect>
<X>500</X>
<Y>460</Y>
<W>700</W>
<H>50</H>
<Z>0</Z>
</Rect>
<RectArrowLeft>
<X>505</X>
<Y>465</Y>
<W>40</W>
<H>40</H>
<Z>0</Z>
</RectArrowLeft>
<RectArrowRight>
<X>1170</X>
<Y>465</Y>
<W>40</W>
<H>40</H>
<Z>0</Z>
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SelColor Name="SelectSlideSelColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSelColor Name="ArrowSelColor" />
<TextColor Name="TextColor" />
<TextSelColor Name="TextSelColor" />
<TextH>27</TextH>
<TextRelativeX>50</TextRelativeX>
<TextRelativeY>0</TextRelativeY>
<TextMaxW>154</TextMaxW>
<TextFont>Outline</TextFont>
<TextStyle>Bold</TextStyle>
<NumVisible>7</NumVisible>
</SelectSlide>
<SelectSlide Name="SelectSlideRecordPlayer6">
<Skin/>
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<Rect>
<X>500</X>
<Y>520</Y>
<W>700</W>
<H>50</H>
<Z>0</Z>
</Rect>
<RectArrowLeft>
<X>505</X>
<Y>525</Y>
<W>40</W>
<H>40</H>
<Z>0</Z>
</RectArrowLeft>
<RectArrowRight>
<X>1170</X>
<Y>525</Y>
<W>40</W>
<H>40</H>
<Z>0</Z>
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SelColor Name="SelectSlideSelColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSelColor Name="ArrowSelColor" />
<TextColor Name="TextColor" />
<TextSelColor Name="TextSelColor" />
<TextH>27</TextH>
<TextRelativeX>50</TextRelativeX>
<TextRelativeY>0</TextRelativeY>
<TextMaxW>154</TextMaxW>
<TextFont>Outline</TextFont>
<TextStyle>Bold</TextStyle>
<NumVisible>7</NumVisible>
</SelectSlide>
<SelectSlide Name="SelectSlideDelay">
<Skin/>
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<Rect>
<X>500</X>
<Y>160</Y>
<W>700</W>
<H>50</H>
<Z>0</Z>
</Rect>
<RectArrowLeft>
<X>505</X>
<Y>165</Y>
<W>40</W>
<H>40</H>
<Z>0</Z>
</RectArrowLeft>
<RectArrowRight>
<X>1170</X>
<Y>165</Y>
<W>40</W>
<H>40</H>
<Z>0</Z>
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SelColor Name="SelectSlideSelColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSelColor Name="ArrowSelColor" />
<TextColor Name="TextColor" />
<TextSelColor Name="TextSelColor" />
<TextH>27</TextH>
<TextRelativeX>50</TextRelativeX>
<TextRelativeY>0</TextRelativeY>
<TextMaxW>123.2</TextMaxW>
<TextFont>Outline</TextFont>
<TextStyle>Bold</TextStyle>
@@ -475,13 +799,13 @@
<SingNotes />
<NameSelections />
<Equalizers>
<Equalizer Name="EqualizerChannel1">
<Equalizer Name="EqualizerPlayer1">
<Skin/>
<Rect>
<X>50</X>
<Y>400</Y>
<W>230</W>
<H>150</H>
<X>270</X>
<Y>220</Y>
<W>100</W>
<H>40</H>
<Z>-1</Z>
</Rect>
<NumBars>12</NumBars>
@@ -490,18 +814,15 @@
<DrawNegative>TR_CONFIG_OFF</DrawNegative>
<Color Name="ButtonColor" />
<MaxColor Name="ButtonTextColor" />
<Reflection>
<Height>26</Height>
<Space>10</Space>
</Reflection>
<Reflection />
</Equalizer>
<Equalizer Name="EqualizerChannel2">
<Equalizer Name="EqualizerPlayer2">
<Skin/>
<Rect>
<X>400</X>
<Y>400</Y>
<W>230</W>
<H>150</H>
<X>270</X>
<Y>280</Y>
<W>100</W>
<H>40</H>
<Z>-1</Z>
</Rect>
<NumBars>12</NumBars>
@@ -510,10 +831,75 @@
<DrawNegative>TR_CONFIG_OFF</DrawNegative>
<Color Name="ButtonColor" />
<MaxColor Name="ButtonTextColor" />
<Reflection>
<Height>26</Height>
<Space>10</Space>
</Reflection>
<Reflection />
</Equalizer>
<Equalizer Name="EqualizerPlayer3">
<Skin/>
<Rect>
<X>270</X>
<Y>340</Y>
<W>100</W>
<H>40</H>
<Z>-1</Z>
</Rect>
<NumBars>12</NumBars>
<Space>2</Space>
<Style>Columns</Style>
<DrawNegative>TR_CONFIG_OFF</DrawNegative>
<Color Name="ButtonColor" />
<MaxColor Name="ButtonTextColor" />
<Reflection />
</Equalizer>
<Equalizer Name="EqualizerPlayer4">
<Skin/>
<Rect>
<X>270</X>
<Y>400</Y>
<W>100</W>
<H>40</H>
<Z>-1</Z>
</Rect>
<NumBars>12</NumBars>
<Space>2</Space>
<Style>Columns</Style>
<DrawNegative>TR_CONFIG_OFF</DrawNegative>
<Color Name="ButtonColor" />
<MaxColor Name="ButtonTextColor" />
<Reflection />
</Equalizer>
<Equalizer Name="EqualizerPlayer5">
<Skin/>
<Rect>
<X>270</X>
<Y>460</Y>
<W>100</W>
<H>40</H>
<Z>-1</Z>
</Rect>
<NumBars>12</NumBars>
<Space>2</Space>
<Style>Columns</Style>
<DrawNegative>TR_CONFIG_OFF</DrawNegative>
<Color Name="ButtonColor" />
<MaxColor Name="ButtonTextColor" />
<Reflection />
</Equalizer>
<Equalizer Name="EqualizerPlayer6">
<Skin/>
<Rect>
<X>270</X>
<Y>520</Y>
<W>100</W>
<H>40</H>
<Z>-1</Z>
</Rect>
<NumBars>12</NumBars>
<Space>2</Space>
<Style>Columns</Style>
<DrawNegative>TR_CONFIG_OFF</DrawNegative>
<Color Name="ButtonColor" />
<MaxColor Name="ButtonTextColor" />
<Reflection/>
</Equalizer>
</Equalizers>
<Playlists />
Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
+57 -1
View File
@@ -2,7 +2,7 @@
<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Informations>
<ScreenName>ScreenOptionsSound</ScreenName>
<ScreenVersion>3</ScreenVersion>
<ScreenVersion>4</ScreenVersion>
</Informations>
<Backgrounds>
<Background Name="Background1">
@@ -110,6 +110,20 @@
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENOSOUND_GAMEMUSICVOLUME</Text>
</Text>
<Text Name="Text7">
<X>75</X>
<Y>407</Y>
<Z>0</Z>
<H>27</H>
<MaxW>0</MaxW>
<Color Name="StaticColor" />
<SelColor Name="TextSelColor" />
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENOSOUND_KARAOKEEFFECT</Text>
</Text>
</Texts>
<Buttons>
@@ -361,6 +375,48 @@
<TextFont>Outline</TextFont>
<TextStyle>Bold</TextStyle>
<NumVisible>3</NumVisible>
</SelectSlide>
<SelectSlide Name="SelectSlideKaraokeEffect">
<Skin/>
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<Rect>
<X>500</X>
<Y>400</Y>
<W>700</W>
<H>50</H>
<Z>0</Z>
</Rect>
<RectArrowLeft>
<X>505</X>
<Y>405</Y>
<W>40</W>
<H>40</H>
<Z>0</Z>
</RectArrowLeft>
<RectArrowRight>
<X>1170</X>
<Y>405</Y>
<W>40</W>
<H>40</H>
<Z>0</Z>
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SelColor Name="SelectSlideSelColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSelColor Name="ArrowSelColor" />
<TextColor Name="TextColor" />
<TextSelColor Name="TextSelColor" />
<TextH>27</TextH>
<TextRelativeX>50</TextRelativeX>
<TextRelativeY>0</TextRelativeY>
<TextMaxW>500</TextMaxW>
<TextFont>Outline</TextFont>
<TextStyle>Bold</TextStyle>
<NumVisible>2</NumVisible>
</SelectSlide>
</SelectSlides>
<SingNotes />
Output/Themes/Changelog/Changelog_ScreenOptionsGame.txt
+6
View File
@@ -1,5 +1,11 @@
ScreenOptionsGame
++++++++++
Version 3:
Add:
<Text8>
<SelectSlideHighscoreStyle>
++++++++++
Version 2:
Output/Themes/Changelog/Changelog_ScreenOptionsRecord.txt
+17 -1
View File
@@ -9,4 +9,20 @@ This is a new theme-element. Check ScreenOptionsRecord.xml for style-possibiliti
++++++++++
Version 4:
Rename Text 3/4 to TextChannel1/2
Rename Text5 to Text3
Rename Text5 to Text3
++++++++++
Version 5:
Added:
StaticEnergyPlayer1-6
TextPlayer1-6
TextDelayPlayer1-6
SelectSlideRecordPlayer1-6
EqualizerPlayer1-6
Removed:
StaticEnergyChannel1-2
TextChannel1-2
TextDelayChannel1-2
SelectSlideRecordChannel1-2
EqualizerChannel1-2
Output/Themes/Changelog/Changelog_ScreenOptionsSound.txt
+10
View File
@@ -1,5 +1,15 @@
ScreenOptionsSound
++++++++++
Version 4:
Add:
<SelectSlideKaraokeEffect>
and text for the description (Text7)
"TR_SCREENOSOUND_KARAOKEEFFECT"
++++++++++
Version 3:
Vocaluxe/Base/CConfig.cs
+19 -16
View File
@@ -104,7 +104,7 @@ namespace Vocaluxe.Base
[DefaultValue(EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH)] public EPlayerInfo PlayerInfo;
[DefaultValue(EFadePlayerInfo.TR_CONFIG_FADEPLAYERINFO_OFF)] public EFadePlayerInfo FadePlayerInfo;
[DefaultValue(ECoverLoading.TR_CONFIG_COVERLOADING_DYNAMIC)] public ECoverLoading CoverLoading;
[DefaultValue(ELyricStyle.Slide)] public ELyricStyle LyricStyle;
[DefaultValue(ELyricStyle.TR_CONFIG_LYRICSTYLE_SLIDE)] public ELyricStyle LyricStyle;
}
public struct SConfigSound
@@ -120,6 +120,8 @@ namespace Vocaluxe.Base
[DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn BackgroundMusicUseStart;
[XmlRanged(0, 100), DefaultValue(50)] public int PreviewMusicVolume;
[XmlRanged(0, 100), DefaultValue(80)] public int GameMusicVolume;
[DefaultValue(EOffOn.TR_CONFIG_OFF)] public EOffOn KaraokeEffect;
[XmlRanged(0, 1), DefaultValue(1.0f)] public float KaraokeEffectLevel;
// ReSharper restore MemberHidesStaticFromOuterClass
}
@@ -139,6 +141,7 @@ namespace Vocaluxe.Base
[DefaultValue(ELyricsPosition.TR_CONFIG_LYRICSPOSITION_BOTTOM)] public ELyricsPosition LyricsPosition;
[DefaultValue(0.1f)] public float MinLineBreakTime; //Minimum time to show the text before it is (to be) sung (if possible)
[XmlArrayItem("Player"), XmlArray] public string[] Players;
[DefaultValue(EHighscoreStyle.TR_CONFIG_HIGHSCORE_LIST_BEST)] public EHighscoreStyle HighscoreStyle;
}
public struct SConfigVideo
@@ -452,6 +455,10 @@ namespace Vocaluxe.Base
return "Preview Volume from 0 to 100";
case "GameMusicVolume":
return "Game Volume from 0 to 100";
case "KaraokeEffect":
return "Apply a karaoke effect to song playback (EPlaybackLib.GstreamerSharp only)";
case "KaraokeEffectLevel":
return "The level of the karaoke effect [0-1] (EPlaybackLib.GstreamerSharp only)";
case "Language":
return "Game-Language";
case "SongFolder":
@@ -520,31 +527,27 @@ namespace Vocaluxe.Base
return (1f / Config.Graphics.MaxFPS) * 1000f;
}
/// <summary>
/// Checks, if there is a mic-configuration
/// </summary>
/// <returns></returns>
public static bool IsMicConfig()
{
ReadOnlyCollection<CRecordDevice> devices = CRecord.GetDevices();
if (devices == null)
return false;
return devices.Any(t => t.PlayerChannel1 != 0 || t.PlayerChannel2 != 0);
}
/// <summary>
/// Checks, if there is a mic-configuration
/// </summary>
/// <param name="player">Player-Number</param>
/// <returns></returns>
public static bool IsMicConfig(int player)
public static bool IsMicConfig(int player = 0)
{
ReadOnlyCollection<CRecordDevice> devices = CRecord.GetDevices();
if (devices == null)
return false;
return devices.Any(t => t.PlayerChannel1 == player || t.PlayerChannel2 == player);
if (player > 0)
return devices.Any(t => t.PlayerChannel.Contains(player));
for (int p = 0; p < CSettings.MaxNumPlayer; ++p)
if (devices.Any(t => t.PlayerChannel.Contains(p+1)))
{
return true;
}
return false;
}
public static int GetMaxNumMics()
Vocaluxe/Base/CDataBase.cs
+2 -2
View File
@@ -85,9 +85,9 @@ namespace Vocaluxe.Base
return _HighscoreDB.GetDataBaseSongInfos(artist, title, out numPlayed, out dateAdded, out highscoreID);
}
public static List<SDBScoreEntry> LoadScore(int songID, EGameMode gameMode)
public static List<SDBScoreEntry> LoadScore(int songID, EGameMode gameMode, EHighscoreStyle style)
{
return _HighscoreDB == null ? null : _HighscoreDB.LoadScore(songID, gameMode);
return _HighscoreDB == null ? null : _HighscoreDB.LoadScore(songID, gameMode, style);
}
public static int AddScore(SPlayer player)
Vocaluxe/Base/CMain.cs
+5
View File
@@ -91,6 +91,11 @@ namespace Vocaluxe.Base
return CConfig.SongMenu;
}
public EHighscoreStyle GetHighscoreStyle()
{
return CConfig.Config.Game.HighscoreStyle;
}
public EOffOn GetVideosToBackground()
{
return CConfig.Config.Video.VideosToBackground;
Vocaluxe/Base/CParty.cs
+1 -1
View File
@@ -283,7 +283,7 @@ namespace Vocaluxe.Base
compilerParams.ReferencedAssemblies.Add("System.Windows.Forms.dll");
compilerParams.ReferencedAssemblies.Add("System.dll");
compilerParams.ReferencedAssemblies.Add("System.Core.dll");
compilerParams.ReferencedAssemblies.Add("libs\\managed\\VocaluxeLib.dll");
compilerParams.ReferencedAssemblies.Add(Path.Combine("libs","managed","VocaluxeLib.dll"));
compilerParams.GenerateInMemory = true;
#if DEBUG
compilerParams.IncludeDebugInformation = true;
Vocaluxe/Base/CPlaylists.cs
+5
View File
@@ -42,6 +42,11 @@ namespace Vocaluxe.Base
get { return _Playlists.Select(t => t.Name).ToList(); }
}
public static List<int> Ids
{
get { return _Playlists.Select(t => t.Id).ToList(); }
}
public static int NumPlaylists
{
get { return _Playlists.Count; }
Vocaluxe/Base/CRecord.cs
+2 -2
View File
@@ -126,8 +126,8 @@ namespace Vocaluxe.Base
{
foreach (CRecordDevice device in devices)
{
device.PlayerChannel1 = _GetPlayerFromMicConfig(device.Name, device.Driver, 1);
device.PlayerChannel2 = _GetPlayerFromMicConfig(device.Name, device.Driver, 2);
for(int ch = 0; ch < device.Channels; ++ch)
device.PlayerChannel[ch] = _GetPlayerFromMicConfig(device.Name, device.Driver, ch+1);
}
return devices;
}
Vocaluxe/Base/CSettings.cs
+44 -15
View File
@@ -18,6 +18,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Windows.Forms;
using VocaluxeLib;
@@ -53,10 +54,44 @@ namespace Vocaluxe.Base
public static EProgramState ProgramState = EProgramState.Start;
//Adjusting of programName and version now in the assembly config.
//I'd use the major and minor for Main releases, build number for every public release and revision for every bugfix version without any features
private const string _ProgramCodeName = "Shining Heaven";
private static readonly Dictionary<string,string> _CodeNames = new Dictionary<string, string>()
{
{"0.3.", "Shining Heaven"},
{"0.4.", "Blue Sunrise"}
};
public const ERevision VersionRevision = ERevision.Beta;
private static string _ProgramCodeName
{
get
{
var versionParts = Application.ProductVersion.Split('.');
string name;
_CodeNames.TryGetValue($"{versionParts[0]}.{versionParts[1]}.", out name);
if (name != null)
return name;
return "Unnamed Version";
}
}
public static ERevision VersionRevision
{
get
{
if (_Version.ToLower().Contains("alpha"))
{
return ERevision.Alpha;
}
if (_Version.ToLower().Contains("beta"))
{
return ERevision.Beta;
}
if (_Version.ToLower().Contains("rc"))
{
return ERevision.RC;
}
return ERevision.Release;
}
}
public const int DatabaseHighscoreVersion = 3;
public const int DatabaseCoverVersion = 1;
@@ -177,8 +212,7 @@ namespace Vocaluxe.Base
{
get
{
Version v = _Assembly.Version;
return "v" + v.Major + "." + v.Minor + "." + v.Build;
return Application.ProductVersion.Split('-').First();
}
}
@@ -186,11 +220,10 @@ namespace Vocaluxe.Base
{
string version = _Version + " (" + _Arch + ")";
// ReSharper disable ConditionIsAlwaysTrueOrFalse
if (VersionRevision != ERevision.Release)
string gitversion = Application.ProductVersion;
if (VersionRevision != ERevision.Release || gitversion.Split('-')[1] != "0")
{
// ReSharper restore ConditionIsAlwaysTrueOrFalse
string gitversion = Application.ProductVersion;
version += " " + _GetVersionStatus() + String.Format(" ({0})", gitversion);
}
@@ -200,10 +233,8 @@ namespace Vocaluxe.Base
public static string GetFullVersionText()
{
string version = ProgramName;
// ReSharper disable ConditionIsAlwaysTrueOrFalse
if (_ProgramCodeName != "")
// ReSharper restore ConditionIsAlwaysTrueOrFalse
version += " \"" + _ProgramCodeName + "\"";
return version + " " + _GetVersionText();
@@ -211,11 +242,9 @@ namespace Vocaluxe.Base
private static string _GetVersionStatus()
{
string result;
string result = "";
// ReSharper disable ConditionIsAlwaysTrueOrFalse
if (VersionRevision != ERevision.Release)
// ReSharper restore ConditionIsAlwaysTrueOrFalse
result = Enum.GetName(typeof(ERevision), VersionRevision);
return result;
Vocaluxe/Base/CSound.cs
+3 -2
View File
@@ -22,6 +22,7 @@ using Vocaluxe.Lib.Sound.Playback.OpenAL;
using Vocaluxe.Lib.Sound.Playback.PortAudio;
using VocaluxeLib;
using System.Threading;
using Vocaluxe.Lib.Sound;
namespace Vocaluxe.Base
{
@@ -88,9 +89,9 @@ namespace Vocaluxe.Base
}
#region Stream Handling
public static int Load(string media, bool loop = false, bool prescan = false)
public static int Load(string media, bool loop = false, bool prescan = false, EAudioEffect effekt = EAudioEffect.None)
{
return _Playback.Load(media, loop, prescan);
return _Playback.Load(media, loop, prescan, effekt);
}
public static void Close(int stream)
Vocaluxe/Lib/Database/CHighscoreDB.cs
+33 -5
View File
@@ -266,7 +266,7 @@ namespace Vocaluxe.Lib.Database
return lastInsertID;
}
public List<SDBScoreEntry> LoadScore(int songID, EGameMode gameMode)
public List<SDBScoreEntry> LoadScore(int songID, EGameMode gameMode, EHighscoreStyle style)
{
var scores = new List<SDBScoreEntry>();
using (var connection = new SQLiteConnection())
@@ -304,9 +304,37 @@ namespace Vocaluxe.Lib.Database
if (dataBaseSongID < 0)
return scores;
command.CommandText = "SELECT PlayerName, Score, Date, Difficulty, LineNr, id FROM Scores " +
"WHERE [SongID] = @SongID AND [Medley] = @Medley AND [Duet] = @Duet AND [ShortSong] = @ShortSong " +
"ORDER BY [Score] DESC";
switch (style)
{
case EHighscoreStyle.TR_CONFIG_HIGHSCORE_LIST_BEST:
command.CommandText = "SELECT os.PlayerName, os.Score, os.Date, os.Difficulty, os.LineNr, os.id " +
"FROM Scores os " +
"INNER JOIN ( " +
"SELECT sc.PlayerName, sc.Score, sc.Difficulty, sc.LineNr, MIN(sc.Date) AS Date " +
"FROM Scores sc " +
"INNER JOIN ( " +
"SELECT Playername, MAX(Score) AS Score, Difficulty, LineNr " +
"FROM Scores " +
"WHERE [SongID] = @SongID AND [Medley] = @Medley AND [Duet] = @Duet AND [ShortSong] = @ShortSong " +
"GROUP BY PlayerName, Difficulty, LineNr " +
") AS mc " +
"ON sc.PlayerName = mc.PlayerName AND sc.Difficulty = mc.Difficulty AND sc.LineNr = mc.LineNr AND sc.Score = mc.Score " +
"WHERE [SongID] = @SongID AND [Medley] = @Medley AND [Duet] = @Duet AND [ShortSong] = @ShortSong " +
"GROUP BY sc.PlayerName, sc.Difficulty, sc.LineNr, sc.Score " +
") AS iq " +
"ON os.PlayerName = iq.PlayerName AND os.Difficulty = iq.Difficulty AND os.LineNr = iq.LineNr AND os.Score = iq.Score AND os.Date = iq.Date " +
"WHERE [SongID] = @SongID AND [Medley] = @Medley AND [Duet] = @Duet AND [ShortSong] = @ShortSong " +
"GROUP BY os.PlayerName, os.Difficulty, os.LineNr, os.Score " +
"ORDER BY os.Score DESC, os.Date ASC";
break;
case EHighscoreStyle.TR_CONFIG_HIGHSCORE_LIST_ALL:
command.CommandText = "SELECT PlayerName, Score, Date, Difficulty, LineNr, id " +
"FROM Scores " +
"WHERE [SongID] = @SongID AND [Medley] = @Medley AND [Duet] = @Duet AND [ShortSong] = @ShortSong " +
"ORDER BY [Score] DESC, [Date] ASC";
break;
}
command.Parameters.Add("@SongID", DbType.Int32, 0).Value = dataBaseSongID;
command.Parameters.Add("@Medley", DbType.Int32, 0).Value = medley;
command.Parameters.Add("@Duet", DbType.Int32, 0).Value = duet;
@@ -475,7 +503,7 @@ namespace Vocaluxe.Lib.Database
command.ExecuteNonQuery();
command.CommandText = "CREATE TABLE IF NOT EXISTS Songs ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
"Artist TEXT NOT NULL, Title TEXT NOT NULL, NumPlayed INTEGER, DateAdded BIGING);";
"Artist TEXT NOT NULL, Title TEXT NOT NULL, NumPlayed INTEGER, DateAdded BIGINT);";
command.ExecuteNonQuery();
command.CommandText = "CREATE TABLE IF NOT EXISTS Scores ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
Vocaluxe/Lib/Input/CGamePad.cs
+1 -1
View File
@@ -161,7 +161,7 @@ namespace Vocaluxe.Lib.Input
key = Keys.Space;
else if (buttonStates.Buttons.A == OpenTK.Input.ButtonState.Pressed && _OldButtonStates.Buttons.A == OpenTK.Input.ButtonState.Released)
key = Keys.Enter;
else if (buttonStates.Buttons.X == OpenTK.Input.ButtonState.Pressed && _OldButtonStates.Buttons.X == OpenTK.Input.ButtonState.Released)
else if (buttonStates.Buttons.B == OpenTK.Input.ButtonState.Pressed && _OldButtonStates.Buttons.B == OpenTK.Input.ButtonState.Released)
key = Keys.Escape;
else if (buttonStates.Buttons.Back == OpenTK.Input.ButtonState.Pressed && _OldButtonStates.Buttons.Back == OpenTK.Input.ButtonState.Released)
key = Keys.Back;
Vocaluxe/Lib/Sound/EAudioEffect.cs
+14
View File
@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Vocaluxe.Lib.Sound
{
[Flags]
public enum EAudioEffect
{
None = 0,
Karaoke = 1
}
}
Vocaluxe/Lib/Sound/Playback/CAudioStreamBase.cs
+3 -1
View File
@@ -25,6 +25,7 @@ namespace Vocaluxe.Lib.Sound.Playback
private readonly int _ID;
protected readonly string _Medium;
protected readonly bool _Loop;
protected readonly EAudioEffect _Effect;
protected ICloseStreamListener _CloseStreamListener;
@@ -48,11 +49,12 @@ namespace Vocaluxe.Lib.Sound.Playback
public abstract bool IsPaused { get; set; }
public abstract bool IsFinished { get; }
protected CAudioStreamBase(int id, string medium, bool loop)
protected CAudioStreamBase(int id, string medium, bool loop, EAudioEffect effect = EAudioEffect.None)
{
_ID = id;
_Medium = medium;
_Loop = loop;
_Effect = effect;
}
~CAudioStreamBase()
Vocaluxe/Lib/Sound/Playback/CPlaybackBase.cs
+3 -3
View File
@@ -113,13 +113,13 @@ namespace Vocaluxe.Lib.Sound.Playback
#region Stream Handling
//Factory method to get a stream instance
protected abstract IAudioStream _CreateStream(int id, string media, bool loop);
protected abstract IAudioStream _CreateStream(int id, string media, bool loop, EAudioEffect effect = EAudioEffect.None);
public int Load(string medium, bool loop = false, bool prescan = false)
public int Load(string medium, bool loop = false, bool prescan = false, EAudioEffect effect = EAudioEffect.None)
{
if (!_Initialized)
return -1;
IAudioStream stream = _CreateStream(_NextID++, medium, loop);
IAudioStream stream = _CreateStream(_NextID++, medium, loop, effect);
if (stream.Open(prescan))
{
Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs
+15 -12
View File
@@ -35,26 +35,29 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
#if ARCH_X64
const string varName = "GSTREAMER_1_0_ROOT_X86_64";
#endif
string gstreamerEnvVar = Environment.GetEnvironmentVariable(varName, EnvironmentVariableTarget.User);
string dllDirectory;
if (gstreamerEnvVar == null || !Directory.Exists(gstreamerEnvVar))
{
#if ARCH_X86
dllDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\gstreamer86\\bin\\");
dllDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\gstreamer86\\bin\\");
#endif
#if ARCH_X64
dllDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\gstreamer64\\bin\\");
dllDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\gstreamer64\\bin\\");
#endif
if (!Directory.Exists(dllDirectory))
if (!Directory.Exists(dllDirectory))
{
string gstreamerEnvVar = Environment.GetEnvironmentVariable(varName, EnvironmentVariableTarget.User);
if (gstreamerEnvVar == null || !Directory.Exists(gstreamerEnvVar))
{
CLog.LogError("Gstreamer not found! Make sure you installed it correctly and if it set the environment variable '" + varName + "'!", true);
return false;
}
else
{
dllDirectory = gstreamerEnvVar + "bin\\";
}
}
else
{
dllDirectory = gstreamerEnvVar + "bin\\";
}
COSFunctions.AddEnvironmentPath(dllDirectory);
#endif
@@ -72,9 +75,9 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
Application.Deinit();
}
protected override IAudioStream _CreateStream(int id, string media, bool loop)
protected override IAudioStream _CreateStream(int id, string media, bool loop, EAudioEffect effect = EAudioEffect.None)
{
return new CGstreamerSharpAudioStream(id, media, loop);
return new CGstreamerSharpAudioStream(id, media, loop, effect);
}
}
}
Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudioStream.cs
+41 -4
View File
@@ -19,6 +19,7 @@ using System;
using GLib;
using Gst;
using Vocaluxe.Base;
using VocaluxeLib;
namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
{
@@ -101,7 +102,7 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
}
}
public CGstreamerSharpAudioStream(int id, string medium, bool loop) : base(id, medium, loop) {}
public CGstreamerSharpAudioStream(int id, string medium, bool loop, EAudioEffect effect = EAudioEffect.None) : base(id, medium, loop, effect) {}
public override bool Open(bool prescan)
{
@@ -123,9 +124,29 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
}
var audioSinkBin = new Bin("Audiosink");
audioSinkBin.Add(convert);
audioSinkBin.Add(audiosink);
convert.Link(audiosink);
Element audiokaraoke = null;
if (_Effect.HasFlag(EAudioEffect.Karaoke))
{
audiokaraoke = ElementFactory.Make("audiokaraoke", "karaoke");
audioSinkBin.Add(audiokaraoke);
audioSinkBin.Add(convert);
audioSinkBin.Add(audiosink);
audiokaraoke.Link(audiosink);
audiokaraoke["level"] = CConfig.Config.Sound.KaraokeEffectLevel;
audiokaraoke["mono-level"] = CConfig.Config.Sound.KaraokeEffectLevel;
convert.Link(audiokaraoke);
}
else
{
audioSinkBin.Add(convert);
audioSinkBin.Add(audiosink);
convert.Link(audiosink);
}
Pad pad = convert.GetStaticPad("sink");
GhostPad ghostpad = new GhostPad("sink", pad);
@@ -135,6 +156,10 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
convert.Dispose();
audiosink.Dispose();
audioSinkBin.Dispose();
if (audiokaraoke != null)
{
audiokaraoke.Dispose();
}
return false;
}
@@ -145,6 +170,10 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
audiosink.Dispose();
audioSinkBin.Dispose();
ghostpad.Dispose();
if (audiokaraoke != null)
{
audiokaraoke.Dispose();
}
return false;
}
if (!audioSinkBin.AddPad(ghostpad))
@@ -154,6 +183,10 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
audiosink.Dispose();
audioSinkBin.Dispose();
ghostpad.Dispose();
if (audiokaraoke != null)
{
audiokaraoke.Dispose();
}
return false;
}
@@ -165,6 +198,10 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
audiosink.Dispose();
audioSinkBin.Dispose();
ghostpad.Dispose();
if (audiokaraoke != null)
{
audiokaraoke.Dispose();
}
return false;
}
_Element["audio-sink"] = audioSinkBin;
Vocaluxe/Lib/Sound/Playback/IPlayback.cs
+1 -1
View File
@@ -36,7 +36,7 @@ namespace Vocaluxe.Lib.Sound.Playback
void CloseAll();
#region stream Handling
int Load(string medium, bool loop = false, bool prescan = false);
int Load(string medium, bool loop = false, bool prescan = false, EAudioEffect effekt= EAudioEffect.None);
void Close(int streamID);
void Play(int streamID);
Vocaluxe/Lib/Sound/Playback/OpenAL/COpenALPlay.cs
+2 -2
View File
@@ -44,9 +44,9 @@ namespace Vocaluxe.Lib.Sound.Playback.OpenAL
_Context = null;
}
protected override IAudioStream _CreateStream(int id, string media, bool loop)
protected override IAudioStream _CreateStream(int id, string media, bool loop, EAudioEffect effect = EAudioEffect.None)
{
return new COpenAlStream(id, media, loop);
return new COpenAlStream(id, media, loop, effect);
}
}
}
Vocaluxe/Lib/Sound/Playback/OpenAL/COpenAlStream.cs
+1 -1
View File
@@ -122,7 +122,7 @@ namespace Vocaluxe.Lib.Sound.Playback.OpenAL
}
}
public COpenAlStream(int id, string medium, bool loop) : base(id, medium, loop) {}
public COpenAlStream(int id, string medium, bool loop, EAudioEffect effect = EAudioEffect.None) : base(id, medium, loop, effect) {}
protected override void _Dispose(bool disposing)
{
Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioPlay.cs
+2 -2
View File
@@ -29,9 +29,9 @@ namespace Vocaluxe.Lib.Sound.Playback.PortAudio
return true;
}
protected override IAudioStream _CreateStream(int id, string media, bool loop)
protected override IAudioStream _CreateStream(int id, string media, bool loop, EAudioEffect effect = EAudioEffect.None)
{
return new CPortAudioStream(id, media, loop);
return new CPortAudioStream(id, media, loop, effect);
}
}
}
Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioStream.cs
+1 -1
View File
@@ -131,7 +131,7 @@ namespace Vocaluxe.Lib.Sound.Playback.PortAudio
}
}
public CPortAudioStream(int id, string medium, bool loop) : base(id, medium, loop) {}
public CPortAudioStream(int id, string medium, bool loop, EAudioEffect effect = EAudioEffect.None) : base(id, medium, loop, effect) {}
public override bool Open(bool prescan)
{
Vocaluxe/Lib/Sound/Record/CRecordBase.cs
+16 -22
View File
@@ -18,6 +18,7 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
using Vocaluxe.Base;
using System;
namespace Vocaluxe.Lib.Sound.Record
{
@@ -76,32 +77,25 @@ namespace Vocaluxe.Lib.Sound.Record
/// <param name="data">Recorded samples, assume Int16 and interleaved for multi-channels</param>
protected void _HandleData(CRecordDevice device, byte[] data)
{
byte[] leftBuffer;
byte[] rightBuffer;
if (device.Channels == 2)
int totalChannels = device.Channels;
int doubleChannels = totalChannels * 2;
byte[][] allBuffers = new byte[totalChannels][];
for (int currChannel = 0; currChannel < totalChannels; ++currChannel)
allBuffers[currChannel] = new byte[data.Length / totalChannels];
for (int i = 0; i < data.Length / doubleChannels; ++i)
{
leftBuffer = new byte[data.Length / 2];
rightBuffer = new byte[data.Length / 2];
//[]: Sample, L: Left channel R: Right channel
//[LR][LR][LR][LR][LR][LR]
//The data is interleaved and needs to be demultiplexed
for (int i = 0; i < data.Length / 4; i++)
{
leftBuffer[i * 2] = data[i * 4];
leftBuffer[i * 2 + 1] = data[i * 4 + 1];
rightBuffer[i * 2] = data[i * 4 + 2];
rightBuffer[i * 2 + 1] = data[i * 4 + 3];
}
for (int j = 0; j < doubleChannels; ++j)
allBuffers[(int)Math.Floor(j / (double)2)][i * 2 + (j % 2)] = data[i * doubleChannels + j];
}
else
leftBuffer = rightBuffer = data;
if (device.PlayerChannel1 > 0)
_Buffer[device.PlayerChannel1 - 1].ProcessNewBuffer(leftBuffer);
if (device.PlayerChannel2 > 0)
_Buffer[device.PlayerChannel2 - 1].ProcessNewBuffer(rightBuffer);
for (int ch = 0; ch < totalChannels; ++ch)
{
if (device.PlayerChannel[ch] > 0)
_Buffer[device.PlayerChannel[ch] - 1].ProcessNewBuffer(allBuffers[ch]);
}
}
/// <summary>
Vocaluxe/Lib/Sound/Record/DirectSound/CDirectSoundRecord.cs
+8 -2
View File
@@ -68,9 +68,15 @@ namespace Vocaluxe.Lib.Sound.Record.DirectSound
foreach (CRecordDevice device in _Devices)
{
if (device.PlayerChannel1 > 0 || device.PlayerChannel2 > 0)
bool usingDevice = false;
for (int ch = 0; ch < device.Channels; ++ch)
{
var source = new CSoundCardSource(device.Driver, (short)device.Channels) {SampleRateKhz = 44.1};
if (device.PlayerChannel[ch] > 0)
usingDevice = true;
}
if (usingDevice)
{
var source = new CSoundCardSource(device.Driver, (short)device.Channels) { SampleRateKhz = 44.1 };
source.SampleDataReady += _OnDataReady;
source.Start();
Vocaluxe/Lib/Sound/Record/IRecord.cs
+2 -6
View File
@@ -27,19 +27,15 @@ namespace Vocaluxe.Lib.Sound.Record
public readonly string Driver;
public readonly int Channels;
public int PlayerChannel1;
public int PlayerChannel2;
public int[] PlayerChannel;
public CRecordDevice(int id, string name, string driver, int channels)
{
ID = id;
Name = name;
Driver = driver;
if (channels > 2)
channels = 2; //more are not supported in vocaluxe
Channels = channels;
PlayerChannel = new int[channels];
}
}
Vocaluxe/Lib/Sound/Record/PortAudio/CPortAudioRecord.cs
+14 -12
View File
@@ -99,16 +99,21 @@ namespace Vocaluxe.Lib.Sound.Record.PortAudio
for (int dev = 0; dev < _Devices.Count; dev++)
{
if (_Devices[dev].PlayerChannel1 > 0 || _Devices[dev].PlayerChannel2 > 0)
bool usingDevice = false;
for (int ch = 0; ch < _Devices[dev].Channels; ++ch) {
if (_Devices[dev].PlayerChannel[ch] > 0)
usingDevice = true;
}
if (usingDevice)
{
PortAudioSharp.PortAudio.PaStreamParameters? inputParams = new PortAudioSharp.PortAudio.PaStreamParameters
{
channelCount = _Devices[dev].Channels,
device = _Devices[dev].ID,
sampleFormat = PortAudioSharp.PortAudio.PaSampleFormat.paInt16,
suggestedLatency = PortAudioSharp.PortAudio.Pa_GetDeviceInfo(_Devices[dev].ID).defaultLowInputLatency,
hostApiSpecificStreamInfo = IntPtr.Zero
};
{
channelCount = _Devices[dev].Channels,
device = _Devices[dev].ID,
sampleFormat = PortAudioSharp.PortAudio.PaSampleFormat.paInt16,
suggestedLatency = PortAudioSharp.PortAudio.Pa_GetDeviceInfo(_Devices[dev].ID).defaultLowInputLatency,
hostApiSpecificStreamInfo = IntPtr.Zero
};
if (!_PaHandle.OpenInputStream(
out _RecHandle[dev],
ref inputParams,
@@ -181,10 +186,7 @@ namespace Vocaluxe.Lib.Sound.Record.PortAudio
{
CRecordDevice dev = _Devices[userData.ToInt32()];
uint numBytes;
if (dev.Channels == 2)
numBytes = frameCount * 4;
else
numBytes = frameCount * 2;
numBytes = frameCount * (uint)dev.Channels * 2;
byte[] recbuffer = new byte[numBytes];
Vocaluxe/Linux/Build/PostBuildEvent.sh
+2
View File
@@ -2,4 +2,6 @@
PROJECT=$1
cd $PROJECT
sed -i -r -e 's/AssemblyInformationalVersion\(".*?"\)/AssemblyInformationalVersion("GITVERSION")/' $PROJECT/Properties/AssemblyInfo.cs
sed -i -r -e 's/AssemblyVersion\(".*?"\)/AssemblyVersion("SHORTVERSION")/' $PROJECT/Properties/AssemblyInfo.cs
sed -i -r -e 's/AssemblyFileVersion\(".*?"\)/AssemblyFileVersion("SHORTVERSION")/' $PROJECT/Properties/AssemblyInfo.cs
sed -i -e 's/var matchingServerVersion = "";/var matchingServerVersion = "'$(git describe --long)'";/' $PROJECT/../Output/Website/js/main.js
Vocaluxe/Linux/Build/PreBuildEvent.sh
+2
View File
@@ -2,3 +2,5 @@
PROJECT=$1
cd $PROJECT
sed -i -e s/GITVERSION/$(git describe --long)/ $PROJECT/Properties/AssemblyInfo.cs
shortv=$(git describe --abbrev=0 | sed -e 's/alpha/0/' -e 's/beta/1/' -e 's/rc/2/')
sed -i -e s/SHORTVERSION/${shortv}/ $PROJECT/Properties/AssemblyInfo.cs
Vocaluxe/Properties/AssemblyInfo.cs
+3 -3
View File
@@ -27,7 +27,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Vocaluxe")]
[assembly: AssemblyCopyright("Copyright © 2013")]
[assembly: AssemblyCopyright("Copyright © 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -49,6 +49,6 @@ using System.Runtime.InteropServices;
// Revision
//
[assembly: AssemblyVersion("0.3.0.83")]
[assembly: AssemblyFileVersion("0.3.0.83")]
[assembly: AssemblyVersion("SHORTVERSION")]
[assembly: AssemblyFileVersion("SHORTVERSION")]
[assembly: AssemblyInformationalVersion("GITVERSION")]
Vocaluxe/Screens/CScreenHighscore.cs
+3 -2
View File
@@ -177,7 +177,7 @@ namespace Vocaluxe.Screens
name += " (P" + (_Scores[_Round][_Pos + p].VoiceNr + 1) + ")";
_Texts[_TextName[p]].Text = name;
_Texts[_TextScore[p]].Text = _Scores[_Round][_Pos + p].Score.ToString("00000");
_Texts[_TextScore[p]].Text = _Scores[_Round][_Pos + p].Score.ToString("D");
_Texts[_TextDate[p]].Text = _Scores[_Round][_Pos + p].Date;
_ParticleEffects[_ParticleEffectNew[p]].Visible = _IsNewEntry(_Scores[_Round][_Pos + p].ID);
@@ -239,7 +239,8 @@ namespace Vocaluxe.Screens
{
int songID = CGame.GetSong(round).ID;
EGameMode gameMode = CGame.GetGameMode(round);
_Scores[round] = CDataBase.LoadScore(songID, gameMode);
EHighscoreStyle style = CBase.Config.GetHighscoreStyle();
_Scores[round] = CDataBase.LoadScore(songID, gameMode, style);
}
}
Vocaluxe/Screens/CScreenMain.cs
+1 -3
View File
@@ -54,9 +54,7 @@ namespace Vocaluxe.Screens
base.LoadTheme(xmlPath);
_Texts[_TextRelease].Text = CSettings.GetFullVersionText();
// ReSharper disable ConditionIsAlwaysTrueOrFalse
_Texts[_TextRelease].Visible = CSettings.VersionRevision != ERevision.Release;
// ReSharper restore ConditionIsAlwaysTrueOrFalse
_Texts[_TextRelease].Visible = true;
_Statics[_StaticWarningProfiles].Visible = false;
_Texts[_TextWarningProfiles].Visible = false;
}
Vocaluxe/Screens/CScreenOptionsGame.cs
+5 -2
View File
@@ -27,7 +27,7 @@ namespace Vocaluxe.Screens
// Version number for theme files. Increment it, if you've changed something on the theme files!
protected override int _ScreenVersion
{
get { return 2; }
get { return 3; }
}
private const string _SelectSlideLanguage = "SelectSlideLanguage";
@@ -36,6 +36,7 @@ namespace Vocaluxe.Screens
private const string _SelectSlideSongSorting = "SelectSlideSongSorting";
private const string _SelectSlideTabs = "SelectSlideTabs";
private const string _SelectSlideTimerMode = "SelectSlideTimerMode";
private const string _SelectSlideHighscoreStyle = "SelectSlideHighscoreStyle";
private const string _ButtonExit = "ButtonExit";
private const string _ButtonServer = "ButtonServer";
@@ -45,7 +46,7 @@ namespace Vocaluxe.Screens
base.Init();
_ThemeButtons = new string[] {_ButtonExit, _ButtonServer};
_ThemeSelectSlides = new string[] {_SelectSlideLanguage, _SelectSlideDebugLevel, _SelectSlideSongMenu, _SelectSlideSongSorting, _SelectSlideTabs, _SelectSlideTimerMode};
_ThemeSelectSlides = new string[] {_SelectSlideLanguage, _SelectSlideDebugLevel, _SelectSlideSongMenu, _SelectSlideSongSorting, _SelectSlideTabs, _SelectSlideTimerMode, _SelectSlideHighscoreStyle};
}
public override void LoadTheme(string xmlPath)
@@ -60,6 +61,7 @@ namespace Vocaluxe.Screens
_SelectSlides[_SelectSlideSongSorting].SetValues<ESongSorting>((int)CConfig.Config.Game.SongSorting);
_SelectSlides[_SelectSlideTabs].SetValues<EOffOn>((int)CConfig.Config.Game.Tabs);
_SelectSlides[_SelectSlideTimerMode].SetValues<ETimerMode>((int)CConfig.Config.Game.TimerMode);
_SelectSlides[_SelectSlideHighscoreStyle].SetValues<EHighscoreStyle>((int)CConfig.Config.Game.HighscoreStyle);
}
public override bool HandleInput(SKeyEvent keyEvent)
@@ -140,6 +142,7 @@ namespace Vocaluxe.Screens
CConfig.Config.Game.SongSorting = (ESongSorting)_SelectSlides[_SelectSlideSongSorting].Selection;
CConfig.Config.Game.Tabs = (EOffOn)_SelectSlides[_SelectSlideTabs].Selection;
CConfig.Config.Game.TimerMode = (ETimerMode)_SelectSlides[_SelectSlideTimerMode].Selection;
CConfig.Config.Game.HighscoreStyle = (EHighscoreStyle)_SelectSlides[_SelectSlideHighscoreStyle].Selection;
CConfig.SaveConfig();
Vocaluxe/Screens/CScreenOptionsRecord.cs
+101 -133
View File
@@ -31,13 +31,13 @@ namespace Vocaluxe.Screens
// Version number for theme files. Increment it, if you've changed something on the theme files!
protected override int _ScreenVersion
{
get { return 4; }
get { return 5; }
}
private const string _SelectSlideRecordDevices = "SelectSlideRecordDevices";
private const string _SelectSlideRecordChannel1 = "SelectSlideRecordChannel1";
private const string _SelectSlideRecordChannel2 = "SelectSlideRecordChannel2";
private readonly string[] _SelectSlideRecordPlayer = { "SelectSlideRecordPlayer1", "SelectSlideRecordPlayer2", "SelectSlideRecordPlayer3", "SelectSlideRecordPlayer4", "SelectSlideRecordPlayer5", "SelectSlideRecordPlayer6" };
private const string _SelectSlideDelay = "SelectSlideDelay";
private const string _StaticWarning = "StaticWarning";
@@ -46,22 +46,19 @@ namespace Vocaluxe.Screens
private const string _ButtonExit = "ButtonExit";
private const string _ButtonDelayTest = "ButtonDelayTest";
private const string _TextChannel1 = "TextChannel1";
private const string _TextChannel2 = "TextChannel2";
private readonly string[] _TextPlayer = { "TextPlayer1", "TextPlayer2", "TextPlayer3", "TextPlayer4", "TextPlayer5", "TextPlayer6" };
private const string _TextDelayChannel1 = "TextDelayChannel1";
private const string _TextDelayChannel2 = "TextDelayChannel2";
private readonly string[] _TextDelayPlayer = { "TextDelayPlayer1", "TextDelayPlayer2", "TextDelayPlayer3", "TextDelayPlayer4", "TextDelayPlayer5", "TextDelayPlayer6" };
private const string _EqualizerChannel1 = "EqualizerChannel1";
private const string _EqualizerChannel2 = "EqualizerChannel2";
private readonly string[] _EqualizerPlayer = { "EqualizerPlayer1", "EqualizerPlayer2", "EqualizerPlayer3", "EqualizerPlayer4", "EqualizerPlayer5", "EqualizerPlayer6" };
private readonly string[] _StaticEnergyChannel = new string[] {"StaticEnergyChannel1", "StaticEnergyChannel2"};
private readonly string[] _StaticEnergyPlayer = new string[] { "StaticEnergyPlayer1", "StaticEnergyPlayer2", "StaticEnergyPlayer3", "StaticEnergyPlayer4", "StaticEnergyPlayer5", "StaticEnergyPlayer6" };
private float[] _ChannelEnergy;
private ReadOnlyCollection<CRecordDevice> _Devices;
private int _DeviceNr;
private readonly CDelayTest _DelayTest = new CDelayTest(2);
private readonly CDelayTest _DelayTest = new CDelayTest(6);
public override EMusicType CurrentMusicType
{
@@ -73,43 +70,27 @@ namespace Vocaluxe.Screens
base.Init();
var values = new List<string> {_StaticWarning};
values.AddRange(_StaticEnergyChannel);
values.AddRange(_StaticEnergyPlayer);
_ThemeStatics = values.ToArray();
_ThemeTexts = new string[] {_TextWarning, _TextChannel1, _TextChannel2, _TextDelayChannel1, _TextDelayChannel2};
_ThemeTexts = new string[] {_TextWarning, _TextPlayer[0], _TextPlayer[1], _TextPlayer[2], _TextPlayer[3], _TextPlayer[4], _TextPlayer[5], _TextDelayPlayer[0], _TextDelayPlayer[1], _TextDelayPlayer[2], _TextDelayPlayer[3], _TextDelayPlayer[4], _TextDelayPlayer[5] };
_ThemeButtons = new string[] {_ButtonExit, _ButtonDelayTest};
_ThemeSelectSlides = new string[] {_SelectSlideRecordDevices, _SelectSlideRecordChannel1, _SelectSlideRecordChannel2, _SelectSlideDelay};
_ThemeEqualizers = new string[] {_EqualizerChannel1, _EqualizerChannel2};
_ThemeSelectSlides = new string[] {_SelectSlideRecordDevices, _SelectSlideRecordPlayer[0], _SelectSlideRecordPlayer[1], _SelectSlideRecordPlayer[2], _SelectSlideRecordPlayer[3], _SelectSlideRecordPlayer[4], _SelectSlideRecordPlayer[5], _SelectSlideDelay };
_ThemeEqualizers = new string[] {_EqualizerPlayer[0], _EqualizerPlayer[1], _EqualizerPlayer[2], _EqualizerPlayer[3], _EqualizerPlayer[4], _EqualizerPlayer[5]};
}
public override void LoadTheme(string xmlPath)
{
base.LoadTheme(xmlPath);
int max = CSettings.MaxNumPlayer + 1;
if (max > 7)
max = 7;
_SelectSlides[_SelectSlideRecordChannel1].NumVisible = max;
_SelectSlides[_SelectSlideRecordChannel2].NumVisible = max;
_SelectSlides[_SelectSlideRecordChannel1].AddValue(CLanguage.Translate("TR_CONFIG_OFF"));
_SelectSlides[_SelectSlideRecordChannel2].AddValue(CLanguage.Translate("TR_CONFIG_OFF"));
for (int i = 1; i <= CSettings.MaxNumPlayer; i++)
{
_SelectSlides[_SelectSlideRecordChannel1].AddValue(i.ToString());
_SelectSlides[_SelectSlideRecordChannel2].AddValue(i.ToString());
}
for (int i = 0; i < 26; i++)
_SelectSlides[_SelectSlideDelay].AddValue((i * 20) + " ms");
_ChannelEnergy = new float[_StaticEnergyChannel.Length];
_ChannelEnergy = new float[_StaticEnergyPlayer.Length];
for (int i = 0; i < _ChannelEnergy.Length; i++)
{
_Statics[_StaticEnergyChannel[i]].Visible = false;
_Statics[_StaticEnergyPlayer[i]].Visible = false;
_ChannelEnergy[i] = 0f;
}
}
@@ -151,27 +132,11 @@ namespace Vocaluxe.Screens
break;
case Keys.Left:
if (_SelectSlides[_SelectSlideRecordDevices].Selected)
_OnDeviceEvent();
if (_SelectSlides[_SelectSlideRecordChannel1].Selected ||
_SelectSlides[_SelectSlideRecordChannel2].Selected)
_SetMicConfig();
if (_SelectSlides[_SelectSlideDelay].Selected)
_SaveDelayConfig();
_SelectSlideAction();
break;
case Keys.Right:
if (_SelectSlides[_SelectSlideRecordDevices].Selected)
_OnDeviceEvent();
if (_SelectSlides[_SelectSlideRecordChannel1].Selected ||
_SelectSlides[_SelectSlideRecordChannel2].Selected)
_SetMicConfig();
if (_SelectSlides[_SelectSlideDelay].Selected)
_SaveDelayConfig();
_SelectSlideAction();
break;
}
}
@@ -190,15 +155,7 @@ namespace Vocaluxe.Screens
if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{
if (_SelectSlides[_SelectSlideRecordDevices].Selected)
_OnDeviceEvent();
if (_SelectSlides[_SelectSlideRecordChannel1].Selected ||
_SelectSlides[_SelectSlideRecordChannel2].Selected)
_SetMicConfig();
if (_SelectSlides[_SelectSlideDelay].Selected)
_SaveDelayConfig();
_SelectSlideAction();
if (_Buttons[_ButtonExit].Selected)
{
@@ -220,42 +177,32 @@ namespace Vocaluxe.Screens
if (_DelayTest.Running)
{
_DelayTest.Update();
_Texts[_TextDelayChannel1].Text = (_DelayTest.Delays[0] == 0) ? "???" : _DelayTest.Delays[0].ToString("000") + " ms";
_Texts[_TextDelayChannel2].Text = (_DelayTest.Delays[1] == 0) ? "???" : _DelayTest.Delays[1].ToString("000") + " ms";
for (int p = 0; p < CSettings.MaxNumPlayer; ++p)
_Texts[_TextDelayPlayer[p]].Text = (_DelayTest.Delays[p] == 0) ? "??? ms" : _DelayTest.Delays[p].ToString("000") + " ms";
}
if (_CheckMicConfig())
{
int player = _SelectSlides[_SelectSlideRecordChannel1].Selection - 1;
if (player >= 0)
for (int p = 0; p < CSettings.MaxNumPlayer; ++p)
{
_ChannelEnergy[0] = CRecord.GetMaxVolume(player);
_Equalizers[_EqualizerChannel1].Update(CRecord.ToneWeigth(player), CRecord.GetMaxVolume(player));
}
else
{
_ChannelEnergy[0] = 0f;
_Equalizers[_EqualizerChannel1].Reset();
}
player = _SelectSlides[_SelectSlideRecordChannel2].Selection - 1;
if (player >= 0)
{
_ChannelEnergy[1] = CRecord.GetMaxVolume(player);
_Equalizers[_EqualizerChannel2].Update(CRecord.ToneWeigth(player), CRecord.GetMaxVolume(player));
}
else
{
_ChannelEnergy[1] = 0f;
_Equalizers[_EqualizerChannel2].Reset();
if(_SelectSlides[_SelectSlideRecordPlayer[p]].Selection > 0)
{
_ChannelEnergy[p] = CRecord.GetMaxVolume(p);
_Equalizers[_EqualizerPlayer[p]].Update(CRecord.ToneWeigth(p), CRecord.GetMaxVolume(p));
}
else
{
_ChannelEnergy[p] = 0f;
_Equalizers[_EqualizerPlayer[p]].Reset();
}
}
}
else
{
for (int i = 0; i < _ChannelEnergy.Length; i++)
_ChannelEnergy[i] = 0f;
_Equalizers[_EqualizerChannel1].Reset();
_Equalizers[_EqualizerChannel2].Reset();
for (int p = 0; p < CSettings.MaxNumPlayer; ++p)
_Equalizers[_EqualizerPlayer[p]].Reset();
}
bool showWarning = !_CheckMicConfig();
@@ -288,9 +235,8 @@ namespace Vocaluxe.Screens
_UpdateChannels();
}
_SelectSlides[_SelectSlideRecordChannel1].Visible = _Devices != null;
_SelectSlides[_SelectSlideRecordChannel2].Visible = _Devices != null;
for (int p = 0; p < CSettings.MaxNumPlayer; ++p)
_SelectSlides[_SelectSlideRecordPlayer[p]].Visible = _Devices != null;
_Statics[_StaticWarning].Visible = false;
_Texts[_TextWarning].Visible = false;
@@ -309,17 +255,17 @@ namespace Vocaluxe.Screens
{
base.Draw();
for (int i = 0; i < _StaticEnergyChannel.Length; i++)
for (int i = 0; i < _StaticEnergyPlayer.Length; i++)
{
if (_ChannelEnergy[i] > 0f)
{
var rect = new SRectF(_Statics[_StaticEnergyChannel[i]].Rect.X,
_Statics[_StaticEnergyChannel[i]].Rect.Y,
_Statics[_StaticEnergyChannel[i]].Rect.W * _ChannelEnergy[i],
_Statics[_StaticEnergyChannel[i]].Rect.H,
_Statics[_StaticEnergyChannel[i]].Rect.Z);
var rect = new SRectF(_Statics[_StaticEnergyPlayer[i]].Rect.X,
_Statics[_StaticEnergyPlayer[i]].Rect.Y,
_Statics[_StaticEnergyPlayer[i]].Rect.W * _ChannelEnergy[i],
_Statics[_StaticEnergyPlayer[i]].Rect.H,
_Statics[_StaticEnergyPlayer[i]].Rect.Z);
CDraw.DrawTexture(_Statics[_StaticEnergyChannel[i]].Texture, _Statics[_StaticEnergyChannel[i]].Rect,
CDraw.DrawTexture(_Statics[_StaticEnergyPlayer[i]].Texture, _Statics[_StaticEnergyPlayer[i]].Rect,
new SColorF(1f, 1f, 1f, 1f), rect);
}
}
@@ -363,18 +309,14 @@ namespace Vocaluxe.Screens
foreach (CRecordDevice device in _Devices)
{
if (device.PlayerChannel1 > 0)
for (int ch = 0; ch < (uint)device.Channels; ++ch)
{
CConfig.Config.Record.MicConfig[device.PlayerChannel1 - 1].Channel = 1;
CConfig.Config.Record.MicConfig[device.PlayerChannel1 - 1].DeviceName = device.Name;
CConfig.Config.Record.MicConfig[device.PlayerChannel1 - 1].DeviceDriver = device.Driver;
}
if (device.PlayerChannel2 > 0)
{
CConfig.Config.Record.MicConfig[device.PlayerChannel2 - 1].Channel = 2;
CConfig.Config.Record.MicConfig[device.PlayerChannel2 - 1].DeviceName = device.Name;
CConfig.Config.Record.MicConfig[device.PlayerChannel2 - 1].DeviceDriver = device.Driver;
if (device.PlayerChannel[ch] > 0)
{
CConfig.Config.Record.MicConfig[device.PlayerChannel[ch] - 1].Channel = ch+1;
CConfig.Config.Record.MicConfig[device.PlayerChannel[ch] - 1].DeviceName = device.Name;
CConfig.Config.Record.MicConfig[device.PlayerChannel[ch] - 1].DeviceDriver = device.Driver;
}
}
}
CConfig.SaveConfig();
@@ -382,31 +324,62 @@ namespace Vocaluxe.Screens
CRecord.Start();
}
private void _SetPlayerColors()
{
_Texts[_TextChannel1].Color = _SelectSlides[_SelectSlideRecordChannel1].Selection <= 0
? new SColorF(1, 1, 1, 1) : CThemes.GetPlayerColor(_SelectSlides[_SelectSlideRecordChannel1].Selection);
_Texts[_TextChannel2].Color = _SelectSlides[_SelectSlideRecordChannel2].Selection <= 0
? new SColorF(1, 1, 1, 1) : CThemes.GetPlayerColor(_SelectSlides[_SelectSlideRecordChannel2].Selection);
}
private void _SetMicConfig()
{
if (_DeviceNr < 0)
return;
CRecordDevice device = _Devices[_DeviceNr];
device.PlayerChannel1 = _SelectSlides[_SelectSlideRecordChannel1].Selection;
device.PlayerChannel2 = _SelectSlides[_SelectSlideRecordChannel2].Selection;
_SetPlayerColors();
for (int ch = 0; ch < device.Channels; ++ch)
device.PlayerChannel[ch] = 0;
for (int p = 0; p < CSettings.MaxNumPlayer; ++p)
{
int ch = _SelectSlides[_SelectSlideRecordPlayer[p]].Selection;
if (ch > 0)
device.PlayerChannel[ch-1] = p+1;
}
}
private void _SelectSlideAction()
{
if (_SelectSlides[_SelectSlideRecordDevices].Selected)
_OnDeviceEvent();
for (int i = 0; i < _SelectSlideRecordPlayer.Length; ++i)
if (_SelectSlides[_SelectSlideRecordPlayer[i]].Selected)
_SetMicConfig();
if (_SelectSlides[_SelectSlideDelay].Selected)
_SaveDelayConfig();
}
private void _UpdateChannels()
{
_SelectSlides[_SelectSlideRecordChannel1].Selection = _Devices[_DeviceNr].PlayerChannel1;
_SelectSlides[_SelectSlideRecordChannel2].Selection = _Devices[_DeviceNr].PlayerChannel2;
int max = _Devices[_DeviceNr].Channels + 1;
for (int p = 0; p < CSettings.MaxNumPlayer; ++p)
{
_SelectSlides[_SelectSlideRecordPlayer[p]].Clear();
_SelectSlides[_SelectSlideRecordPlayer[p]].NumVisible = max;
_SelectSlides[_SelectSlideRecordPlayer[p]].AddValue(CLanguage.Translate("TR_CONFIG_OFF"));
}
for (int i = 1; i <= _Devices[_DeviceNr].Channels; ++i)
{
for (int p = 0; p < CSettings.MaxNumPlayer; ++p)
_SelectSlides[_SelectSlideRecordPlayer[p]].AddValue(i.ToString());
int pc = _Devices[_DeviceNr].PlayerChannel[i-1];
if (pc > 0)
{
_SelectSlides[_SelectSlideRecordPlayer[pc-1]].Selection = i;
}
}
_SaveMicConfig();
_SetPlayerColors();
}
private bool _CheckMicConfig()
@@ -420,20 +393,15 @@ namespace Vocaluxe.Screens
foreach (CRecordDevice device in _Devices)
{
if (device.PlayerChannel1 > 0)
for (int i = 0; i < device.Channels; ++i)
{
if (isSet[device.PlayerChannel1 - 1])
return false;
if (device.PlayerChannel[i] > 0)
{
if (isSet[device.PlayerChannel[i] - 1])
return false;
isSet[device.PlayerChannel1 - 1] = true;
}
if (device.PlayerChannel2 > 0)
{
if (isSet[device.PlayerChannel2 - 1])
return false;
isSet[device.PlayerChannel2 - 1] = true;
isSet[device.PlayerChannel[i] - 1] = true;
}
}
}
return true;
@@ -443,7 +411,7 @@ namespace Vocaluxe.Screens
{
_SaveMicConfig();
_DelayTest.Reset();
_DelayTest.Start(new int[] {_SelectSlides[_SelectSlideRecordChannel1].Selection - 1, _SelectSlides[_SelectSlideRecordChannel2].Selection - 1});
_DelayTest.Start(new int[] {0, 1, 2, 3, 4, 5});
}
private void _GetFirstConfiguredRecordDevice(ref int device)
Vocaluxe/Screens/CScreenOptionsSound.cs
+12 -2
View File
@@ -27,7 +27,7 @@ namespace Vocaluxe.Screens
// Version number for theme files. Increment it, if you've changed something on the theme files!
protected override int _ScreenVersion
{
get { return 3; }
get { return 4; }
}
private const string _SelectSlideBackgroundMusic = "SelectSlideBackgroundMusic";
@@ -35,6 +35,7 @@ namespace Vocaluxe.Screens
private const string _SelectSlideBackgroundMusicSource = "SelectSlideBackgroundMusicSource";
private const string _SelectSlidePreviewMusicVolume = "SelectSlidePreviewMusicVolume";
private const string _SelectSlideGameMusicVolume = "SelectSlideGameMusicVolume";
private const string _SelectSlideKaraokeEffect = "SelectSlideKaraokeEffect";
private const string _ButtonExit = "ButtonExit";
@@ -46,7 +47,7 @@ namespace Vocaluxe.Screens
_ThemeButtons = new string[] {_ButtonExit};
_ThemeSelectSlides = new string[]
{_SelectSlideBackgroundMusic, _SelectSlideBackgroundMusicVolume, _SelectSlideBackgroundMusicSource, _SelectSlidePreviewMusicVolume, _SelectSlideGameMusicVolume};
{_SelectSlideBackgroundMusic, _SelectSlideBackgroundMusicVolume, _SelectSlideBackgroundMusicSource, _SelectSlidePreviewMusicVolume, _SelectSlideGameMusicVolume, _SelectSlideKaraokeEffect};
}
public override void LoadTheme(string xmlPath)
@@ -64,6 +65,11 @@ namespace Vocaluxe.Screens
_SelectSlides[_SelectSlideGameMusicVolume].AddValues(new string[]
{"0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"});
_SelectSlides[_SelectSlideGameMusicVolume].Selection = CConfig.GameMusicVolume / 5;
if (CConfig.Config.Sound.PlayBackLib == EPlaybackLib.GstreamerSharp)
{
_SelectSlides[_SelectSlideKaraokeEffect].SetValues<EOffOn>((int)CConfig.Config.Sound.KaraokeEffect);
_SelectSlides[_SelectSlideBackgroundMusicSource].Selection = (int)CConfig.Config.Sound.KaraokeEffect;
}
}
public override bool HandleInput(SKeyEvent keyEvent)
@@ -147,6 +153,10 @@ namespace Vocaluxe.Screens
CConfig.Config.Sound.BackgroundMusic = (EBackgroundMusicOffOn)_SelectSlides[_SelectSlideBackgroundMusic].Selection;
CConfig.Config.Sound.BackgroundMusicSource = (EBackgroundMusicSource)_SelectSlides[_SelectSlideBackgroundMusicSource].Selection;
CConfig.BackgroundMusicVolume = _SelectSlides[_SelectSlideBackgroundMusicVolume].Selection * 5;
if (CConfig.Config.Sound.PlayBackLib == EPlaybackLib.GstreamerSharp)
{
CConfig.Config.Sound.KaraokeEffect = (EOffOn)_SelectSlides[_SelectSlideKaraokeEffect].Selection;
}
CConfig.SaveConfig();
CBackgroundMusic.SetMusicSource(CConfig.Config.Sound.BackgroundMusicSource);
Vocaluxe/Screens/CScreenSing.cs
+2 -1
View File
@@ -24,6 +24,7 @@ using System.Linq;
using System.Windows.Forms;
using Vocaluxe.Base;
using Vocaluxe.Base.Fonts;
using Vocaluxe.Lib.Sound;
using VocaluxeLib;
using VocaluxeLib.Draw;
using VocaluxeLib.Menu;
@@ -525,7 +526,7 @@ namespace Vocaluxe.Screens
songname += " (" + CGame.RoundNr + "/" + rounds + ")";
_Texts[_TextSongName].Text = songname;
_CurrentStream = CSound.Load(song.GetMP3(), false, true);
_CurrentStream = CSound.Load(song.GetMP3(), false, true, CConfig.Config.Sound.KaraokeEffect == EOffOn.TR_CONFIG_ON ? EAudioEffect.Karaoke : EAudioEffect.None);
CSound.SetStreamVolume(_CurrentStream, 100);
CSound.SetPosition(_CurrentStream, song.Start);
_CurrentTime = song.Start;
Vocaluxe/Screens/CScreenSong.cs
+15 -15
View File
@@ -372,9 +372,9 @@ namespace Vocaluxe.Screens
else if (_Buttons[_ButtonOptionsOpenSelectedItem].Selected)
_HandleSelectButton();
else if (_SelectSlides[_SelectSlideOptionsPlaylistOpen].Selected)
_OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistOpen].Selection);
_OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistOpen].SelectedTag);
else if (_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selected)
_OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1);
_OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistAdd].SelectedTag);
else if (_Buttons[_ButtonOptionsRandomMedley].Selected)
_ToggleSongOptions(ESongOptionsView.Medley);
else if (_Buttons[_ButtonOptionsStartMedley].Selected)
@@ -533,12 +533,12 @@ namespace Vocaluxe.Screens
}
else if (_SelectSlides[_SelectSlideOptionsPlaylistOpen].IsValueSelected)
{
_OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistOpen].Selection);
_OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistOpen].SelectedTag);
return true;
}
else if (_SelectSlides[_SelectSlideOptionsPlaylistAdd].IsValueSelected)
{
_OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1);
_OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistAdd].SelectedTag);
return true;
}
else if (_Buttons[_ButtonOptionsRandomMedley].Selected)
@@ -1279,16 +1279,16 @@ namespace Vocaluxe.Screens
private void _UpdatePlaylistNames()
{
_SelectSlides[_SelectSlideOptionsPlaylistAdd].Clear();
_SelectSlides[_SelectSlideOptionsPlaylistAdd].AddValue("TR_SCREENSONG_NEWPLAYLIST");
_SelectSlides[_SelectSlideOptionsPlaylistAdd].AddValues(CPlaylists.Names);
_SelectSlides[_SelectSlideOptionsPlaylistAdd].AddValue("TR_SCREENSONG_NEWPLAYLIST", tag: -1);
_SelectSlides[_SelectSlideOptionsPlaylistAdd].AddValues(CPlaylists.Names, CPlaylists.Ids);
_SelectSlides[_SelectSlideOptionsPlaylistOpen].Clear();
_SelectSlides[_SelectSlideOptionsPlaylistOpen].AddValues(CPlaylists.Names);
_SelectSlides[_SelectSlideOptionsPlaylistOpen].AddValues(CPlaylists.Names, CPlaylists.Ids);
}
private void _OpenAndAddPlaylistAction()
{
if (_Playlist.ActivePlaylistID != (_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1) &&
(_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1) != -1)
if (_Playlist.ActivePlaylistID != (_SelectSlides[_SelectSlideOptionsPlaylistAdd].SelectedTag) &&
(_SelectSlides[_SelectSlideOptionsPlaylistAdd].SelectedTag) != -1)
{
//Open an existing playlist and add song
//Check selected game-mode
@@ -1301,9 +1301,9 @@ namespace Vocaluxe.Screens
gm = EGameMode.TR_GAMEMODE_NORMAL;
//Check if Playlist really exists
if (_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1 >= 0)
if (_SelectSlides[_SelectSlideOptionsPlaylistAdd].SelectedTag >= 0)
{
_Playlist.ActivePlaylistID = _SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1;
_Playlist.ActivePlaylistID = _SelectSlides[_SelectSlideOptionsPlaylistAdd].SelectedTag;
//Add song to playlist
CPlaylists.AddSong(_Playlist.ActivePlaylistID, CSongs.VisibleSongs[_SongMenu.GetPreviewSongNr()].ID, gm);
@@ -1314,7 +1314,7 @@ namespace Vocaluxe.Screens
_Playlist.ScrollToBottom();
}
}
else if ((_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1) == -1)
else if ((_SelectSlides[_SelectSlideOptionsPlaylistAdd].SelectedTag) == -1)
{
//Create a new playlist and add song
//Check selected game-mode
@@ -1336,8 +1336,8 @@ namespace Vocaluxe.Screens
_OpenPlaylist(_Playlist.ActivePlaylistID);
//Add new playlist to select-slide
_SelectSlides[_SelectSlideOptionsPlaylistAdd].AddValue(CPlaylists.GetName(_Playlist.ActivePlaylistID));
_SelectSlides[_SelectSlideOptionsPlaylistOpen].AddValue(CPlaylists.GetName(_Playlist.ActivePlaylistID));
_SelectSlides[_SelectSlideOptionsPlaylistAdd].AddValue(CPlaylists.GetName(_Playlist.ActivePlaylistID), _Playlist.ActivePlaylistID);
_SelectSlides[_SelectSlideOptionsPlaylistOpen].AddValue(CPlaylists.GetName(_Playlist.ActivePlaylistID), _Playlist.ActivePlaylistID);
}
else
{
@@ -1359,7 +1359,7 @@ namespace Vocaluxe.Screens
private void _SetSelectSlidePlaylistToCurrentPlaylist()
{
if (_Playlist.ActivePlaylistID > -1)
_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection = _Playlist.ActivePlaylistID + 1;
_SelectSlides[_SelectSlideOptionsPlaylistAdd].SelectedTag = _Playlist.ActivePlaylistID;
else
_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection = 0;
}
Vocaluxe/Vocaluxe.csproj
+15 -14
View File
@@ -185,6 +185,7 @@
<Compile Include="Lib\Draw\CTextureBase.cs" />
<Compile Include="Lib\Draw\CTextureProvider.cs" />
<Compile Include="Lib\Input\CGamePad.cs" />
<Compile Include="Lib\Sound\EAudioEffect.cs" />
<Compile Include="Lib\Sound\Playback\CAudioStreamBase.cs" />
<Compile Include="Lib\Sound\Playback\CPlaybackBase.cs" />
<Compile Include="Lib\Sound\Playback\CRingBuffer.cs" />
@@ -478,12 +479,12 @@
<PropertyGroup>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">xcopy /E /D /Y "$(ProjectDir)\Website" "$(SolutionDir)\PhoneGap"
powershell -command "if($Env:GIT_VERSION_TAG) {$version = $Env:GIT_VERSION_TAG;} else {$version = git describe --long;}(Get-Content -Encoding UTF8 '$(ProjectDir)..\Output\Website\js\main.js') | Foreach-Object {$_ -replace '(?&lt;=var *matchingServerVersion * = *\")\w*(?=\" *;)', "$version"} | Set-Content -Encoding UTF8 '$(ProjectDir)..\Output\Website\js\main.js'"
powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs') | Foreach-Object {$_ -replace '(?&lt;=AssemblyInformationalVersion\()(.*)(?=\))', '\"GITVERSION\"'} | Set-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs'"</PostBuildEvent>
powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs') | Foreach-Object {$_ -replace '(?&lt;=AssemblyInformationalVersion\(\").*(?=\")', 'GITVERSION'} | Foreach-Object {$_ -replace '(?&lt;=(AssemblyVersion|AssemblyFileVersion)\(\").*(?=\")', 'SHORTVERSION'} | Set-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs' "</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">cp -ruT "$(ProjectDir)Website" "$(SolutionDir)/PhoneGap"</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">$(ProjectDir)Linux/Build/PostBuildEvent.sh $(ProjectDir)</PostBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">powershell -command "if($Env:GIT_VERSION_TAG) {$version = $Env:GIT_VERSION_TAG;} else {$version = git describe --long;} (Get-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs') | Foreach-Object {$_ -replace 'GITVERSION', $version} | Set-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs'"</PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">powershell -command " if($Env:GIT_VERSION_TAG) {$version = $Env:GIT_VERSION_TAG;} else {$version = git describe --long;} (Get-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs') | Foreach-Object {$_ -replace '(?&lt;=AssemblyInformationalVersion\(\").*(?=\")', $version} | Foreach-Object {$_ -replace '(?&lt;=(AssemblyVersion|AssemblyFileVersion)\(\").*(?=\")', $version.Split('-')[0].replace('alpha','0').replace('beta','1').replace('rc','2')} | Foreach-Object {$_ -replace '(?&lt;=AssemblyCopyright\(\".*)[0-9]+(?=\")', (Get-Date).Year} | Set-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs' "</PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">$(ProjectDir)Linux/Build/PreBuildEvent.sh $(ProjectDir)</PreBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -535,31 +536,31 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Rebuild for automatic package restore. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.2\build\vocaluxe.dependencies.acinerella.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.acinerella.1.0.2\build\vocaluxe.dependencies.acinerella.targets'))" />
<Error Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND !Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.4\build\vocaluxe.dependencies.acinerella.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.acinerella.1.0.4\build\vocaluxe.dependencies.acinerella.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.2\build\vocaluxe.dependencies.ffmpeg.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.ffmpeg.1.0.2\build\vocaluxe.dependencies.ffmpeg.targets'))" />
<Error Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND !Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.4\build\vocaluxe.dependencies.ffmpeg.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.ffmpeg.1.0.4\build\vocaluxe.dependencies.ffmpeg.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.3\build\vocaluxe.dependencies.hidapi.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.hidapi.1.0.3\build\vocaluxe.dependencies.hidapi.targets'))" />
<Error Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND !Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.2\build\vocaluxe.dependencies.portaudiosharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.portaudiosharp.1.0.2\build\vocaluxe.dependencies.portaudiosharp.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.1\build\vocaluxe.dependencies.gstreamer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamer.1.0.1\build\vocaluxe.dependencies.gstreamer.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.1.0.8\build\vocaluxe.dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.1.0.8\build\vocaluxe.dependencies.targets'))" />
<Error Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND !Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.1.0.11\build\vocaluxe.dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.1.0.11\build\vocaluxe.dependencies.targets'))" />
</Target>
<Import Project="..\packages\vocaluxe.dependencies.acinerella.1.0.2\build\vocaluxe.dependencies.acinerella.targets" Condition="Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.2\build\vocaluxe.dependencies.acinerella.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.acinerella.1.0.4\build\vocaluxe.dependencies.acinerella.targets" Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.4\build\vocaluxe.dependencies.acinerella.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets" Condition="Exists('..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets" Condition="Exists('..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.ffmpeg.1.0.2\build\vocaluxe.dependencies.ffmpeg.targets" Condition="Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.2\build\vocaluxe.dependencies.ffmpeg.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.ffmpeg.1.0.4\build\vocaluxe.dependencies.ffmpeg.targets" Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.4\build\vocaluxe.dependencies.ffmpeg.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.hidapi.1.0.3\build\vocaluxe.dependencies.hidapi.targets" Condition="Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.3\build\vocaluxe.dependencies.hidapi.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets" Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets" Condition="Exists('..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.portaudiosharp.1.0.2\build\vocaluxe.dependencies.portaudiosharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.2\build\vocaluxe.dependencies.portaudiosharp.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets" Condition="Exists('..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets" Condition="Exists('..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets" Condition="Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.gstreamer.1.0.1\build\vocaluxe.dependencies.gstreamer.targets" Condition="Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.1\build\vocaluxe.dependencies.gstreamer.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.1.0.8\build\vocaluxe.dependencies.targets" Condition="Exists('..\packages\vocaluxe.dependencies.1.0.8\build\vocaluxe.dependencies.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets" Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.1.0.11\build\vocaluxe.dependencies.targets" Condition="Exists('..\packages\vocaluxe.dependencies.1.0.11\build\vocaluxe.dependencies.targets')" />
</Project>
Vocaluxe/packages.config
+6 -6
View File
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="vocaluxe.dependencies" version="1.0.8" targetFramework="net40" />
<package id="vocaluxe.dependencies.acinerella" version="1.0.2" targetFramework="net40" />
<package id="vocaluxe.dependencies" version="1.0.11" targetFramework="net40" />
<package id="vocaluxe.dependencies.acinerella" version="1.0.4" targetFramework="net40" />
<package id="vocaluxe.dependencies.aforgevideo" version="1.0.1" targetFramework="net40" />
<package id="vocaluxe.dependencies.csharpsqlite" version="1.0.1" targetFramework="net40" />
<package id="vocaluxe.dependencies.ffmpeg" version="1.0.2" targetFramework="net40" />
<package id="vocaluxe.dependencies.gstreamer" version="1.0.1" targetFramework="net40" />
<package id="vocaluxe.dependencies.ffmpeg" version="1.0.4" targetFramework="net40" />
<package id="vocaluxe.dependencies.gstreamer" version="1.0.2" targetFramework="net40" />
<package id="vocaluxe.dependencies.gstreamersharp" version="1.0.1" targetFramework="net40" />
<package id="vocaluxe.dependencies.hidapi" version="1.0.3" targetFramework="net40" />
<package id="vocaluxe.dependencies.hidapi" version="1.0.4" targetFramework="net40" />
<package id="vocaluxe.dependencies.opentk" version="1.0.1" targetFramework="net40" />
<package id="vocaluxe.dependencies.portaudiosharp" version="1.0.1" targetFramework="net40" />
<package id="vocaluxe.dependencies.portaudiosharp" version="1.0.2" targetFramework="net40" />
<package id="vocaluxe.dependencies.qrcoder" version="1.0.1" targetFramework="net40" />
<package id="vocaluxe.dependencies.slimdx" version="1.0.1" targetFramework="net40" />
<package id="vocaluxe.dependencies.sqlite" version="1.0.1" targetFramework="net40" />
VocaluxeLib/Enums.cs
+10 -4
View File
@@ -321,10 +321,10 @@ namespace VocaluxeLib
public enum ELyricStyle
{
Fill,
Jump,
Slide,
Zoom
TR_CONFIG_LYRICSTYLE_FILL,
TR_CONFIG_LYRICSTYLE_JUMP,
TR_CONFIG_LYRICSTYLE_SLIDE,
TR_CONFIG_LYRICSTYLE_ZOOM
}
#endregion Config
@@ -369,6 +369,12 @@ namespace VocaluxeLib
Game
}
public enum EHighscoreStyle
{
TR_CONFIG_HIGHSCORE_LIST_ALL,
TR_CONFIG_HIGHSCORE_LIST_BEST
}
/// <summary>
/// Base screens
/// </summary>
VocaluxeLib/IBasic.cs
+2
View File
@@ -46,6 +46,8 @@ namespace VocaluxeLib
ESongMenu GetSongMenuType();
EHighscoreStyle GetHighscoreStyle();
EOffOn GetDrawNoteLines();
EOffOn GetDrawToneHelper();
VocaluxeLib/Menu/CLyric.cs
+7 -7
View File
@@ -88,7 +88,7 @@ namespace VocaluxeLib.Menu
_Line = new CSongLine();
_Text = new CText(_PartyModeID);
LyricStyle = ELyricStyle.Fill;
LyricStyle = ELyricStyle.TR_CONFIG_LYRICSTYLE_FILL;
}
public CLyric(SThemeLyrics theme, int partyModeID)
@@ -100,7 +100,7 @@ namespace VocaluxeLib.Menu
_Text = new CText(_PartyModeID);
_Width = 1f;
LyricStyle = ELyricStyle.Fill;
LyricStyle = ELyricStyle.TR_CONFIG_LYRICSTYLE_FILL;
ThemeLoaded = true;
}
@@ -185,14 +185,14 @@ namespace VocaluxeLib.Menu
{
switch (LyricStyle)
{
case ELyricStyle.Fill:
case ELyricStyle.TR_CONFIG_LYRICSTYLE_FILL:
_DrawFill();
break;
case ELyricStyle.Slide:
case ELyricStyle.TR_CONFIG_LYRICSTYLE_SLIDE:
_DrawSlide();
break;
case ELyricStyle.Zoom:
case ELyricStyle.Jump:
case ELyricStyle.TR_CONFIG_LYRICSTYLE_ZOOM:
case ELyricStyle.TR_CONFIG_LYRICSTYLE_JUMP:
_DrawZoomOrJump();
break;
default:
@@ -368,7 +368,7 @@ namespace VocaluxeLib.Menu
return;
_SetText(highlightNote);
_Text.X = hX;
if (LyricStyle == ELyricStyle.Jump)
if (LyricStyle == ELyricStyle.TR_CONFIG_LYRICSTYLE_JUMP)
_DrawJumpingNode(highlightNote);
else
_DrawZoomedNote(highlightNote, hEndBeat);
VocaluxeLib/Menu/CMenuPartyNameSelection.cs
+5 -2
View File
@@ -618,6 +618,7 @@ namespace VocaluxeLib.Menu
_UpdatePlayerSlide();
}
_UpdateButtonState();
_UpdateNextButtonVisibility();
}
public void DecreasePlayerNum(int team)
@@ -633,6 +634,7 @@ namespace VocaluxeLib.Menu
_UpdatePlayerSlide();
}
_UpdateButtonState();
_UpdateNextButtonVisibility();
}
#region private methods
@@ -725,7 +727,7 @@ namespace VocaluxeLib.Menu
{
if (_NumPlayerTeams[team] == _TeamList[team].Count && !_ChangePlayerNumDynamic)
return;
if (_NumPlayerTeams[team] == _PartyMode.MaxPlayersPerTeam)
if (_NumPlayerTeams[team] > _PartyMode.MaxPlayersPerTeam)
return;
_NameSelections[_NameSelection].UseProfile(profileID);
@@ -774,7 +776,8 @@ namespace VocaluxeLib.Menu
for (int p = 0; p < _NumPlayerTeams[t]; p++)
{
int profileID = _NameSelections[_NameSelection].GetRandomUnusedProfile();
_AddPlayer(t, profileID);
if(profileID >= 0) //only add valid profiles
_AddPlayer(t, profileID);
}
}
}
VocaluxeLib/Menu/CNameSelection.cs
+3 -15
View File
@@ -465,23 +465,11 @@ namespace VocaluxeLib.Menu
public int GetRandomUnusedProfile()
{
int id = -1;
if (_VisibleProfiles.Count == 0)
return id;
return -1;
if (_VisibleProfiles.Count == _UsedProfiles.Count)
return id;
while (id == -1)
{
int rand = CBase.Game.GetRandom(_VisibleProfiles.Count);
if (_UsedProfiles.Contains(_VisibleProfiles[rand]))
continue;
id = _VisibleProfiles[rand];
}
return id;
int rand = CBase.Game.GetRandom(_VisibleProfiles.Count);
return _VisibleProfiles[rand];
}
private void _PrepareTiles()
VocaluxeLib/Menu/CPlaylist.cs
+1
View File
@@ -1087,6 +1087,7 @@ namespace VocaluxeLib.Menu
};
_PlaylistElementContents.Add(pec);
}
_SetSelectionToFirstEntry();
_Update();
return true;
}
VocaluxeLib/Menu/CSelectSlide.cs
+20 -4
View File
@@ -436,6 +436,22 @@ namespace VocaluxeLib.Menu
AddValue(value);
}
public void AddValues(IEnumerable<string> values, IEnumerable<int> tags)
{
using (var e1 = values.GetEnumerator())
using (var e2 = tags.GetEnumerator())
{
while (e1.MoveNext() && e2.MoveNext())
{
AddValue(e1.Current, tag: e2.Current);
}
if (e1.MoveNext() || e2.MoveNext())
{
throw new ArgumentException("the lists must have the same length");
}
}
}
public void AddValues(string[] values, CTextureRef[] textures)
{
Debug.Assert(values.Length == textures.Length);
@@ -566,10 +582,10 @@ namespace VocaluxeLib.Menu
for (int i = 0; i < numvis; i++)
{
var el = new CElement
{
Text = new CText(0, 0, 0, _TextH, _MaxW, EAlignment.Center, _Theme.TextStyle, _Theme.TextFont, _TextColor, "T", _PartyModeID),
Img = new CStatic(_PartyModeID)
};
{
Text = new CText(0, 0, 0, _TextH, _MaxW, EAlignment.Center, _Theme.TextStyle, _Theme.TextFont, _TextColor, "T", _PartyModeID),
Img = new CStatic(_PartyModeID)
};
_VisibleElements.Add(el);
}
}
appveyor.yml
+49 -22
View File
@@ -11,47 +11,72 @@ environment:
GitHubKey:
secure: JSlN/em0JdspVn8jwaQ4IjugY6OQi0au4Qq0rhctJmcfGMaEGnUAOmDFULI48REW
install:
- ps: >-
- ps: |
$Env:CurrentCommitSha = "$(git rev-parse --verify HEAD)"
$Env:githubRepoApiUri = "https://api.github.com/repos/Vocaluxe/Vocaluxe/"
if((-not $Env:githubRepoApiUri) -or ($Env:APPVEYOR_ACCOUNT_NAME -eq "VocaluxeBuildBot")){
$Env:githubRepoApiUri = "https://api.github.com/repos/Vocaluxe/Vocaluxe/"
}
Write-Host "GitHub api url: $Env:githubRepoApiUri"
./.appveyor/gitDescribe.ps1
$Env:GIT_VERSION_TAG = $Env:VersionTag
$Env:GIT_VERSION_TAG = $Env:VersionTag
Write-Host "GIT_VERSION_TAG: $Env:GIT_VERSION_TAG"
if($Env:APPVEYOR_REPO_TAG -eq "true"){
$Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK = $Env:APPVEYOR_REPO_TAG_NAME
$Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK = $Env:APPVEYOR_REPO_TAG_NAME
}
else{
$Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK = $Env:APPVEYOR_REPO_BRANCH
}
./.appveyor/moveTagForSpecialBranches.ps1
$Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK = $Env:APPVEYOR_REPO_BRANCH
}
before_build:
- ps: >-
- ps: |
Try
{
Start-FileDownload 'https://github.com/lukeIam/VocaluxeDependencies/blob/master/zips/themes/vocaluxe.themes.ambient.video.zip?raw=true'
& 7z x '-aoa' '-oOutput/' './vocaluxe.themes.ambient.video.zip'
Remove-Item './vocaluxe.themes.ambient.video.zip'
}
Catch
{
Write-Warning "Ambient-Video download failed"
}
nuget restore -DisableParallelProcessing
#(Get-Content -Encoding UTF8 'PitchTracker\PitchTracker.vcxproj') | Foreach-Object {$_ -replace 'v110_xp', 'v120_xp'} | Set-Content -Encoding UTF8 'PitchTracker\PitchTracker.vcxproj'
build:
project: Vocaluxe.sln
verbosity: normal
after_build:
- ps: >-
- ps: |
cd Output
7z a "Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM).zip" *
$Env:MAIN_REPO = $False
appveyor PushArtifact "Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM).zip" -FileName "Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM).zip" -DeploymentName ReleaseZip
if($Env:APPVEYOR_REPO_NAME -eq "Vocaluxe/Vocaluxe"){
$Env:MAIN_REPO = $True
Write-Host "Main repo Vocaluxe/Vocaluxe detected"
}
$forkBuildTag = ""
if(($Env:MAIN_REPO -ne $True) -or ($Env:APPVEYOR_ACCOUNT_NAME -ne "VocaluxeBuildBot")){
$forkBuildTag = "_non-official-by-$Env:APPVEYOR_ACCOUNT_NAME"
Write-Host "Non official build detected: $Env:APPVEYOR_REPO_NAME by $Env:APPVEYOR_ACCOUNT_NAME"
}
7z a "Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM)$forkBuildTag.zip" *
appveyor PushArtifact "Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM)$forkBuildTag.zip" -FileName "Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM)$forkBuildTag.zip" -DeploymentName ReleaseZip
cd ..
.\.appveyor\nightlyDetect.ps1
Write-Host "Created artifact: Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM)$forkBuildTag.zip"
if($Env:MAIN_REPO -eq $True){
.\.appveyor\nightlyDetect.ps1
.\.appveyor\moveTagForSpecialBranches.ps1
}
test: off
before_deploy:
- ps: ./.appveyor/prepareDeploy.ps1
@@ -67,6 +92,7 @@ deploy:
on:
APPVEYOR_REPO_TAG: true
NIGHTLY_BUILD: false
MAIN_REPO: true
- provider: GitHub
tag: $(APPVEYOR_REPO_TAG_NAME)
release: Latest Nightly build
@@ -76,4 +102,5 @@ deploy:
artifact: ReleaseZip
on:
APPVEYOR_REPO_TAG: true
NIGHTLY_BUILD: true
NIGHTLY_BUILD: true
MAIN_REPO: true