Fix "Akaya Akashiya Ayakashi" umd switch #9245

sum2012 · 2017-01-28T03:55:12Z

Also,make "switch umd" menu enable faster,
fix #9110
modify log:
https://gist.github.com/sum2012/e9557e6879f43361582e6810d0ba79e7

Also,make "switch umd" menu enable faster,

sum2012 · 2017-01-28T03:59:43Z

I forgot said.
Happy new Chinese new year

hrydgard · 2017-01-28T08:36:51Z

Oh yeah. Happy year of the rooster!

hrydgard · 2017-01-28T08:37:21Z

Core/HLE/sceUmd.cpp

@@ -51,6 +55,7 @@ static std::vector<SceUID> umdWaitingThreads;
 static std::map<SceUID, u64> umdPausedWaits;

 bool UMDReplacePermit = false;
+bool UMD_insterted = true;


Please rename UMDInserted , simple spelling mistake :)

hrydgard · 2017-01-28T08:38:47Z

Core/HLE/sceUmd.cpp

@@ -495,7 +504,9 @@ void __UmdReplace(std::string filepath) {
 		}
 	}
 	delete currentUMD;
-
+	UMD_insterted = false;
+	sleep_ms(200); // Wait sceUmdCheckMedium call


Hm, this isn't very nice .. on the other hand, this will probably be pretty reliable as long as __UmdReplace is not called from the emulator thread. I fear though that it may be, on Android? Got to check to be sure though.

A better solution may be to schedule an event (you know, RegisterEvent and so on) that will set UMDInserted back after a little bit.

sum2012 · 2017-01-28T13:12:27Z

@hrydgard Here is my first time to write a event.
It is a good challenge for me :)

hrydgard · 2017-01-28T15:33:30Z

Nice, looks good! It works, too, right? :)

Now the only thing I'm thinking about is savestate support for this, but it would be kind of silly to create a new savestate right when changing discs?

hrydgard · 2017-01-28T16:13:54Z

Actually we definitely need to save the event number. And that means that yes, you're gonna have to make a little version check in DoState. When loading an old state, you'll probably want to simply not call RestoreRegisterEvent...

First step to fix UnitTest

sum2012 · 2017-01-28T19:58:44Z

Yes,It still work,but it seems UnitTest not to work.
12>Core.lib(sceUmd.obj) : error LNK2019: unresolved external symbol "void __cdecl MainWindow::_ChangeMenu(void)" (?_ChangeMenu@MainWindow@@yaxxz) referenced in function "void __cdecl __UmdDoState(class PointerWrap &)" (?__UmdDoState@@YAXAEAVPointerWrap@@@z)
12>F:\Project\test\107\ppsspp\Windows\x64\Debug\UnitTest.exe : fatal error LNK1120: 1 unresolved externals

hrydgard · 2017-01-28T21:13:51Z

Hm, curious. I'll see if I can find a solution tomorrow.

sum2012 · 2017-01-29T08:26:45Z

Please don't make change of MainWindowMenu.cpp on master.
I don't want to rebase,I can remove ChangeMenu function on this pull request first.

hrydgard · 2017-01-29T08:52:38Z

I can fix it up on this branch before merging. Don't worry about it, I'll take it from here, later today :)

hrydgard · 2017-01-29T10:43:14Z

Merged and committed a fix on top. Don't know why it didn't end up inside the merge but meh, should be fine now :)

sum2012 · 2017-01-29T11:08:08Z

Very Thanks.

sum2012 · 2017-01-29T11:47:01Z

@hrydgard A small note:
Some baidu ppsspp forum of people said that when they update their phone 's firmware from 6.0 to 7.0,their phone is faster in playing in ppsspp.

hrydgard · 2017-01-29T12:18:08Z

Probably they got better graphics drivers with the upgrade. Especially on Android, good graphics drivers are very important for PPSSPP's performance.

Could of course also be power management.

ghost · 2017-02-01T22:14:13Z

Hi! Sorry, I really don't understand programming. Can you help me? I would like to play Akaaka, but can't switch umd. How can i switch it?

