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

Stream_name: Adding a default stream name to the Stream Info. #3043

Merged
merged 2 commits into from
Aug 31, 2020
Merged

Stream_name: Adding a default stream name to the Stream Info. #3043

merged 2 commits into from
Aug 31, 2020

Conversation

PawBud
Copy link
Contributor

@PawBud PawBud commented Aug 24, 2020

src/preferences/broadcastprofile.cpp Outdated Show resolved Hide resolved
@ronso0
Copy link
Member

ronso0 commented Aug 24, 2020

This is a harmless bug fix so you can target mixxx:2.3 instead of master.

There shouldn't be a need to rebase, but in case you see unrelated commits poping up here after you switched to mixxx:2.3, just run git rebase -i XXX/2.3 where XXX is what you named the mixxxdj/mixxx remote.

@ronso0
Copy link
Member

ronso0 commented Aug 24, 2020

Unfortunately users that upgraded Mixxx can't benefit from this fix instantly due to the following constraints (not caused by this branch):

  1. I expected "Create new connection" in Pref > Broadcast to create a new connection from the default profile, but it just copies the existing connection. That was discussed only briefly in Multi-broadcasting #1300 (comment).
    As @Palakis mentioned, we shoul dhave Clone (selected) connection and Create new (default) connection
  2. Reset to defaults does nothing (on purpose), but this too inhibits getting a fresh default connection
  3. last connection cannot be deleted

All in all, users can not get a default connection again after altering the initial settings unless they remove all connection files from $CONFIG_DIR/broadcast_profiles manually.

EDIT
3. was already touch in #2158 bu not considered worth fixing

@PawBud
Copy link
Contributor Author

PawBud commented Aug 26, 2020

Unfortunately users that upgraded Mixxx can't benefit from this fix instantly due to the following constraints (not caused by this branch):

  1. I expected "Create new connection" in Pref > Broadcast to create a new connection from the default profile, but it just copies the existing connection. That was discussed only briefly in #1300 (comment).
    As @Palakis mentioned, we shoul dhave Clone (selected) connection and Create new (default) connection
  2. Reset to defaults does nothing (on purpose), but this too inhibits getting a fresh default connection
  3. last connection cannot be deleted

All in all, users can not get a default connection again after altering the initial settings unless they remove all connection files from $CONFIG_DIR/broadcast_profiles manually.

EDIT
3. was already touch in #2158 bu not considered worth fixing

So, bottom line, do I have to wait until a Fix is issued, although you clearly stated that they r not really "bugs", I think I will work on another issue for the time being, if that's ok?

@ronso0
Copy link
Member

ronso0 commented Aug 26, 2020

never mind, as I wrote it's unrelated to your fix, just a heads-up for everyone reading this.
Users starting with a new Mixxx install (or clean config) will get the stream name filled.

This is a harmless bug fix so you can target mixxx:2.3 instead of master.

This can be done at the top of this page, 'Edit', then select mixxx/2.3 in the drop-down.

There shouldn't be a need to rebase, but in case you see unrelated commits poping up here after you switched to mixxx:2.3, just run git rebase -i XXX/2.3 where XXX is what you named the mixxxdj/mixxx remote.

@PawBud PawBud changed the base branch from master to 2.3 August 27, 2020 07:28
@PawBud
Copy link
Contributor Author

PawBud commented Aug 27, 2020

@ronso0 so the thing is I picked the commits (and didn't squash any), It should rebase but it's showing some conflicts, I tried to manually Accept Incoming Changes and merged them with the commit message as Resolving Conflicts in VSC, but it just kept on aborting. What am I doing wrong?

@Holzhaus
Copy link
Member

PawBud and others added 2 commits August 27, 2020 19:04
Previously, the default stream name was blank. To accomodate consistency,
this commit will add 'Mixxx' to the stream name.
This commit makes it such that, The kDefaultStreamName need not be translated.

Co-authored-by: ronso0 <[email protected]>
@PawBud
Copy link
Contributor Author

PawBud commented Aug 27, 2020

Please follow the instructions here: https://github.com/mixxxdj/mixxx/wiki/Using%20Git#targeting-another-base-branch

just what I needed! Thanks a lot, I ll remember the command from now on I guess :).

@PawBud
Copy link
Contributor Author

PawBud commented Aug 28, 2020

@ronso0, It's weird that the default string is not showing up:-
Screenshot from 2020-08-28 19-28-20

@ronso0
Copy link
Member

ronso0 commented Aug 28, 2020

I guess that's exactly what I discovered above

Try removing all files from $CONFIG_DIR/broadcast_profiles (~/.mixxx/broadc.. on linux), or remove/backup the config dir entirely.
Then it shows up for the initial default new connection.

@PawBud
Copy link
Contributor Author

PawBud commented Aug 28, 2020

I guess that's exactly what I discovered above

Try removing all files from $CONFIG_DIR/broadcast_profiles (~/.mixxx/broadc.. on linux), or remove/backup the config dir entirely.
Then it shows up for the initial default new connection.

I can't really find the config directory, there is a file mixxx\.tx\config and a config log, Is this it?

@ronso0
Copy link
Member

ronso0 commented Aug 28, 2020

Wiki: Finding the mixxx.log file
In that dir there's also a broadcast_profiles directory.

@PawBud
Copy link
Contributor Author

PawBud commented Aug 28, 2020

Screenshot from 2020-08-28 20-15-44
Screenshot from 2020-08-28 20-15-36
It's pretty embarrassing to further ask your help, but I can't find any file named mixxx.log, moreover, I have verified that there are no Hidden dir.

@Holzhaus
Copy link
Member

The hidden .mixxx directory is in your home directory.

@ronso0
Copy link
Member

ronso0 commented Aug 28, 2020

Please read Wiki: Finding the mixxx.log file
There's a .mixxx folder in you Home directory, like home/YourUsername/.mixxx/
Make sure you have 'Show hidden folder' enabled for your file manager.

@ronso0
Copy link
Member

ronso0 commented Aug 28, 2020

(I update the wiki page to include that info)

@PawBud
Copy link
Contributor Author

PawBud commented Aug 28, 2020

oh ok thanks a lot, should be easier for others now :)
Update: Done! I verified it, why are the tests failing though

@ronso0
Copy link
Member

ronso0 commented Aug 31, 2020

Any comments on the minimal changes? If not I'd merge this.

@daschuer
Copy link
Member

@PawBud: Thank you for this fist pull request.

Before merge we need you permission.
Please sign:
https://docs.google.com/a/mixxx.org/spreadsheet/viewform?formkey=dEpYN2NkVEFnWWQzbkFfM0ZYYUZ5X2c6MQ
and comment here when done.

Copy link
Member

@daschuer daschuer left a comment

Choose a reason for hiding this comment

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

LGTM. (the CI failure is unrelated.)

@PawBud
Copy link
Contributor Author

PawBud commented Aug 31, 2020

Done @daschuer

@daschuer
Copy link
Member

Thank you.

@daschuer daschuer merged commit bd2d400 into mixxxdj:2.3 Aug 31, 2020
@PawBud PawBud deleted the stream_name branch September 4, 2020 14:06
@daschuer
Copy link
Member

daschuer commented Nov 3, 2020

6c5bc4d43d2

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.

4 participants