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

FEAT(client): Add MP3 Recording #6219

Merged
merged 2 commits into from
Nov 4, 2023
Merged

Conversation

Chinry
Copy link
Contributor

@Chinry Chinry commented Oct 3, 2023

implements #3079

Checks

@Hartmnt
Copy link
Member

Hartmnt commented Oct 3, 2023

@Chinry You can simply amend your changes and force push the branch :D There is no need to create new pull request for your changes. It helps to keep track of the discussion, you know.

@Chinry
Copy link
Contributor Author

Chinry commented Oct 3, 2023

@Hartmnt, when I reset my changes it closed the request. Would it automatically reopen it once I pushed?

@Hartmnt
Copy link
Member

Hartmnt commented Oct 3, 2023

Well, I do not really know what exactly you are doing, but it should be sufficient to do the following:

  1. Change files
  2. git add . (You may optionally replace . with any other file or folder)
  3. git commit --amend (Here you can also change the commit message)
  4. git push origin record-mp3 --force-with-lease (where record-mp3 is the branch name linked in the pull request)

That should push your changes to the existing pull request without closing it.

src/mumble/VoiceRecorder.cpp Outdated Show resolved Hide resolved
src/mumble/VoiceRecorder.cpp Outdated Show resolved Hide resolved
@Hartmnt
Copy link
Member

Hartmnt commented Oct 3, 2023

Other than that it looks good. The translation commit is missing, of course. I will explain to you how to add the translation commit once I have had the time to test whether this new feature actually works ;)

@Chinry
Copy link
Contributor Author

Chinry commented Oct 3, 2023

I appreciate the help with git. I made those 2 minor changes.

@Chinry Chinry changed the title FEAT(client): Add MP3 Recording FEAT(client): Add MP3 Recording #3079 Oct 6, 2023
@Chinry Chinry changed the title FEAT(client): Add MP3 Recording #3079 FEAT(client): Add MP3 Recording Oct 6, 2023
@Chinry
Copy link
Contributor Author

Chinry commented Oct 9, 2023

@Hartmnt, how do I make a translation commit?

@Hartmnt
Copy link
Member

Hartmnt commented Oct 9, 2023

@Hartmnt, how do I make a translation commit?

You run the scripts/updateTranslations.py script from the repo root. It automatically creates the commit.

However, for one I have not had the time to try your changes myself yet. And also your formatting is still failing (see the PR-Checks job log) and it would be (slightly) harder to update your commit when you have added the translation commit (git commit --amend would no longer work and you would have to fiddle with rebase)

@Chinry
Copy link
Contributor Author

Chinry commented Oct 9, 2023

Not sure while it is failing after I ran clang-format on the file. It seems to have deleted some excess spaces that cause it to fail around line 81.

@Hartmnt
Copy link
Member

Hartmnt commented Oct 9, 2023

Not sure while it is failing after I ran clang-format on the file. It seems to have deleted some excess spaces that cause it to fail around line 81.

Mhh, interesting. I assume you used clang-format in version 10? Anyway, it should be sufficient to revert to the line with the spaces intact. After all your main code changes did not even touch line 81.

@Hartmnt Hartmnt added client recording feature-request This issue or PR deals with a new feature labels Oct 9, 2023
@Chinry Chinry force-pushed the record-mp3 branch 2 times, most recently from 717775b to 69c6d60 Compare October 9, 2023 20:09
@Chinry
Copy link
Contributor Author

Chinry commented Oct 10, 2023

Fixed the formatting issue. Let me know when you get around to taking a look at the changes.

Copy link
Member

@Krzmbrzl Krzmbrzl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume you have actually verified that recording to MP3 works with this code?
If that's true, then this LGTM. I'll take care of the translation updates for you.

@Hartmnt
Copy link
Member

Hartmnt commented Nov 4, 2023

I just compiled and tested the branch. The mp3 recording seems to work. VLC recognizes the resulting file as mp3.
Edit: Or does it? I don't know about audio codecs

image

I would say it works as advertised

@Krzmbrzl
Copy link
Member

Krzmbrzl commented Nov 4, 2023

@Hartmnt Thanks for double-checking!

@Chinry thanks for implementing this feature!

@Krzmbrzl Krzmbrzl merged commit 432f62a into mumble-voip:master Nov 4, 2023
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client feature-request This issue or PR deals with a new feature recording
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants