diff -Nru rtmpdumphdtv-0.1.7~oneiric/debian/changelog rtmpdumphdtv-0.1.8~oneiric/debian/changelog --- rtmpdumphdtv-0.1.7~oneiric/debian/changelog 2012-06-10 15:20:08.000000000 +0000 +++ rtmpdumphdtv-0.1.8~oneiric/debian/changelog 2012-06-14 09:10:59.000000000 +0000 @@ -1,6 +1,6 @@ -rtmpdumphdtv (0.1.7~oneiric) oneiric; urgency=high +rtmpdumphdtv (0.1.8~oneiric) oneiric; urgency=high - * Initial release + * Initial release: fix Scandinavian channels -- Goran Vidovic (gogo) Fri, 28 May 2012 10:48:51 +0200 diff -Nru rtmpdumphdtv-0.1.7~oneiric/rtmpdumpTV rtmpdumphdtv-0.1.8~oneiric/rtmpdumpTV --- rtmpdumphdtv-0.1.7~oneiric/rtmpdumpTV 2012-06-10 14:45:22.000000000 +0000 +++ rtmpdumphdtv-0.1.8~oneiric/rtmpdumpTV 2012-06-14 09:07:26.000000000 +0000 @@ -211,45 +211,45 @@ Teen=Teen Teen 2=Teen2' -CHANNELS6='VH1=http://www.fcast.tv/watch.php?live/televisavh1 -TV 2=http://mdc.unistream.tv/udp/239.100.202.1:1234 -DK 4=http://mdc.unistream.tv/udp/239.100.202.2:1234 -TV 2 News=http://mdc.unistream.tv/udp/239.100.202.3:1234 -Kanal 9=http://mdc.unistream.tv/udp/239.100.202.4:1234 -5=http://mdc.unistream.tv/udp/239.100.202.5:1234 -DR 1=http://mdc.unistream.tv/udp/239.100.202.6:1234 -DR 2=http://mdc.unistream.tv/udp/239.100.202.7:1234 -Viasat Golf=http://mdc.unistream.tv/udp/239.100.202.8:1234 -TV 2 Sport=http://mdc.unistream.tv/udp/239.100.202.9:1234 -Viasat 3=http://mdc.unistream.tv/udp/239.100.202.10:1234 -CNN=http://mdc.unistream.tv/udp/239.100.202.11:1234 -TV 2 Zulu=http://mdc.unistream.tv/udp/239.100.202.12:1234 -Viasat +3=http://mdc.unistream.tv/udp/239.100.202.13:1234 -TV 2 Charlie=http://mdc.unistream.tv/udp/239.100.202.14:1234 -DR 2 Rama=http://mdc.unistream.tv/udp/239.100.202.15:1234 -TV 2 Film=http://mdc.unistream.tv/udp/239.100.202.16:1234 -TV II=http://mdc.unistream.tv/udp/239.100.202.17:1234 -Sport=http://mdc.unistream.tv/udp/239.100.202.18:1234 -4 Film=http://mdc.unistream.tv/udp/239.100.202.19:1234 -SVT 1=http://mdc.unistream.tv/udp/239.100.202.20:1234 -UR=http://mdc.unistream.tv/udp/239.100.202.21:1234 -Kanal 9=http://mdc.unistream.tv/udp/239.100.202.22:1234 -3 Norge=http://mdc.unistream.tv/udp/239.100.202.23:1234 -3=http://mdc.unistream.tv/udp/239.100.202.24:1234 -TV 2 Sporten=http://mdc.unistream.tv/udp/239.100.202.25:1234 -TV 2 Sport=http://mdc.unistream.tv/udp/239.100.202.26:1234 -TV 2=http://mdc.unistream.tv/udp/239.100.202.27:1234 -TV 2=http://mdc.unistream.tv/udp/239.100.202.28:1234 -NRK 1=http://mdc.unistream.tv/udp/239.100.202.29:1234 -NRK 2=http://mdc.unistream.tv/udp/239.100.202.30:1234 -NRK Super=http://mdc.unistream.tv/udp/239.100.202.31:1234 -TV5 DK=http://mdc.unistream.tv/udp/239.100.202.32:1234 -Viasat 3 puls=http://mdc.unistream.tv/udp/239.100.202.33:1234 -N=http://mdc.unistream.tv/udp/239.100.202.35:1234 -eurosport=http://mdc.unistream.tv/udp/239.100.202.36:1234 -animal planet=http://mdc.unistream.tv/udp/239.100.202.37:1234 -AD sport live HD=http://mdc.unistream.tv/udp/239.100.202.40:1234 -ABU DHABI SPORT=http://mdc.unistream.tv/udp/239.100.202.101:1234' +CHANNELS6='TV 2 (dk)=http://149.62.176.204:80/udp/239.100.202.1:1234 +TV 4=http://149.62.176.204:80/udp/239.100.202.2:1234 +TV 2 News=http://149.62.176.204:80/udp/239.100.202.3:1234 +Canal 9 (dk)=http://149.62.176.204:80/udp/239.100.202.4:1234 +6 eren=http://149.62.176.204:80/udp/239.100.202.5:1234 +DR 1=http://149.62.176.204:80/udp/239.100.202.6:1234 +DR 2=http://149.62.176.204:80/udp/239.100.202.7:1234 +Viasat Golf=http://149.62.176.204:80/udp/239.100.202.8:1234 +TV 2 Sport (dk)=http://149.62.176.204:80/udp/239.100.202.9:1234 +TV3 (dk)=http://149.62.176.204:80/udp/239.100.202.10:1234 +CNN=http://149.62.176.204:80/udp/239.100.202.11:1234 +TV 2 Zulu=http://149.62.176.204:80/udp/239.100.202.12:1234 +TV3+=http://149.62.176.204:80/udp/239.100.202.13:1234 +TV 2 Charlie=http://149.62.176.204:80/udp/239.100.202.14:1234 +DR Ramasjang=http://149.62.176.204:80/udp/239.100.202.15:1234 +TV 2 Film=http://149.62.176.204:80/udp/239.100.202.16:1234 +TV 11=http://149.62.176.204:80/udp/239.100.202.17:1234 +TV 4 Sport=http://149.62.176.204:80/udp/239.100.202.18:1234 +TV 4 Film=http://149.62.176.204:80/udp/239.100.202.19:1234 +SVT 1=http://149.62.176.204:80/udp/239.100.202.20:1234 +SVT 2=http://149.62.176.204:80/udp/239.100.202.21:1234 +Kanal 9 (se)=http://149.62.176.204:80/udp/239.100.202.22:1234 +TV3 (se)=http://149.62.176.204:80/udp/239.100.202.23:1234 +TV3 (no)=http://149.62.176.204:80/udp/239.100.202.24:1234 +TV 2 Nyhetskanalen=http://149.62.176.204:80/udp/239.100.202.25:1234 +TV 2 Sport (no)=http://149.62.176.204:80/udp/239.100.202.26:1234 +TV 2 (no)=http://149.62.176.204:80/udp/239.100.202.27:1234 +TV 2 Zebra=http://149.62.176.204:80/udp/239.100.202.28:1234 +NRK 1=http://149.62.176.204:80/udp/239.100.202.29:1234 +NRK 2=http://149.62.176.204:80/udp/239.100.202.30:1234 +NRK 3/Super=http://149.62.176.204:80/udp/239.100.202.31:1234 +TV3 Puls=http://149.62.176.204:80/udp/239.100.202.33:1234 +Kanal 5=http://149.62.176.204:80/udp/239.100.202.34:1234 +TV Norge=http://149.62.176.204:80/udp/239.100.202.35:1234 +Eurosport=http://149.62.176.204:80/udp/239.100.202.36:1234 +Animal Planet=http://149.62.176.204:80/udp/239.100.202.37:1234 +Discovery=http://149.62.176.204:80/udp/239.100.202.38:1234 +Eurosport 2=http://149.62.176.204:80/udp/239.100.202.39:1234 +AD sport live HD=http://149.62.176.204:80/udp/239.100.202.101:1234 ' CHANNELS7='HRT 1=rtsp://wowza.h1telekom.hr:1935/live/_definst_/channel1-1400.stream HRT 2=rtsp://wowza.h1telekom.hr:1935/live/_definst_/channel2-1400.stream @@ -271,7 +271,7 @@ while [ $? -eq 0 ]; do function seloperation(){ - operation=`zenity --width=200 --height=370 --list --column "Server Name" --title="rtmpdumpTV" --text="Select a server:" "HD Channels" "HR programi" "Adult +18 XXX" "Scandinavian" "VH1-Server" "LowDef" "LowDefSocks"` + operation=`zenity --width=200 --height=370 --list --column "Server Name" --title="rtmpdumpTV" --text="Select a server:" "HD Channels" "HD Channels - DEBUG" "HR programi" "Adult +18 XXX" "Scandinavian" "VH1-Server" "LowDef" "LowDefSocks"` } seloperation @@ -287,6 +287,17 @@ else exit 0 fi ;; + "HD Channels - DEBUG" ) + PROG=`echo "$(echo "$CHANNELS" | cut -d= -f1)" | zenity --height=650 --width=340 --list --column="Programme" --title="rtmpdumpTV" --text="Select Channel:"` +if [ "$PROG" != "" ]; then + PROGNUM=`echo "$CHANNELS" | grep "$PROG" | cut -d= -f2` +## IF YOU WANT TO USE FLVSTREAMER, UNCOMMENT: +# flvstreamer -r "rtmp://s7.webport.tv/live" -s "http://www.tvsector.com/wp-content/uploads/jw-player-plugin-for-wordpress/player/player.swf" -p "http://www.tvsector.com/" -y $PROGNUM -e |$PLAYER - +## IF YOU WANT TO USE RTMPDUMP, UNCOMMENT: + rtmpdump -z -r "rtmp://tv.webport.tv/ilt" -W "http://ioslivetv.net/wp-content/uploads/jw-player-plugin-for-wordpress/player/player.swf" -p "http://ioslivetv.net" -y $PROGNUM |$PLAYER - +else + exit 0 +fi ;; "Server1" ) PROG=`echo "$(echo "$CHANNELS" | cut -d= -f1)" | zenity --height=650 --width=340 --list --column="Programme" --title="rtmpdumpTV" --text="Select Channel:"` if [ "$PROG" != "" ]; then