sum2012 · 2017-02-03T11:57:39Z

@aranypikkely Download newest version in http://buildbot.orphis.net/ppsspp/

ghost · 2017-02-03T21:58:31Z

Hi! Thanks! I downloaded it. So: it seems to switch the umd. But if i load the second umd, than switch the first, it plays just the first umd.

sum2012 · 2017-02-04T11:14:31Z

Do you mean that cannot switch again second umd ?

ghost · 2017-02-04T11:26:50Z

It went like this: on the end of the 1. umd i saved the game
then on the beginning of the 2. umd i had to load the saved data (you can't avoid it)
then in the menu i choose to begin the game
and the text appeard: switch first umd
i switched
and not the second but the first part began - not a normal way, but with a high speed
(on the top of the emulator you could see: 2. part)

Maybe i made some mistake?

sum2012 · 2017-02-04T21:33:42Z

1:put the save https://drive.google.com/file/d/0B3OaSdeV0L8kaWgybDlTWVZiUmc/view?usp=sharing into ppsspp
2:Load disc 2 first,It will tell you load save data. http://i.imgur.com/QnGc02s.jpg
3:Click resume http://i.imgur.com/5ATxJRX.jpg,it would tell you load again save data http://i.imgur.com/IjkiI7M.jpg ,and confirm it http://i.imgur.com/dkTSPrq.jpg
4:It tells you change disc 1 http://i.imgur.com/tDAajPO.jpg
5:Then it tells you change again disc 2 http://i.imgur.com/52w8fLO.jpg
6:It will continue the story http://i.imgur.com/W6nk5cA.jpg

ghost · 2017-02-04T23:09:22Z

You guys are amazing! Thank you very much! It works! :) I have one last question. Does this saved data know, what path was choosed during the game?

sum2012 · 2017-02-04T23:34:06Z

@aranypikkely The saved data is from #9110 (comment)

@kurasamesusaya Can you share that your save data that what path was choosed during the game?

sayaaki · 2017-02-19T11:39:55Z

@sum2012 Can you show a more detailed guide? I'm lost between step 4 and 5. Like, I change to disc 1 like at step 4 but the game just start over again and doesn't show any picture like in step 5. And also can you show me how to change umd? The way I did it, I press Esc - switch umd - disc 1 - continue. Is it the right way?

ps: nvm I get it 👍

sum2012 · 2017-02-19T12:11:41Z

@sayaaki The way you change umd is right.Maybe you forget save data before end of disc 1.
Anyway,you can try to use my save data https://drive.google.com/file/d/0B3OaSdeV0L8kaWgybDlTWVZiUmc/view?usp=sharing

umd change video:
https://drive.google.com/file/d/0B3OaSdeV0L8kUXRpM195cHFQdHM/view?usp=sharing

sayaaki · 2017-02-19T12:44:06Z

uhm but if the path I choose was different how can I continue from that path?

sayaaki · 2017-02-19T12:44:48Z

and why can't I do the same thing with my own save instead of the save shared above?

sum2012 · 2017-02-19T13:21:44Z

@sayaaki first, give me your save data to me test.
Of course,need to zip your save data folder first.

sayaaki · 2017-02-19T13:37:12Z

https://drive.google.com/file/d/0BzywMW3udB2obHJ5ZWpwWG1wd0E/view?usp=sharing

here

sum2012 · 2017-02-19T13:47:27Z

Maybe you need play again to get new story.
I might be try it when I have time.
I need OT this week ,not much time to test.

Fix "Akaya Akashiya Ayakashi" umd switch

bd6764b

Also,make "switch umd" menu enable faster,

Build fix for non-windows

033e060

hrydgard requested changes Jan 28, 2017

View reviewed changes

sum2012 added 2 commits January 28, 2017 18:39

Rename UMD_insterted to UMDInserted

3f92bac

Change to "schedule an event"

c83db04

hrydgard approved these changes Jan 28, 2017

View reviewed changes

sum2012 added 2 commits January 29, 2017 03:38

Add save status

