Skip to content

Commit 6561ef3

Browse files
author
fallahn
committed
fix audio in uzem
add uzem browser artwork
1 parent 36724e6 commit 6561ef3

File tree

6 files changed

+12
-3
lines changed

6 files changed

+12
-3
lines changed

osgc/assets/images/o.png

3.03 KB
Loading

osgc/src/BrowserState.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,8 @@ void BrowserState::loadResources()
486486
SpriteID::sprites[SpriteID::Tiled] = spriteSheet.getSprite("tile");
487487

488488
m_audioScape.loadFromFile("assets/sound/ui.xas");
489+
490+
xy::App::getActiveInstance()->setWindowIcon("assets/images/o.png");
489491
}
490492

491493
void BrowserState::buildMenu()

uzem/assets/title.png

616 KB
Loading

uzem/info.xgi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
game_info
22
{
3-
thumb = "asset/uzem.png"
3+
thumb = "assets/title.png"
44
title = "Uzebox Emulator"
55
version = "1.0.0"
66
author = "http://uzebox.org"

uzem/src/AvrAudio.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ THE SOFTWARE.
3030
AvrAudio::AvrAudio()
3131
: m_outputBuffer()
3232
{
33-
initialize(1, 15734);
33+
initialize(2, 15734);
3434
}
3535

3636
bool AvrAudio::onGetData(Chunk& chunk)
@@ -70,6 +70,10 @@ void AvrAudio::pushData(std::uint8_t data)
7070
sf::sleep(sf::milliseconds(1));
7171
}
7272

73+
//twice for 'stereo' - this is because SFML
74+
//will try to place mono sources in 3D space
75+
//which isn't reallyt what we want.
7376
sf::Lock lock(m_mutex);
7477
m_ringBuffer.push_back(value);
78+
m_ringBuffer.push_back(value);
7579
}

uzem/src/MainState.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ MainState::MainState(xy::StateStack& ss, xy::State::Context ctx)
8787
static bool SoftReset = false;
8888
static bool Quit = false;
8989

90-
ImGui::SetNextWindowSize({ 300.f, 400.f }/*, ImGuiCond_FirstUseEver*/);
90+
ImGui::SetNextWindowSize({ 300.f, 420.f }/*, ImGuiCond_FirstUseEver*/);
9191
if (ImGui::Begin("Uzem", &m_showOptions, ImGuiWindowFlags_MenuBar))
9292
{
9393
if (ImGui::BeginMenuBar())
@@ -140,7 +140,10 @@ MainState::MainState(xy::StateStack& ss, xy::State::Context ctx)
140140

141141
ImGui::Text("%s", "Keys:\nS - Button B\nZ - Button Y\nA - Button A\nX - Button X\nTab - Select\nReturn - Start\n\n");
142142

143+
ImGui::Text("For more info and to find games,\ngo to http://uzebox.org\n\n");
144+
143145
ImGui::Separator();
146+
ImGui::Text("\n");
144147
ImGui::Text("%s", m_romInfo.c_str());
145148
ImGui::End();
146149
}

0 commit comments

Comments
 (0)