diff --git a/data/images/wait_01.jpg b/data/images/wait_01.jpg deleted file mode 100644 index de8c7bdc..00000000 Binary files a/data/images/wait_01.jpg and /dev/null differ diff --git a/data/images/wait_01.png b/data/images/wait_01.png new file mode 100644 index 00000000..c69fbb3a Binary files /dev/null and b/data/images/wait_01.png differ diff --git a/data/images/wait_02.jpg b/data/images/wait_02.jpg deleted file mode 100644 index 8f047dc5..00000000 Binary files a/data/images/wait_02.jpg and /dev/null differ diff --git a/data/images/wait_02.png b/data/images/wait_02.png new file mode 100644 index 00000000..21e8543d Binary files /dev/null and b/data/images/wait_02.png differ diff --git a/data/images/wait_03.jpg b/data/images/wait_03.jpg deleted file mode 100644 index 33aa7ead..00000000 Binary files a/data/images/wait_03.jpg and /dev/null differ diff --git a/data/images/wait_03.png b/data/images/wait_03.png new file mode 100644 index 00000000..43d4f5a6 Binary files /dev/null and b/data/images/wait_03.png differ diff --git a/data/images/wait_04.jpg b/data/images/wait_04.jpg deleted file mode 100644 index 60ad4a54..00000000 Binary files a/data/images/wait_04.jpg and /dev/null differ diff --git a/data/images/wait_04.png b/data/images/wait_04.png new file mode 100644 index 00000000..39b36979 Binary files /dev/null and b/data/images/wait_04.png differ diff --git a/data/images/wait_05.jpg b/data/images/wait_05.jpg deleted file mode 100644 index 4fb9b7b4..00000000 Binary files a/data/images/wait_05.jpg and /dev/null differ diff --git a/data/images/wait_05.png b/data/images/wait_05.png new file mode 100644 index 00000000..9e07c6d5 Binary files /dev/null and b/data/images/wait_05.png differ diff --git a/data/images/wait_06.jpg b/data/images/wait_06.jpg deleted file mode 100644 index 489a8dd4..00000000 Binary files a/data/images/wait_06.jpg and /dev/null differ diff --git a/data/images/wait_06.png b/data/images/wait_06.png new file mode 100644 index 00000000..170616e4 Binary files /dev/null and b/data/images/wait_06.png differ diff --git a/data/images/wait_07.jpg b/data/images/wait_07.jpg deleted file mode 100644 index d5a70d8d..00000000 Binary files a/data/images/wait_07.jpg and /dev/null differ diff --git a/data/images/wait_07.png b/data/images/wait_07.png new file mode 100644 index 00000000..fe81db29 Binary files /dev/null and b/data/images/wait_07.png differ diff --git a/data/images/wait_08.jpg b/data/images/wait_08.jpg deleted file mode 100644 index 34479b81..00000000 Binary files a/data/images/wait_08.jpg and /dev/null differ diff --git a/data/images/wait_08.png b/data/images/wait_08.png new file mode 100644 index 00000000..e612e9e9 Binary files /dev/null and b/data/images/wait_08.png differ diff --git a/data/images/wflsplash.jpg b/data/images/wflsplash.jpg deleted file mode 100644 index 77623a3f..00000000 Binary files a/data/images/wflsplash.jpg and /dev/null differ diff --git a/data/images/wfsplash.jpg b/data/images/wfsplash.jpg deleted file mode 100644 index 45bd5a82..00000000 Binary files a/data/images/wfsplash.jpg and /dev/null differ diff --git a/data/images/wfsplash.png b/data/images/wfsplash.png new file mode 100644 index 00000000..a077dee3 Binary files /dev/null and b/data/images/wfsplash.png differ diff --git a/source/gui/video.cpp b/source/gui/video.cpp index 8e43b891..d621cd48 100644 --- a/source/gui/video.cpp +++ b/source/gui/video.cpp @@ -475,27 +475,16 @@ void CVideo::render(void) /* wait animation control */ -extern const u8 wfsplash_jpg[]; -extern const u32 wfsplash_jpg_size; -extern const u8 wflsplash_jpg[]; -extern const u32 wflsplash_jpg_size; +extern const u8 wfsplash_png[]; -extern const u8 wait_01_jpg[]; -extern const u32 wait_01_jpg_size; -extern const u8 wait_02_jpg[]; -extern const u32 wait_02_jpg_size; -extern const u8 wait_03_jpg[]; -extern const u32 wait_03_jpg_size; -extern const u8 wait_04_jpg[]; -extern const u32 wait_04_jpg_size; -extern const u8 wait_05_jpg[]; -extern const u32 wait_05_jpg_size; -extern const u8 wait_06_jpg[]; -extern const u32 wait_06_jpg_size; -extern const u8 wait_07_jpg[]; -extern const u32 wait_07_jpg_size; -extern const u8 wait_08_jpg[]; -extern const u32 wait_08_jpg_size; +extern const u8 wait_01_png[]; +extern const u8 wait_02_png[]; +extern const u8 wait_03_png[]; +extern const u8 wait_04_png[]; +extern const u8 wait_05_png[]; +extern const u8 wait_06_png[]; +extern const u8 wait_07_png[]; +extern const u8 wait_08_png[]; static lwp_t waitThread = LWP_THREAD_NULL; u8 CVideo::waitMessageStack[2048] ATTRIBUTE_ALIGN(32); @@ -543,14 +532,14 @@ void CVideo::waitMessage(float delay)// set wait images from custom or internal else { TexData m_wTextures[8]; - TexHandle.fromJPG(m_wTextures[0], wait_01_jpg, wait_01_jpg_size); - TexHandle.fromJPG(m_wTextures[1], wait_02_jpg, wait_02_jpg_size); - TexHandle.fromJPG(m_wTextures[2], wait_03_jpg, wait_03_jpg_size); - TexHandle.fromJPG(m_wTextures[3], wait_04_jpg, wait_04_jpg_size); - TexHandle.fromJPG(m_wTextures[4], wait_05_jpg, wait_05_jpg_size); - TexHandle.fromJPG(m_wTextures[5], wait_06_jpg, wait_06_jpg_size); - TexHandle.fromJPG(m_wTextures[6], wait_07_jpg, wait_07_jpg_size); - TexHandle.fromJPG(m_wTextures[7], wait_08_jpg, wait_08_jpg_size); + TexHandle.fromPNG(m_wTextures[0], wait_01_png); + TexHandle.fromPNG(m_wTextures[1], wait_02_png); + TexHandle.fromPNG(m_wTextures[2], wait_03_png); + TexHandle.fromPNG(m_wTextures[3], wait_04_png); + TexHandle.fromPNG(m_wTextures[4], wait_05_png); + TexHandle.fromPNG(m_wTextures[5], wait_06_png); + TexHandle.fromPNG(m_wTextures[6], wait_07_png); + TexHandle.fromPNG(m_wTextures[7], wait_08_png); for(int i = 0; i < 8; i++) m_defaultWaitMessages.push_back(m_wTextures[i]); } @@ -706,7 +695,7 @@ void CVideo::waitMessage(const TexData &tex) void CVideo::startImage(void) { TexData splashTex; - TexHandle.fromJPG(splashTex, wfsplash_jpg, wfsplash_jpg_size); + TexHandle.fromPNG(splashTex, wfsplash_png); waitMessage(splashTex); render();