Attached is a quick patch to allow station admins to add a third stream. I also needed to use labels other than 'High' and 'Low' so I added variables and passed them onto theme_station_block_current_program for display. This was done against the latest 5-0 branch version.

CommentFileSizeAuthor
#22 station_schedule_144430_4.patch17.15 KBdrewish
#21 station_schedule_144430_3.patch16.45 KBdrewish
#20 station_schedule_144430_2.patch16.45 KBdrewish
#19 station_144430_2.patch8.74 KBdrewish
#17 station_schedule_144430_1.patch14.18 KBdrewish
#16 station_schedule_144430_0.patch8.73 KBdrewish
#14 station_schedule_144430.patch13.1 KBdrewish
#13 station_144430_1.patch25.68 KBdrewish
#10 station_144430_0.patch8.74 KBdrewish
#9 stat_1.patch10.03 KBdrewish
#5 station_144430.patch13.96 KBdrewish
station.module.patch4.87 KBthumb

Comments

thumb’s picture

thumb commented

I was hoping to get some feedback on this. Is it useful? If so, how could the implementation be improved. I'm hoping that this might be roled into HEAD.

thumb’s picture

thumb commented

This patch would also take care of this patch

drewish’s picture

drewish commented

sorry to have ignored this issue.

i think that should be changed but i'd prefer to move from having a predetermined number of webstreams to a model where the admin can determine how many they need. it would also be nice to be able to provide multiple URLs for the same stream (in case you've got two separate machines providing the same high and low bandwidth streams) and have them appear in an .m3u file for each stream...

so in summary, yes to the change but it should also work for people with 4, 5, or 6 streams.

thumb’s picture

thumb commented

Makes sense. I was thinking streams should be stored in an array anyway. I'll convert the predetermined number of streams to an array to allow unlimited.

drewish’s picture

drewish commented
Status: Active » Needs work
StatusFileSize
new station_144430.patch13.96 KB

okay, here's a start on what i had in mind

thumb’s picture

thumb commented

Hey drewish, at first glance it looks great. I'll back out my changes on my dev instance and give this a try. Thanks.

thumb’s picture

thumb commented

Okay, I upgraded to Station 5.x-1.x-dev, applied the patch, and ran update.php. Two issues I'm having are

1. Couple of minor syntax errors in station.module, closing parenthesis added in wrong place (see lines 274 and 281).

2. When adding a third web stream, it appears to be added (shows up in block), but does not display in admin form.

3. Stream Urls aren't linked in the block, defaults to drupal root Url.

I'll poke around and test more soon...

drewish’s picture

drewish commented
Version: 5.x-1.x-dev » 5.x-2.x-dev

now that HEAD is open again, and schedule are now nodes, i think it'd make sense to store this value in the station_schedule table rather than in the variables table. that way each schedule has it's own streams.

drewish’s picture

drewish commented
StatusFileSize
new stat_1.patch10.03 KB

still needs lots of work...

drewish’s picture

drewish commented
Component: Other » Schedule
StatusFileSize
new station_144430_0.patch8.74 KB

rerolled... i kind of think this should happen after: http://drupal.org/node/169409

joachim’s picture

joachim commented

Does this allow just one stream too?
If so, then http://drupal.org/node/131154 can maybe be marked as a duplicate.

drewish’s picture

drewish commented

yeah, http://drupal.org/node/131154 looks like a duplicate

drewish’s picture

drewish commented
StatusFileSize
new station_144430_1.patch25.68 KB

i spent a few hours on this today but this still needs work.

each schedule node now has an unscheduled message and an array of multiple streams. clicking the listen link sends you to a m3u file which plays correctly.

the views stuff needs more cleanup. there's unused stuff in there. also need to figure out how to get a now playing block working for remote archives... maybe that'll just something that should be won't fix.

drewish’s picture

drewish commented
Status: Needs work » Needs review
StatusFileSize
new station_schedule_144430.patch13.1 KB

moved the unscheduled message changes over to: http://drupal.org/node/188235
pulled out other changes that should go into their own issues.

drewish’s picture

drewish commented

some code clean up went to: http://drupal.org/node/188242
schedule node fixes to: http://drupal.org/node/188249
views clean up to: http://drupal.org/node/118390

drewish’s picture

drewish commented
StatusFileSize
new station_schedule_144430_0.patch8.73 KB

re-roll to apply cleanly with all the other stuff applied.

drewish’s picture

drewish commented
Assigned: thumb » drewish
StatusFileSize
new station_schedule_144430_1.patch14.18 KB

re-roll... that last patch dropped some stuff.

drewish’s picture

drewish commented
Status: Needs review » Needs work

actually needs work... the now playing block should use the streams...

drewish’s picture

drewish commented
Status: Needs work » Needs review
StatusFileSize
new station_144430_2.patch8.74 KB

Dropped the default view... got the streams displayed correctly on the block. It's pretty close now.

drewish’s picture

drewish commented
StatusFileSize
new station_schedule_144430_2.patch16.45 KB

whoops, that was an old copy of the patch.

drewish’s picture

drewish commented
StatusFileSize
new station_schedule_144430_3.patch16.45 KB

found one bug in the remote block, the listen links were broken.

drewish’s picture

drewish commented
Status: Needs review » Fixed
StatusFileSize
new station_schedule_144430_4.patch17.15 KB

adding a station_ored_list() list for formatting the streams. it's looking pretty good so i'm going to go ahead and commit this.

Anonymous’s picture

(not verified) commented
Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for two weeks with no activity.