2c58d34

Build fix for non-windows

860661d

First step to fix UnitTest

hrydgard merged commit 860661d into hrydgard:master Jan 29, 2017

sum2012 mentioned this pull request Jan 29, 2017

Fix "Akaya Akashiya Ayakashi no" and "Dies irae Amantes amentes" UMD switch jpcsp/jpcsp#433

Closed

sum2012 deleted the umd-switch- branch January 29, 2017 11:09

sum2012 mentioned this pull request Mar 30, 2017

Update README.md for 1.4 #9469

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix "Akaya Akashiya Ayakashi" umd switch #9245

Fix "Akaya Akashiya Ayakashi" umd switch #9245

sum2012 commented Jan 28, 2017

sum2012 commented Jan 28, 2017

hrydgard commented Jan 28, 2017

hrydgard Jan 28, 2017

sum2012 Jan 28, 2017

hrydgard Jan 28, 2017

hrydgard Jan 28, 2017

sum2012 commented Jan 28, 2017

hrydgard commented Jan 28, 2017

hrydgard commented Jan 28, 2017

sum2012 commented Jan 28, 2017

hrydgard commented Jan 28, 2017

sum2012 commented Jan 29, 2017

hrydgard commented Jan 29, 2017

hrydgard commented Jan 29, 2017

sum2012 commented Jan 29, 2017

sum2012 commented Jan 29, 2017

hrydgard commented Jan 29, 2017 •

edited

Loading

ghost commented Feb 1, 2017

sum2012 commented Feb 3, 2017

ghost commented Feb 3, 2017

sum2012 commented Feb 4, 2017

ghost commented Feb 4, 2017

sum2012 commented Feb 4, 2017

ghost commented Feb 4, 2017

sum2012 commented Feb 4, 2017

sayaaki commented Feb 19, 2017 •

edited

Loading

sum2012 commented Feb 19, 2017 •

edited

Loading

sayaaki commented Feb 19, 2017

sayaaki commented Feb 19, 2017

sum2012 commented Feb 19, 2017

sayaaki commented Feb 19, 2017

sum2012 commented Feb 19, 2017

Fix "Akaya Akashiya Ayakashi" umd switch #9245

Fix "Akaya Akashiya Ayakashi" umd switch #9245

Conversation

sum2012 commented Jan 28, 2017

sum2012 commented Jan 28, 2017

hrydgard commented Jan 28, 2017

hrydgard Jan 28, 2017

Choose a reason for hiding this comment

sum2012 Jan 28, 2017

Choose a reason for hiding this comment

hrydgard Jan 28, 2017

Choose a reason for hiding this comment

hrydgard Jan 28, 2017

Choose a reason for hiding this comment

sum2012 commented Jan 28, 2017

hrydgard commented Jan 28, 2017

hrydgard commented Jan 28, 2017

sum2012 commented Jan 28, 2017

hrydgard commented Jan 28, 2017

sum2012 commented Jan 29, 2017

hrydgard commented Jan 29, 2017

hrydgard commented Jan 29, 2017

sum2012 commented Jan 29, 2017

sum2012 commented Jan 29, 2017

hrydgard commented Jan 29, 2017 • edited Loading

ghost commented Feb 1, 2017

sum2012 commented Feb 3, 2017

ghost commented Feb 3, 2017

sum2012 commented Feb 4, 2017

ghost commented Feb 4, 2017

sum2012 commented Feb 4, 2017

ghost commented Feb 4, 2017

sum2012 commented Feb 4, 2017

sayaaki commented Feb 19, 2017 • edited Loading

sum2012 commented Feb 19, 2017 • edited Loading

sayaaki commented Feb 19, 2017

sayaaki commented Feb 19, 2017

sum2012 commented Feb 19, 2017

sayaaki commented Feb 19, 2017

sum2012 commented Feb 19, 2017

hrydgard commented Jan 29, 2017 •

edited

Loading

sayaaki commented Feb 19, 2017 •

edited

Loading

sum2012 commented Feb 19, 2017 •

edited

Loading