Changeset a7e16ca0d833fad739b595a60cf4515154decb27
- Timestamp:
- 14/05/06 21:52:42
(3 years ago)
- Author:
- Clément Stenac <zorglub@videolan.org>
- git-committer:
- Clément Stenac <zorglub@videolan.org> 1147636362 +0000
- git-parent:
[e0e7b2ef03e32657d347ad5ef039191a3d57cdd1]
- git-author:
- Clément Stenac <zorglub@videolan.org> 1147636362 +0000
- Message:
Fix shout compile
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r8f08042 |
ra7e16ca |
|
| 91 | 91 | struct services_discovery_sys_t |
|---|
| 92 | 92 | { |
|---|
| 93 | | playlist_item_t *p_item; |
|---|
| | 93 | playlist_item_t *p_node_cat,*p_node_one; |
|---|
| | 94 | input_item_t *p_input; |
|---|
| 94 | 95 | vlc_bool_t b_dialog; |
|---|
| 95 | 96 | }; |
|---|
| … | … | |
| 127 | 128 | playlist_t *p_playlist; |
|---|
| 128 | 129 | playlist_view_t *p_view; |
|---|
| 129 | | playlist_item_t *p_item; |
|---|
| 130 | 130 | |
|---|
| 131 | 131 | p_sd->pf_run = Run; |
|---|
| … | … | |
| 141 | 141 | } |
|---|
| 142 | 142 | |
|---|
| 143 | | p_view = playlist_ViewFind( p_playlist, VIEW_CATEGORY ); |
|---|
| 144 | | |
|---|
| 145 | 143 | switch( i_type ) |
|---|
| 146 | 144 | { |
|---|
| 147 | 145 | case TV: |
|---|
| 148 | | p_sys->p_item = p_item = playlist_ItemNew( p_playlist, |
|---|
| 149 | | SHOUTCAST_TV_BASE_URL, _("Shoutcast TV") ); |
|---|
| | 146 | p_sys->p_input = input_ItemNewExt( p_playlist, |
|---|
| | 147 | SHOUTCAST_TV_BASE_URL, _("Shoutcast TV"), |
|---|
| | 148 | 0, NULL, -1 ); |
|---|
| 150 | 149 | break; |
|---|
| 151 | 150 | case RADIO: |
|---|
| 152 | 151 | default: |
|---|
| 153 | | p_sys->p_item = p_item = playlist_ItemNew( p_playlist, |
|---|
| 154 | | SHOUTCAST_BASE_URL, _("Shoutcast") ); |
|---|
| | 152 | p_sys->p_input = input_ItemNewExt( p_playlist, |
|---|
| | 153 | SHOUTCAST_BASE_URL, _("Shoutcast"), |
|---|
| | 154 | 0, NULL, -1 ); |
|---|
| 155 | 155 | break; |
|---|
| 156 | 156 | } |
|---|
| 157 | | playlist_NodeAddItem( p_playlist, p_item, p_view->i_id, |
|---|
| 158 | | p_view->p_root, PLAYLIST_APPEND, |
|---|
| 159 | | PLAYLIST_END ); |
|---|
| 160 | | |
|---|
| 161 | | p_sys->p_item->i_flags |= PLAYLIST_RO_FLAG; |
|---|
| 162 | | |
|---|
| | 157 | /* TODO FLAGS */ |
|---|
| | 158 | p_sys->p_node_cat = playlist_NodeAddInput( p_playlist, p_sys->p_input, |
|---|
| | 159 | p_playlist->p_root_category, |
|---|
| | 160 | PLAYLIST_APPEND, PLAYLIST_END ); |
|---|
| | 161 | p_sys->p_node_one = playlist_NodeAddInput( p_playlist, p_sys->p_input, |
|---|
| | 162 | p_playlist->p_root_onelevel, |
|---|
| | 163 | PLAYLIST_APPEND, PLAYLIST_END ); |
|---|
| 163 | 164 | val.b_bool = VLC_TRUE; |
|---|
| 164 | 165 | var_Set( p_playlist, "intf-change", val ); |
|---|
| … | … | |
| 180 | 181 | if( p_playlist ) |
|---|
| 181 | 182 | { |
|---|
| 182 | | playlist_NodeDelete( p_playlist, p_sys->p_item, VLC_TRUE, VLC_TRUE ); |
|---|
| | 183 | playlist_NodeDelete( p_playlist, p_sys->p_node_cat, VLC_TRUE, VLC_TRUE ); |
|---|
| | 184 | playlist_NodeDelete( p_playlist, p_sys->p_node_one, VLC_TRUE, VLC_TRUE ); |
|---|
| 183 | 185 | vlc_object_release( p_playlist ); |
|---|
| 184 | 186 | } |
|---|
| … | … | |
| 192 | 194 | { |
|---|
| 193 | 195 | services_discovery_sys_t *p_sys = p_sd->p_sys; |
|---|
| 194 | | int i_id = input_Read( p_sd, &p_sys->p_item->input, VLC_FALSE ); |
|---|
| | 196 | int i_id = input_Read( p_sd, p_sys->p_input, VLC_FALSE ); |
|---|
| 195 | 197 | int i_dialog_id; |
|---|
| 196 | 198 | |
|---|
| … | … | |
| 211 | 213 | if( i_state == PLAYING_S ) |
|---|
| 212 | 214 | { |
|---|
| 213 | | float f_pos = (float)(p_sys->p_item->i_children)* 2 *100.0 / |
|---|
| | 215 | float f_pos = (float)(p_sys->p_node_cat->i_children)* 2 *100.0 / |
|---|
| 214 | 216 | 260 /* gruiiik FIXME */; |
|---|
| 215 | 217 | intf_UserProgressUpdate( p_sd, i_dialog_id, "Downloading", |
|---|
