| wonko | Hmm, I've broken something but I don't know what. Boo. | 14:58 |
|---|---|---|
| wonko | I mean, I really don't understand how I've broken it | 14:58 |
| wonko | oh, I might need to actually update autojack first | 14:59 |
| wonko | I'll do that then I guess | 14:59 |
| OvenWerks | Are you still working in a branch? or is it in main now. | 14:59 |
| wonko | branch | 14:59 |
| OvenWerks | (master) | 14:59 |
| wonko | I won't merge it into master until it's tested and even then i'll do a merge request and get it reviewed | 14:59 |
| OvenWerks | did it stop working on the last commit? | 15:05 |
| wonko | You know, that's a good question. It may not be my fault at all. :) | 15:07 |
| wonko | I didn't think to test master before my changes | 15:07 |
| wonko | let me do that now | 15:07 |
| OvenWerks | well my thought is you have three commits... did you test each one? | 15:08 |
| wonko | Oh, it does seem to be working | 15:10 |
| wonko | it just takes an awfully long time for the DSP load to start showing Running and an actual percentage | 15:10 |
| OvenWerks | you seem to have reformatted everything to 4 spaces rather than 2 | 15:10 |
| OvenWerks | please fix that | 15:10 |
| wonko | That's in direct violation of PEP8. :-D | 15:11 |
| OvenWerks | I don't care | 15:11 |
| wonko | that is a valid answer. | 15:11 |
| wonko | let me see if I can convince PyCharm to do 2 instead of 4 | 15:11 |
| OvenWerks | At this point I can't tell what has changed and what hasn't | 15:12 |
| OvenWerks | It would be ok to make one commit that only reformats and nothing else and then make other changes, but as it is, it's impossible to read the diff file. | 15:13 |
| OvenWerks | It looks like everything has changed | 15:13 |
| OvenWerks | and actual code changed are lost. | 15:13 |
| wonko | ah, yes, good poing | 15:14 |
| wonko | point | 15:14 |
| wonko | put it to 2 for now | 15:14 |
| OvenWerks | However, even that said I set things to two spaces because it is easier for my use | 15:14 |
| wonko | although I wonder how many other changes are purely formatting changes that pycharm did on my behalf. | 15:14 |
| wonko | I'm ok with 2 if that's what you want to do, PEP8 be dammed (although I do my best to try and follow it if I can) | 15:15 |
| wonko | but if you are willing to switch to 4 I can do a quick formatting commit to master so we can compare reasonably | 15:15 |
| OvenWerks | WHat is PEP8? where did it come from? | 15:15 |
| wonko | PEP8 is the style guide for python written by the python folks | 15:16 |
| OvenWerks | to be honest I like tabs better | 15:16 |
| wonko | I'm with you on that one, but everyone seems to be against us for some reason | 15:16 |
| OvenWerks | but people don't like to use one char instead of two or four | 15:16 |
| wonko | and allow them to set indent to whatever suits them instead of forcing indent on people | 15:17 |
| wonko | I hate non-tab indents | 15:17 |
| wonko | but it's just one of those battles I've given up fighting | 15:17 |
| OvenWerks | the C/C++ world has no problem with it. It means each person can set their editor to whatever tab size they like | 15:17 |
| wonko | Coming from C is probably why we share that view. :) | 15:17 |
| wonko | If you'd like we can swtich to tabs and give the middle finger to the python community. :) | 15:18 |
| wonko | but, the entire reason for using python is for others to be able to read it, so we should probably try to stick to their formatting as much as possible (within reason of course) | 15:19 |
| OvenWerks | the people who review for release don't like tabs either... otherwise it would be tabs already. | 15:19 |
| OvenWerks | I can change indent to 4 I guess. But it may not help much unless you recommit. | 15:21 |
| OvenWerks | It could get messy... maybe rebase will be ok. | 15:21 |
| OvenWerks | OK, master is now four spaces... ahh but you have changed everything to 2... | 15:36 |
| wonko | :-D | 15:36 |
| OvenWerks | it would be best now if you do a git rebase master | 15:36 |
| OvenWerks | (you may have to pull master first) | 15:37 |
| OvenWerks | other wise yu would have to compress your commits into one | 15:38 |
| OvenWerks | and if things are not working right that could be a problem. | 15:38 |
| OvenWerks | the reason there is a delay when you start may be that autojack is not running (or the wrong version) when you first tried it and there is an extra delay while it sends a quitesignal out and restarts autojack | 15:40 |
| OvenWerks | The second time you restart jack should happen much faster | 15:41 |
| OvenWerks | wonko: so if you are in your branch, you have to git stash, git branch master, git pull, git branch <your branch>, git rebase master. | 15:43 |
| OvenWerks | then git push your branch may with --hard | 15:43 |
| OvenWerks | That is the only way I can think of to be able to read your code | 15:44 |
| OvenWerks | Unless you are going to compress everything into one commit... then I can back peddle my commit on master. | 15:44 |
| OvenWerks | wonko: which way are we doing things? I can also pull your branch and do that here if it would be better | 15:47 |
| OvenWerks | BTW, the edit I am using (Geany) has a nice setting for indents called "Detect from content" your's may have similar | 15:49 |
| wonko | I'll fix my branch in a little bit. Hang tight. | 16:00 |
| OvenWerks | cool | 16:01 |
| wonko | Ugh, rebase/merge is not going well. :) | 16:57 |
| OvenWerks | :) | 16:59 |
| OvenWerks | have you ever used git gui? | 17:02 |
| OvenWerks | It gives you good feedback about what the diff is from the last commit. and points out things like unitended changes, trialing white space etc. | 17:03 |
| OvenWerks | trailing even... | 17:03 |
| wonko | I haven't but I might need to. Wait, you switched to 4 spaces, right? Maybe I should switch back to 4 first which would probably help out. | 17:48 |
| Eickmeyer | I use git cola. I find it more intuitive than git gui. | 18:16 |
| OvenWerks | ok | 18:22 |
| * wonko sets indent at 3 just to be a dick | 19:06 | |
| wonko | ok, git diff looks WAY better with indent set back to 4 because it's no longer clashing with the indent in master | 19:07 |
| wonko | I started quite the shitstorm, did't I? :-D | 19:08 |
| OvenWerks | it is just a part of colaboration... | 19:08 |
| wonko | Ok, so rebase still doesn't go well | 19:09 |
| wonko | it says there's a conflict with a HUGE chunk of code | 19:10 |
| wonko | and both versions are not at all my code, so I'm not even sure the best way to proceed now. | 19:10 |
| OvenWerks | yikes? | 19:10 |
| OvenWerks | which file(s) | 19:10 |
| wonko | controls | 19:10 |
| wonko | the only one I've worked on so far | 19:10 |
| wonko | I've pushed the configparser branch | 19:11 |
| wonko | so that's up to date now if you care to poke at it | 19:11 |
| OvenWerks | trying a rebase here | 19:32 |
| OvenWerks | Mostly more reformatting stuff... like splitting long lines | 19:33 |
| OvenWerks | What I don't get is there is a huge part that doesn't seem to have any changes that show a diff | 19:35 |
| OvenWerks | Your editor doesn't like call (whatever)... it has changed them to call(whatever) | 19:38 |
| OvenWerks | :P | 19:39 |
| OvenWerks | So it is not just space numbers, but an overall set of changes. I am mostly oking them. | 19:44 |
| OvenWerks | wonko: ok first problem is that controls chokes on the old config file. | 20:09 |
| wonko | yeah, make sure it's actually what you want | 20:10 |
| wonko | because I don't think it's merging correctly | 20:10 |
| wonko | in the part where it reads in the legacy config it should be sticking those into the configparser but post rebase it looks like it's reverted to sticking those into the class variables | 20:14 |
| OvenWerks | I have taken back the last two commits (two spaces and then four spaces) and am working with that. | 20:14 |
| wonko | probably a wise idea | 20:14 |
| wonko | let me paste some examples so you know what I'm talking about. Otherwise you'll rebase out all my work. :) | 20:15 |
| wonko | What it should be: https://gist.github.com/bhechinger/6450c488299db163a6d90aa26d3af970 | 20:16 |
| wonko | What it shouldn't be: https://gist.github.com/bhechinger/a12f567e42fe289e39273f05f8db00c0 | 20:16 |
| OvenWerks | Ya it looks right | 20:19 |
| OvenWerks | wonko: I found out why it didn't work :) | 20:23 |
| wonko | Woo! What was it? | 20:23 |
| OvenWerks | wonko: you assumed that if the config file is in the new spot it is new format and if it is in the old spot it should be old format but because I had moved the file already mione has an old format in the new spot and fails. | 20:24 |
| OvenWerks | wonko: so that is ok. no one else should be in that place. let me try a move instead. | 20:24 |
| wonko | yeah, that was my thinking. It's ok to assume new format for new file because that technically doesn't exist anywhere yet. :) | 20:25 |
| OvenWerks | except in my system... ok that works. | 20:25 |
| wonko | You're special. :) | 20:26 |
| OvenWerks | There is one little thing I want to fix the a2j check box should default to on. and doesn't so I need to find out why. I thought I had fixed it, but I think not. | 20:26 |
| wonko | yeah, I noticed I needed to keep checking that when I would blow away config files and start over | 20:27 |
| OvenWerks | wonko: do you want me to push the whole thing back to your branch or onto master? | 20:27 |
| wonko | If you're ok with it going to master that's fine | 20:27 |
| wonko | just keep in mind autojack currently doesn't do new config file | 20:27 |
| wonko | got sidetracked with this other stuff. :) | 20:28 |
| OvenWerks | That is my thinking too, so maybe your branch now that we are fully rebased to master. | 20:28 |
| wonko | ok, sounds good | 20:29 |
| wonko | I'll pull it tomorrow morning and knock out autojack changes | 20:29 |
| wonko | then that should be done | 20:29 |
| wonko | then I can start work on what I originally wanted to work on. :) | 20:29 |
| OvenWerks | Your editor will probably "fix" a few things I put back before I realized why it was doing what it was doing... things like spliting lines so they fit in the editor window and adding blanklines before the calls | 20:29 |
| wonko | yeah, it's trying to conform to PEP8 as much as it can. | 20:30 |
| OvenWerks | you may need to reclone or pull -hard or force or whtever | 20:30 |
| wonko | ok, i'll keep that in mind | 20:30 |
| OvenWerks | Everything looks mostly ok... I would draw you attention to line 526 in controls... zdev should self.def_config['XDEV'] but should look like a list ( ["first", "second", "etc."] ) | 20:43 |
| OvenWerks | even if it has nothing (default) or only one item | 20:44 |
| OvenWerks | So maybe pull controls and autojack into your editor and let it "fix" things (they fix cats you know) and recommit, then work. | 20:45 |
| OvenWerks | It appears your editor will fix things every time should I make any "mistakes". So those commits should be listed as "NO-OP: reformating" | 20:47 |
| OvenWerks | So anyone looking knows there are no opperational changes | 20:47 |
| OvenWerks | Ah, I figgured it out. self.zdev doesn't exist if there is no config file to begin with. | 20:55 |
| OvenWerks | I will have a few fixes shortly. wonko. | 20:56 |
| wonko | Ok, cool | 20:56 |
| OvenWerks | So I will have to do some more testing on the xdev-zdev thing. and you will run into the same problem with pulse-in:"name1 name2" | 21:03 |
| wonko | Yeah, it kinda makes me want to use a config file format that supports proper data formats like json | 21:03 |
| OvenWerks | taking a config string and making it a list | 21:03 |
| OvenWerks | json ew | 21:03 |
| wonko | yeah, I don't love that solution | 21:04 |
| wonko | either thing there actually. :) | 21:04 |
| OvenWerks | The simple thing to do is to have an internal variable that is a list and to read into that | 21:05 |
| wonko | that's what I did with zdev | 21:05 |
| OvenWerks | converting back and forth from lists to strings is not hard | 21:06 |
| wonko | zdev gets built from XDEV and on save gets converted back to a string | 21:06 |
| OvenWerks | so pulse_in and out will be the same... and ZDEV will go through a similar transition... well probably different to get the same thing | 21:07 |
| wonko | pulse_in/out will be a bit more work, but yeah | 21:07 |
| OvenWerks | zdev needs to have the actual hw:device but zdev names will be the variable list that goes with it so people can change their USB name from "Device,0,0-in" to "USB_Mic" | 21:09 |
| OvenWerks | (yes I do have an actual USB audio dongle that calls itself "Device" | 21:10 |
| OvenWerks | wonko: I think once you get the configparser working in autojack, we should do a merge to master. then you can work on the pulse names thing. | 21:11 |
| wonko | sounds like a plan | 21:11 |
| OvenWerks | before we merge to maser please run dch in the root directory and add a line. | 21:12 |
| wonko | you'll have to translate that to english for me, please. :) | 21:14 |
| OvenWerks | dch = debian changelog edit | 21:14 |
| OvenWerks | hopefully editor on your system points to some reasonable editor like nano. | 21:15 |
| wonko | nano is not a reasonable editor. :) | 21:15 |
| OvenWerks | The reason I need you to do that is that it puts your name in there | 21:15 |
| OvenWerks | would you like ed instead? | 21:16 |
| wonko | vi | 21:16 |
| OvenWerks | vi is fine if you like it. anyway you just need to add a one line thing to say switched to configparser | 21:16 |
| OvenWerks | normally dch adds your name and a * after the * put your "switched to configparser" | 21:17 |
| OvenWerks | I would not worry about all the format changes as they are no op | 21:18 |
| wonko | ok | 21:18 |
| OvenWerks | I can do the merge or you can depending on how you feel. | 21:18 |
| wonko | as long as you've tested it before I merge I'll be happy to do it | 21:20 |
| OvenWerks | so far it is working | 21:20 |
| wonko | I still need to do autojack. :) | 21:20 |
| OvenWerks | ya I know. | 21:20 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!