Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OGG Vorbis Music Patches #288

Closed
wants to merge 21 commits into from
Closed

Conversation

colbyshores
Copy link

@colbyshores colbyshores commented Feb 28, 2017

This contains patches for ogg vorbis playback. Each .ogg track is stored in a folder called data/sound/music and there is also a file that is called music.dat
music.dat is a text file containing the track listing where
level1 is the first line, level2 is the second line, etc

for example:

track1

track2

track3

track4

where track1 is level1, track2 is level2 and so on.

the preconfigured tracks and mapping can be downloaded here
https://drive.google.com/open?id=0B4z9LMg7J5EYTlltSVhwNmNuNzg

@chino
Copy link
Member

chino commented Jan 23, 2018

I must have missed the email alert for this pull request and haven't noticed till now.

The code looks pretty simple so it should be easy for us to merge this in :]

@willkillson
Copy link

@chino Hey mate, some people were asking about this in discord. I am sure you are busy, are you still interested in this MR?

@chino
Copy link
Member

chino commented Oct 1, 2022

Some quick notes looking over this.

The music.c file looks pretty great so thanks for that.

Needs a full rebase/squash:

  • changes to $(LUA) in makefile need to be backed out
  • as well as changes to net_enet_2.c shouldn't be included in this
  • it contains an entire copy of the pandora work which shouldn't be here
  • there is a binary files accidently added/deleted in the commit history
  • changes to the readme should be backed out in favor of wiki notes if needed

Curious about:

  • the LoadLevel bool is a bit undescriptive and I'm not sure why it was needed?
  • why was CurrentLevel deleted from sfx.c?
  • music.c could just define it's own MAX_PATH or be renamed to something like MAX_SOUND_PATH?
  • why is pcmout in sound.h if it's only used in music.c?
  • I think I kinda feel the same way about music_buffer_t?
  • At that point I wonder if the new headers could be kept in music.c as well

Questions:

  • was the sound track list generated from looking at the original cdrom audio files?
  • whatever was in that google drive link seems missing now

I could use it as a great starting point if anything to build a clean branch.

Thanks for the contribution!

@chino
Copy link
Member

chino commented Oct 1, 2022

Ah I believe that drive contained the pre-built vorbis files and music.dat?

Would be great if you could share that again?

I have a new branch with all the changes I was asking for above at this point where we'll be working on a clean merge:
#299

I'm going to close this to move the main work over there.

@chino chino closed this Oct 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants