Closed anudanan closed 5 years ago
There are a few things that need to be changed
1) set your tabstop to 4 and you won't need to change whitespace 2) don't mix different changes in one commit, i.e. where you change the format string doesn't belong in the same commit
If you address this, I will merge it.
Thx for information. I will see later on this weekend. I must do some thing outside in the garden ;-)
I woundert me about the different indent but now it is clear (tabstop 4). Is the use of tabstop 4 recommended in all openpli sourcecode? In some modules I don´t have seen different indents with the default tabstopp 8 but I think there are no space and onyl tabs inside
Indent is per file historical, but we try to maintain tabstop = 4 (in the C++ files). Python is another story.
I´ve changed now the files and I hope they are ok for you. I use now tapstop 4
I´ve additional added the feature for using the enigma settings for autolanguage with 4 prios,the demand came from the openpli forum. If the audiolang parameter in streamproxy.conf is empty or xxx (that is the default) then the enigma config.autolanguage,audio1-4 are used for language selection. On my box it works perfectly now for recorded movies.
Edit: I found a little bug with language prios. I will fix it and make a next commit then
The changes with %x to 0x%x in debug output I have done for better reading that the value is hex. Is that not ok for you?
With withspace I will see what I cant do to make you happy. I will see to make there now difference, but it take some time
I'd like to see about four commits from you:
1) first all whitespace changes, where necessary (I believe in the end none of them is required, but I am not sure). Make sure spaces are never used for indenting (see change requests). Set your editor to show spaces and check if they're never in the indenting section of a line. They also can't be at the end of a line.
2) first generic change commit (like: add 0x to debugging hex output)
3) second generic change commit (...)
4) first primary commit (like add audio selection on file transcoding), with all related changes in all files
5) second primary commit (like add audio selection on live transcoding), with all related changes in all files
This way, if someone needs to do a git blame at some point, they can immediately see what primary commit changed the lines.
Please try, if you can't, supply a complete patch and I will process it into commits.
Please note: mixing generic changes plus whitespace change with functional changes make it hard to spot what actually has changed within a commit, that's why it's good practise to separate them. In this case you'll see that if you split whitespace, the remaining commit will be quite small (which is good).
How is the best way now?Reverting all commits and make new commits are only new commits in above steps? I have not done step 5. Language selection in streamproxy is only for filetranscoding today. I´m a beginner in opensource project rules ;-)
I don't have much experience in github, I am normally using git from the command line. Then there is an option to selectively add chunks to a commit (it's called git add -p). With that option it's very simple to do. I am not sure if it can be done using github.
That's why I say if you don't manage, send the complete patch to me and I'll do it with the command line git.
I also use git on commandline and make a push to github.
Is it ok if I make from now the commits in different steps or must I start from a clean repro copy of your streamproxy source to have the clean steps for you? I think my older commits are always in the git history if your merge or make you cherry-picks of only of the new files which are ok for you?
I have now three changing steps on my local system. I have no diffs with the blanks ans tabs now (i hope, a diff is clean to your branch) Here the steps
Now I can make 3 commits to github but then the last not nice commits are seen for ever I also can reset my local git to your master and make three new commits. I think that is cleaner but what must I do with the pullrequest? Closing and make new request after the 3 commits?
I´ve made a repro reset to your master branch on my local system and a push to github. This closed these pullrequest here (logical because the commits are deleted) . Now different commits and a new pullrequest are on the road.
ok
BTW you could have done as following at your local system:
find out what's the last commit you added
git log
reset these changes, use the last commit not from you here
git reset <commit>
all your changes have been reset now (i.e. they're still in your source but no longer as commits)
now make a new commit, where you select which chunks are in it
git commit -p
repeat until all your changes are in commits again
If github complains because you modified commit after being pushed, you can try the '--force' flag. If that doesn't help, you'll have to make a new PR.
The streamproxy.conf parameter are not setable with transcodingsetup plugin and OWIF setting of transcoding setup
A new parameter audiolang in streamproxy.conf is available for setting the language for filetranscoding. The parameter ist setable with transcodingsetup. The value auto means that streamproxy use the language letters of config.osd.language of enigma setting. If no language is available in the stream the first AC3 Audio or Audio is used Detection of teletext and subtitle now with description IDs in PMT