Previous day | Jump to hour: 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | Next day

Seconds: Show Hide | Joins: Show Hide | View raw
Font: Serif Sans-Serif Monospace | Size: Small Medium Large

Click in the nick column to highlight everything a person has said.
The Logo icon identifies that the person is a core developer (has commit access).

#rockbox log for 2014-09-03

00:10:12 Join [Franklin] [0] (
00:10:46[Franklin]foolsh: mind if I push my ipod keymaps to infones?
00:12:22[Franklin]It removes button_up for the time being because it causes weird behavior with the menu showing up unexpectedly (and yes... menu is menu+select)
00:12:37[Franklin]So I can play mario bros now
00:13:03[Franklin]But with some minor glitches like the sprites for the carnivorous plants not showing... :D
00:13:43[Franklin]and some code police
00:14:04 Quit Scall (Ping timeout: 250 seconds)
00:21:35 Join bertrik [0] (~quassel@rockbox/developer/bertrik)
00:23:24[Franklin]saratoga: does 2048 /really/ count as a major change? :)
00:28:33[Franklin]anyhoo :)... is/should there be calls to yield() in codecs? (especially APE)
00:33:39 Quit bertrik (Remote host closed the connection)
00:36:40 Quit ender` (Quit: When I was a kid I used to pray every night for a new bicycle. Then I realised that the Lord doesn't work that way so I stole one and asked Him to forgive me. )
00:43:35foolsh[Franklin]: I was outside, go ahead, but squash your commits and remember keep change-id the same, and give it a shot.
00:46:02foolshThe missing sprites may be a caused by frameskip if you're using it.
00:49:36 Quit copper (Ping timeout: 250 seconds)
00:58:40***Saving seen data "./dancer.seen"
01:00:36[Franklin]no frameskip... I can see the sprites where they shouldn't be (inside the pipe), but not where they should be
01:03:20[Franklin]oh... and I can't update your patch set (invalid author)
01:04:56 Quit krabador (Quit: Take the time.)
01:08:55foolsh[Franklin]: Could you do me a favor? Go checkout the sandbox make a change and push it back to the server and then let my try to work out what [Saint] meant yesterday.
01:09:40 Join copper [0] (~copper@unaffiliated/copper)
01:14:03[Franklin]no idea what he meant
01:19:19foolshI was the last to push a commit to the sandbox, so amending it just straight forward for me, but if you will push a change to the server, I can try to work out what it takes to push a change over top of your's, if you wouldn't mind
01:19:55foolshThen I'll share what I find
01:22:19 Quit [Franklin] (Ping timeout: 246 seconds)
01:25:16 Join [Franklin] [0] (
01:46:17 Join Scromple [0] (~Simon@
01:55:15 Join Aldem [0] (~Aldem@unaffiliated/aldem)
02:01:02 Quit Aldem (Read error: Connection reset by peer)
02:01:39 Join Scall [0] (~chat@unaffiliated/scall)
02:01:48 Join Aldem [0] (~Aldem@unaffiliated/aldem)
02:16:55foolsh[Franklin]: Are you still there? Need help? Just ask.
02:17:36[Franklin]not working on NES right now... didn't merge in that FS change right... so need to go back and see what I did wrong
02:18:34foolshOk :-)
02:19:37[Franklin]maybe jhMikeS would be of help...
02:21:46 Quit Aldem (Read error: Connection reset by peer)
02:22:36 Join Aldem [0] (~Aldem@unaffiliated/aldem)
02:22:45[Franklin]any way to re-merge in git?
02:23:04[Franklin]so say I merged wrong... commited a bit... and want to change that merge
02:23:23foolsh"git commit −−amend"
02:23:40foolshI think is what you're asking
02:25:46[Franklin]but no... that changes HEAD... I want 7d1a47cf13726c95ac46027156cc12dd9da5b855
02:25:55[Franklin]spamming with SHA1's
02:27:12[Franklin]so it's buried in history
02:28:29jhMikeSgit checkout (use hash or HEAD~n) will take it back
02:29:25jhMikeSor reset if you want to unstage changes
02:29:42[Franklin]say I want to undo your commit (and all the fixups) and re-merge... how to do that?
02:29:57jhMikeSre-merge from what?
02:30:07[Franklin]undo your commits, and merge with upstream
02:30:18[Franklin]so git merge vanilla (which is origin/master)
02:30:34foolshor "git rebase -i HEAD~N" where N is the number of commits behind you want to squash the later commit into, maybe?
02:30:36[Franklin]or is there a better way?
02:30:53[Franklin]yes... just delete all your commits in rebase :)
02:30:56[Franklin]then re-merge
02:30:58jhMikeSpretty much without knowing exactly what needs to be done it's hard to give advice
02:31:59[Franklin]my branch is not building after merging with upstream
02:32:14jhMikeSit gave no conflict resolution?
02:32:24[Franklin]there were some merge conflicts... (nothing obvious) and I want to try the merge again
02:32:48jhMikeSyou could hand-repair and do git rebase −−continue
02:32:57[Franklin]wait... what?
02:33:33jhMikeSconflicts should be listed when you tried rebasing from upstream, fix each conflict
02:33:41[Franklin]I know :)
02:34:17[Franklin]except I have about 64 commits... and conflicts in about 10 because they were merged into upstream... and some binary files, too
02:34:29[Franklin]How do/should I merge binary files? (bitmaps)
02:35:29[Franklin]so I really can't rebase on master branch anymore
02:35:35jhMikeSI don't know about that. did they change?
02:35:47[Franklin]change what?
02:35:52jhMikeSthe binary files
02:36:25jhMikeSyou kept working without rebasing from upstream?
02:37:30[Franklin]oh yes... 2048
02:38:05jhMikeSnormally it shouldn't conflict if what you've got is identical to what just came in
02:38:46[Franklin]hang on...
02:39:13[Franklin]and it's crawling slow :)
02:39:13[Franklin]probably that giant 80KLOC commit :)
02:40:20jhMikeSthat's all in one branch?!?
02:42:35 Quit Aldem (Read error: Connection reset by peer)
02:42:45*jhMikeS seriously recommends different branches for different projects!
02:43:25 Join Aldem [0] (~Aldem@unaffiliated/aldem)
02:43:25[Franklin]and it's asking me to merge the bitmaps
02:43:26[Franklin]what to do? get a vanilla branch and cherry-pick all my commits into it?
02:43:27[Franklin]probably the only option left :)
02:43:57jhMikeSquite possibly
02:44:59jhMikeSI find I have to consider my specific changes when dealing with this sort of thing
02:45:29jhMikeSbut I'll never have 64 commits of unrelated stuff in one branch either :)
02:47:33jhMikeSwell, you could checkout master (up to date!) and checkout -b from there and cherry pick the relevant ones into that and repeat until everything is picked off
02:48:02[Franklin]master is every other branch I have
02:48:05[Franklin]merged into one
02:49:23*jhMikeS recommends a different approach than that
02:49:26jhMikeSoh well
02:49:29[Franklin]like how?
02:49:39[Franklin]I want every feature I can possibly have on my device
02:49:40jhMikeSkeep master clean, do work in branches
02:49:42[Franklin]at once
02:49:44[Franklin]I do
02:49:57[Franklin]no... I do work on master and cherry-pick to branches for review
02:50:27[Franklin]that way master is newest, most feature-complete branch with other branches off vanilla for related stuff
02:50:32jhMikeSwhitespace correction is a feature?
02:50:51[Franklin]yes... for the programmer
02:51:24jhMikeSyes, for the programmer
02:51:42[Franklin]so it is a feature :)
02:52:07jhMikeSonly if I'm a programmer I guess
02:52:25[Franklin]of course you are
02:53:34jhMikeSbut I don't care about whitespace correction that much so...well I'm confused now
02:53:41[Franklin]about what?
02:53:55jhMikeSif I'm a programmer or not
02:54:15[Franklin]you wrote a gigantic patch that only took about 3 commits to fix...
02:54:18[Franklin]of course
02:54:46*jhMikeS writes a facepalm plugin
02:54:51 Quit Aldem (Read error: Connection reset by peer)
02:54:56[Franklin]of useful stuff... unlike that useless whitespace one I made :)
02:56:16[Franklin]well... giving up for today
02:56:19[Franklin]cya later
02:56:22 Quit [Franklin] (Quit: Leaving)
02:56:54 Join franklin_ [0] (47472706@gateway/web/freenode/ip.
02:57:04franklin_jhMikeS: later as in possibly tomorrow
02:57:07 Quit franklin_ (Client Quit)
02:58:44***Saving seen data "./dancer.seen"
03:00:09 Quit AlexP (Remote host closed the connection)
03:06:15 Join rela [0] (~x@pdpc/supporter/active/rela)
03:14:37 Join Strife89 [0] (~Strife89@2600:1005:b019:f307:6423:937:85b4:d069)
03:18:59 Nick SuperBrainAK is now known as DormantBrain (~andy@2001:470:8:a61::5f92:59a1)
03:25:42 Join ikeboy [0] (
03:30:06foolshCould someone/anyone push a commit to the sandbox, please? I'd like to work something out, and I need the last commit to be owned by another author.
03:31:55 Quit Strife89 (Ping timeout: 240 seconds)
03:42:57 Join bp0 [0] (~bp@unaffiliated/bp0)
03:44:34jhMikeSfoolsh: done
03:44:44foolshThank you
03:50:28[Saint]You don't need the _last_ commit to be owned by anyone in particular.
03:50:36[Saint]You can take over _any_ commit.
03:50:44[Saint]All you need is the change-id.
03:51:47foolshOk let me try again, then
03:51:57jhMikeSthat's what this is about?
03:52:15[Saint]learning how to abduct a gerrit task.
03:52:39foolshYes, but in a not so nefarious way
03:52:46jhMikeSI just did it without thinking about it, use its change id instead of a new one
03:52:59jhMikeSthe resampler comes to mind
03:53:34[Saint]It can be a bit tricky if you want to preserve authorship.
03:53:53[Saint]but there's a flag to pass a specific author, iirc.
03:54:07[Saint]can't recall it at this instance.
03:54:19 Join Aldem [0] (~Aldem@unaffiliated/aldem)
03:54:48jhMikeShow to search gerrit by commit message?!
03:55:13[Saint]ah. derp. I'm an idiot.
03:55:36[Saint]realllllly out there, that flag. no wonder I didn't remember it. ;)
03:55:52 Quit Aldem (Read error: Connection reset by peer)
03:56:10[Saint]"−−author "Author Name <author@email.address>""
03:56:39 Join Aldem [0] (~Aldem@unaffiliated/aldem)
03:57:44foolshThanks that helps somewhat, I just need to work out exactly what to do with the change-id
03:58:07jhMikeSit changed authorship but not ownership
03:58:36[Saint]changing ownership is possible, but a /whole/ rigmarole-fuck-around-doo-be-doo.
03:58:40jhMikeSjust looking back at it
04:01:46 Quit amiconn (Disconnected by services)
04:01:47 Join amiconn_ [0] (amiconn@rockbox/developer/amiconn)
04:01:48 Quit pixelma (Disconnected by services)
04:01:48 Join pixelma_ [0] (pixelma@rockbox/staff/pixelma)
04:01:50 Nick pixelma_ is now known as pixelma (pixelma@rockbox/staff/pixelma)
04:01:52 Nick amiconn_ is now known as amiconn (amiconn@rockbox/developer/amiconn)
04:02:31*jhMikeS like the little keyword suggestion
04:03:54jhMikeSin gerrit
04:05:38 Quit Aldem (Read error: Connection reset by peer)
04:06:33 Join Aldem [0] (~Aldem@unaffiliated/aldem)
04:14:32jhMikeS g#947 <=??
04:15:58jhMikeS g#947
04:16:03foolshRight, I was going to ask about that, nothing to see here
04:16:53jhMikeSthough you might be trying to find a way to make registered users get push access
04:17:18foolshWell, only for the sandbox I thought
04:17:32 Nick DormantBrain is now known as SuperBrainAK (~andy@2001:470:8:a61::5f92:59a1)
04:18:03 Join ygrek [0] (~user@
04:20:42 Quit Aldem (Read error: Connection reset by peer)
04:26:47foolshI'm having the hardest time with this change-id hijacking thing, in the sandbox mine or jhMikeS' commits don't have the change-id hook, I'm finding it hard to practice my hijacking ;-)
04:27:07foolshOriginally I wanted to combine #939 and #677
04:27:51foolshThen [Frankie] wanted to work on #946 and here I am
04:35:42 Quit ygrek (Ping timeout: 245 seconds)
04:42:37 Join Gallomimia [0] (
04:43:03 Quit Gallomimia (Client Quit)
04:44:46jhMikeSfoolsh: why check out meta branch? kinda out of the way
04:49:56foolshExcuse me, sorry that went over my head
04:51:28jhMikeSyou had to fetch meta branch and check it out to get project.config :)
04:52:09 Join rela_ [0] (
04:53:26foolshOh no, that was filled out by a form in gerrits project sandbox page somewhere
04:53:38foolshAll done auto magically
04:55:36jhMikeSwhere's that exactly?
04:55:45 Quit rela (Ping timeout: 264 seconds)
04:58:45***Saving seen data "./dancer.seen"
04:59:18 Quit pixelma (Disconnected by services)
04:59:18 Quit amiconn (Disconnected by services)
04:59:18 Join amiconn_ [0] (amiconn@rockbox/developer/amiconn)
04:59:18 Join pixelma_ [0] (pixelma@rockbox/staff/pixelma)
04:59:20 Nick pixelma_ is now known as pixelma (pixelma@rockbox/staff/pixelma)
04:59:23 Nick amiconn_ is now known as amiconn (amiconn@rockbox/developer/amiconn)
04:59:26jhMikeSmore out of the weird pages...
05:00:53 Join Diaz3716 [0] (dc84edaf@gateway/web/freenode/ip.
05:01:48Diaz3716hi saratoga,
05:02:17Diaz3716about how to merge libwma to ffmpeg libavcodec for fixed point wma decoder
05:03:29Diaz3716it seems asf_read_packet() will prepare audiobuf that has a specific format ,right?
05:04:04Diaz3716or the audiobuf from asf_read_packet is the original wma data?
05:10:47 Quit TheSeven (Ping timeout: 272 seconds)
05:12:11 Join TheSeven [0] (~quassel@rockbox/developer/TheSeven)
05:19:26 Nick SuperBrainAK is now known as DormantBrain (~andy@2001:470:8:a61::5f92:59a1)
05:21:01 Join Gallomimia [0] (
05:35:47 Quit bp0 (Quit: Leaving)
05:36:31*jhMikeS doesn't get all this if (dir_exists()) mkdir/rmdir(); (it's really quite unnecessary)
05:36:59*jhMikeS has to squash it
05:40:56 Nick DormantBrain is now known as SuperBrainAK (~andy@2001:470:8:a61::5f92:59a1)
06:28:36 Quit ikeboy (Quit: Leaving)
06:44:09 Quit rela_ (Ping timeout: 252 seconds)
06:58:46***Saving seen data "./dancer.seen"
07:01:51 Join dfkt_ [0] (
07:02:01 Quit dfkt (Disconnected by services)
07:02:01 Quit dfkt_ (Changing host)
07:02:01 Join dfkt_ [0] (dfkt@unaffiliated/dfkt)
07:02:01 Nick dfkt_ is now known as dfkt (dfkt@unaffiliated/dfkt)
07:02:10 Quit foolsh (Remote host closed the connection)
07:02:53 Quit jhMikeS (Ping timeout: 272 seconds)
07:11:42 Join mortalis [0] (~kvirc@
07:16:50 Quit Diaz3716 (Quit: Page closed)
08:02:44 Join jhMikeS [0] (~jethead71@rockbox/developer/jhMikeS)
08:12:17 Quit jhMikeS (Ping timeout: 268 seconds)
08:12:50 Join jhMikeS [0] (
08:12:50 Quit jhMikeS (Changing host)
08:12:50 Join jhMikeS [0] (~jethead71@rockbox/developer/jhMikeS)
08:20:50 Join pamaury [0] (~quassel@rockbox/developer/pamaury)
08:20:59 Join Provel [0] (
08:30:21 Quit pamaury (Quit: No Ping reply in 180 seconds.)
08:31:31 Join pamaury [0] (~quassel@rockbox/developer/pamaury)
08:37:16 Join ender` [0] (
08:40:32 Quit pamaury (Quit: No Ping reply in 180 seconds.)
08:41:40 Join pamaury [0] (~quassel@rockbox/developer/pamaury)
08:49:10 Join petur [0] (5bb7304d@rockbox/developer/petur)
08:52:47 Quit pamaury (Ping timeout: 246 seconds)
08:58:50***Saving seen data "./dancer.seen"
09:18:37 Nick SuperBrainAK is now known as DormantBrain (~andy@2001:470:8:a61::5f92:59a1)
09:23:38 Join wodz [0] (
09:24:33wodzpamaury: (log) It 'just' works for me that way. I didn't investigate it deeply. Feel free to change this to proper syntax.
09:32:58 Join JdGordon_ [0] (~jonno@rockbox/developer/JdGordon)
09:34:03 Quit JdGordon (Ping timeout: 260 seconds)
10:00:57 Quit scorche` (Read error: Connection reset by peer)
10:01:15 Join mikroflops [0] (~yogurt@
10:01:35 Join scorche [0] (~scorche@rockbox/administrator/scorche)
10:10:07 Join einhirn [0] (
10:12:16 Join pamaury [0] (~quassel@rockbox/developer/pamaury)
10:29:15 Join goom [0] (
10:50:44 Quit goom (Ping timeout: 246 seconds)
10:51:58 Join timemob [0] (
10:52:20timemobdo lower mp3 bitrate use more CPU time in recorder
10:53:35 Join t1memob [0] (
10:56:10 Join tim3mob [0] (
10:56:57 Quit timemob (Ping timeout: 264 seconds)
10:57:56 Quit t1memob (Ping timeout: 240 seconds)
10:58:14 Join timemob [0] (
10:58:52***Saving seen data "./dancer.seen"
11:01:01 Quit tim3mob (Ping timeout: 272 seconds)
11:01:43wodzTheSeven: ping
11:02:37timemobanyone answer my question while I was busy pinging out
11:03:12timemobalso is there a debug mode where I can overlay CPU usage over any screen
11:05:43 Join LinusN [0] (
11:07:58timemobwhy not?
11:08:31timemobhow can I debug what's causing warning 0000002 in recorder app, which stops recording and crashes rb
11:15:55 Join AlexP [0] (~alex@rockbox/staff/AlexP)
11:26:14TheSevenwodz: po
11:31:15wodzTheSeven: I see some names mismatch between how you named fields in designware registers and STM32F4xx manual. Any reason for this?
11:33:05TheSevenprobably grabbed those from STM32 standard library headers instead of the datasheet
11:35:37wodzTheSeven: I started rewrite of your driver to switch bitfields into good & old shits and masks with macros. This is painfully slow process though.
11:42:38timemobcompiler not smart enough for you?
11:42:51TheSevenbasically yes
11:43:05timemobdon't see now
11:44:26wodztimemob: basically C standard doesn't guarantee the order of bits in bitfields so messing with hw registers is quite fragile this way
11:44:36TheSeven...and old gcc doesn't like the way how some of them are declared
11:45:01timemobthat's obvious. who would ever think otherwise?
11:45:22wodznot speaking what gcc tends to do with bitfields access
11:45:27TheSevenapparently STM and also IIRC some linux kernel modules
11:45:34TheSevenwodz: that was taken care of ;)
11:45:37timemobwhy were bit fields even used that way
11:45:51wodzTheSeven: I know, but it required manual intervention :-)
11:46:19timemobstm what? stdperiphlib doesn't use bit fields
11:46:39timemobor any of their libs that I've seen
11:47:29TheSevenoh? then you apparently haven't seen any
11:47:48TheSeventhey use it for *every* hardware register definition
11:50:27timemobum what.
11:50:32timemobwhich file
11:53:42TheSeventimemob: in this case STM32_USB_OTG_Driver/inc/usb_regs.h
11:53:59timemobthat's the new time cube shit
11:54:06timemobnobody sane uses that
11:54:14TheSeventhat's from way before cube even existet
11:54:51timemobthere's no bit field in stm32xx.h or any drivers
11:55:00TheSeventhis one is from july 2011 btw
11:55:08 Quit jhMikeS (Ping timeout: 264 seconds)
11:57:50wodzTheSeven: Is hnptxsts from your driver the same as GNPTXSTS form manual?
11:58:17TheSevenquite likely
12:19:29 Join Michal___ [0] (5d5aa719@gateway/web/freenode/ip.
12:23:04 Quit Scall (Ping timeout: 260 seconds)
12:23:40Michal___Hi, please, try work anybody with Rockbox simulator?
12:25:04Michal___How can I go to wps screen? I every receive Nothing to play and in files I dont see any files.
12:28:25 Join t1memob [0] (
12:29:41 Join Scall [0] (~chat@unaffiliated/scall)
12:30:42Michal___Know anybody, how is maximum size of code in .wps file?
12:31:45 Quit timemob (Ping timeout: 264 seconds)
12:32:56 Quit t1memob (Ping timeout: 264 seconds)
12:47:01 Quit Zagor (Ping timeout: 260 seconds)
12:58:54***Saving seen data "./dancer.seen"
12:59:10 Join Zagor [242] (~bjst@rockbox/developer/Zagor)
13:03:01 Quit Jack87 (Ping timeout: 272 seconds)
13:03:01 Quit Topy44 (Ping timeout: 272 seconds)
13:04:38 Join Jack87 [0] (Jack87@nasadmin/admin/jack87)
13:06:20 Join Topy44 [0] (
13:23:12 Quit Michal___ (Quit: Page closed)
13:32:12 Quit wodz (Quit: Leaving)
13:38:13 Quit AlexP (Ping timeout: 276 seconds)
13:39:04 Join AlexP [0] (~alex@rockbox/staff/AlexP)
13:48:14 Quit knitt1 (Quit: Lost terminal)
13:49:14 Join knittl [0] (~knittl@unaffiliated/knittl)
13:55:29 Quit preglow (Ping timeout: 256 seconds)
14:05:35 Nick megal0maniac is now known as Guest50778 (
14:05:35 Quit Guest50778 (Killed ( (Nickname regained by services)))
14:05:38 Join megal0maniac [0] (~megal0man@
14:07:52 Join cmhobbs [0] (~cmhobbs@fsf/member/cmhobbs)
14:08:58 Join preglow [0] (~thomj@2001:840:4243:3::100)
14:16:04 Quit cmhobbs (Ping timeout: 272 seconds)
14:58:58***Saving seen data "./dancer.seen"
15:07:16 Quit mikroflops (Ping timeout: 276 seconds)
15:49:45 Join ZincAlloy [0] (
15:50:22 Part ZincAlloy
16:26:29 Join kugel [0] (~kugel@
16:26:29 Quit kugel (Changing host)
16:26:29 Join kugel [0] (~kugel@rockbox/developer/kugel)
16:26:51 Quit Zagor (Quit: Clint excited)
16:30:47 Part LinusN
16:32:14 Quit kugel (Ping timeout: 272 seconds)
16:52:52 Join ygrek [0] (~user@
16:59:00***Saving seen data "./dancer.seen"
17:17:02 Join kuldeepdhaka [0] (~kuldeepdh@unaffiliated/kuldeepdhaka)
17:26:31 Quit ygrek (Remote host closed the connection)
17:26:50 Join ygrek [0] (~user@
17:32:31 Join rela_ [0] (
17:36:03 Quit petur (Ping timeout: 246 seconds)
17:41:04 Quit copper (Remote host closed the connection)
17:41:19 Quit rela_ (Quit: Leaving)
17:41:35 Join rela [0] (~x@pdpc/supporter/active/rela)
17:44:56 Join copper [0] (~copper@unaffiliated/copper)
17:48:53 Quit rela (Read error: Connection reset by peer)
17:51:51 Quit pamaury (Ping timeout: 245 seconds)
18:04:20 Join sobukus_ [0] (
18:04:21 Join albb0920_ [0] (
18:06:29 Join __jae___ [0] (
18:06:38 Join ranmacha1 [0] (
18:07:01 Quit ps-auxw (Disconnected by services)
18:07:14 Join ps-auxw [0] (~arneb@2001:470:c807:0:1532:4e5f:2ad3:4123)
18:07:26 Quit gevaerts (Disconnected by services)
18:07:31 Join gevaerts_ [0] (~fg@rockbox/developer/gevaerts)
18:08:19 Join ender| [0] (krneki@2a01:260:4094:1:42:42:42:42)
18:08:30 Quit dys (Ping timeout: 260 seconds)
18:08:30 Quit Cinos (Ping timeout: 260 seconds)
18:08:34 Quit sobukus (Ping timeout: 260 seconds)
18:08:35 Quit albb0920 (Ping timeout: 260 seconds)
18:08:36 Quit michaelni (Ping timeout: 260 seconds)
18:08:37 Quit ParkerR (Ping timeout: 260 seconds)
18:08:38 Quit APLU (Ping timeout: 260 seconds)
18:08:39 Quit __jae__ (Ping timeout: 260 seconds)
18:08:43 Quit ranmachan (Ping timeout: 260 seconds)
18:08:43 Quit ender^ (Ping timeout: 260 seconds)
18:08:43 Quit charlie (Ping timeout: 260 seconds)
18:08:46 Quit x56 (Ping timeout: 260 seconds)
18:08:52 Join ParkerR_ [0] (
18:09:08 Join michaelni [0] (
18:09:25 Join Cinos [0] (
18:09:45 Join x56 [0] (
18:10:17 Join charlie [0] (~c@unaffiliated/charlie)
18:10:39 Join APLU [0] (
18:23:20 Nick gevaerts_ is now known as gevaerts (~fg@rockbox/developer/gevaerts)
18:38:46 Join kugel [0] (~kugel@
18:38:47 Quit kugel (Changing host)
18:38:47 Join kugel [0] (~kugel@rockbox/developer/kugel)
18:40:30 Join bertrik [0] (~quassel@rockbox/developer/bertrik)
18:49:51 Quit ygrek (Ping timeout: 245 seconds)
18:56:37 Quit kugel (Remote host closed the connection)
18:57:11 Join xorly [0] (
18:58:19 Join kugel [0] (~kugel@
18:58:19 Quit kugel (Changing host)
18:58:19 Join kugel [0] (~kugel@rockbox/developer/kugel)
18:58:32 Quit mortalis (Ping timeout: 272 seconds)
18:58:59 Nick ParkerR_ is now known as ParkerR (
18:58:59 Quit ParkerR (Changing host)
18:58:59 Join ParkerR [0] (ParkerR@unaffiliated/parkerr)
18:59:03***Saving seen data "./dancer.seen"
19:17:16 Quit xorly (Ping timeout: 245 seconds)
19:19:40 Quit einhirn (Quit: Miranda IM! Smaller, Faster, Easier.
19:23:15 Join lebellium [0] (
19:26:24pixelmaHmm, Rockbox on Android let's you enable A-B repeat but how do I set the markers?
19:47:38 Quit kuldeepdhaka (Quit: Leaving)
19:52:07pixelmaand on another note (although a bit related because specific to touchscreens), I find the cabbiev2 OSD unusable on my phone: I don't know what will appear and if I touch the screen once to make it appear and accidentally already hit an area with a function (e.g. showing the quickscreen) then I'll be taken there immediately
19:52:21 Quit bluebrother (Disconnected by services)
19:52:26 Join bluebrother^ [0] (~dom@rockbox/developer/bluebrother)
19:55:13 Quit fs-bluebot (Ping timeout: 276 seconds)
19:55:30 Join Aldem [0] (~Aldem@unaffiliated/aldem)
19:56:32 Join JdGordon [0] (
19:56:32 Quit JdGordon (Changing host)
19:56:32 Join JdGordon [0] (~jonno@rockbox/developer/JdGordon)
19:57:59 Quit JdGordon_ (Ping timeout: 252 seconds)
20:00:02 Join fs-bluebot [0] (
20:00:32 Join Rower [0] (
20:07:36 Join JdGordon_ [0] (~jonno@rockbox/developer/JdGordon)
20:09:32 Quit JdGordon (Ping timeout: 264 seconds)
20:10:19 Quit Gallomimia (Ping timeout: 255 seconds)
20:20:32 Quit Aldem (Quit: Leaving)
20:44:29 Quit Xerion (Read error: No route to host)
20:45:42 Join ygrek [0] (~user@
20:53:22 Join Strife89 [0] (~Strife89@2602:306:bce1:8c20:a1e7:35d2:8dad:5db8)
20:56:13 Join foolsh [0] (
20:57:50 Join pamaury [0] (~quassel@rockbox/developer/pamaury)
20:59:07***Saving seen data "./dancer.seen"
21:00:26foolshlol opps
21:02:08foolshpamaury: BTW #939 and #677 Think they're ready to merge?
21:04:51foolshDo you need them combined beforehand?
21:06:59 Join drnez [0] (
21:13:11 Quit ygrek (Ping timeout: 245 seconds)
21:23:55 Quit kugel (Ping timeout: 260 seconds)
21:27:17pamauryfoolsh: no that's fine, I just need to find some time to do it
21:27:33 Join petur [0] (~petur@rockbox/developer/petur)
21:29:53foolshpamaury: Alright B-)
21:33:00 Quit foolsh (Remote host closed the connection)
21:33:05 Join rela [0] (~x@pdpc/supporter/active/rela)
21:35:56 Join foolsh [0] (
21:48:42 Quit Strife89 (Quit: Vamoose.)
21:51:45 Join jhMikeS [0] (~jethead71@rockbox/developer/jhMikeS)
21:59:50 Quit rela (Read error: Connection reset by peer)
22:03:14 Nick evilnick_ is now known as evilnick (
22:03:31 Quit evilnick (Changing host)
22:03:31 Join evilnick [0] (~evilnick@rockbox/staff/evilnick)
22:08:49 Quit AlexP (Remote host closed the connection)
22:10:17 Join AlexP [0] (~alex@rockbox/staff/AlexP)
22:13:09 Quit AlexP (Remote host closed the connection)
22:28:02 Quit petur (Remote host closed the connection)
22:38:40 Join AlexP [0] (~alex@rockbox/staff/AlexP)
22:43:54 Join Aldem [0] (~Aldem@unaffiliated/aldem)
22:53:40 Quit pamaury (Ping timeout: 255 seconds)
22:59:11***Saving seen data "./dancer.seen"
23:00:25 Quit drnez (Quit: leaving)
23:09:15 Join [Franklin] [0] (
23:10:30[Franklin]jhMikeS, so how should I fix my master branch?
23:14:00 Join ender1 [0] (
23:16:39[Franklin]Or just pull a fresh branch?
23:16:46foolsh[Franklin]: Wat is exactly wrong? I did't really understand what you needed yesterday?
23:17:08[Franklin]ok... I just merged with upstream and probably screwed up somewhere
23:17:22[Franklin]I want to undo that merge and try again
23:18:12 Quit ender` (Ping timeout: 272 seconds)
23:19:27foolshyou can use something like "git reset −−hard 990498483674637345522332323" where is the nubers are a shahash of the commit right before you goofed
23:19:58foolshuse 'git log' to find the hash
23:20:11[Franklin]But I'm not sure where I goofed :)
23:20:18[Franklin]but ok, I'll bisect and find out
23:20:34[Franklin]after I fix this bug in something else
23:22:08foolshdo you use "git checkout -b NEWBRANCHNAME" when mucking around with new ideas? It can save you a headache or two
23:22:21[Franklin]nope... :)
23:22:29[Franklin]only when I'm done my work on master and want to push
23:23:42foolshLike said you shoud it would help you out, I never mess with master, ever
23:23:56[Franklin]I have a vanilla branch
23:24:14[Franklin]vanilla is upstream, master is my personal bleeding edge
23:25:10*[Franklin] hates resolving conflicts
23:25:15[Franklin]especially binary ones
23:26:11[Franklin]now make clean+make again
23:26:18[Franklin]even with ccache it's SLOW
23:28:34foolshI don't understand, do you build in the source tree? The wiki really should be changed in that regard. I build out of tree by one directory level so I use "../rockbox/tools/configure" and my source never gets clobbered.
23:28:56[Franklin]yes.... :)
23:29:08[Franklin]Though I probably shouldn't
23:29:11[Franklin]as you said
23:30:24[Franklin]so you wanna change it?
23:32:01[Franklin]w00t... it builds!
23:32:12[Franklin]now to merge it right :)
23:32:16foolshI think more input from other members first would be prudent before a change.
23:32:26[Franklin]mailing list?
23:32:59[Franklin]I think it should be changed
23:33:41[Franklin]or just put it on the wiki and see who complains on IRC :)
23:34:42[Franklin]thankfully... only 3 conflicts
23:39:11*[Franklin] should start changing his workflow
23:40:47foolshYou're getting smarter'er :-)
23:41:17 Join Gallomimia [0] (
23:42:53[Franklin]yay... merged correctly this time :)
23:42:53[Franklin](last time was because of one of my hunks got mixed in with remote)
23:44:02[Franklin]btw, why did you abandon g947?
23:44:10 Quit Gallomimia (Read error: Connection reset by peer)
23:44:36 Join Gallomimia [0] (
23:45:03foolshIt was unnecessary really, I think i didn't do exactly what I thought it would after talking last night on IRC
23:45:19[Franklin]but you still like the idea?
23:46:10foolshOf having power to merge and revert in the sandbox? yeah sure I could use the practice
23:46:26 Quit lebellium (Quit: ChatZilla [Firefox 32.0/20140825202822])
23:46:29[Franklin]oh... I mean master :)
23:46:36[Franklin]oh different branch
23:47:10*[Franklin] is looking at fs8647
23:47:17*[Franklin] is looking at fs#8647
23:47:18fs-bluebot Amaze - 3D maze game plugin (patches, unconfirmed)
23:47:21[Franklin]ok good
23:48:23foolshI'm not sure we use the same conventions, I speak of master as the up to date copy I receive from "git pull" and my bleeding edge is what ever branch I'm one when trying something new
23:48:48[Franklin]master is my bleeding edge and vanilla is from
23:50:10foolshAh, confusing
23:50:33[Franklin]and then I have other branches with related stuff
23:50:37[Franklin]they're all merged into master
23:52:24[Franklin]so master has everything

Previous day | Next day