ich habe herausgefunden, dass die neueren VLC Versionen die Möglichkeit nicht mehr unterstützen, den Streamport auf den Controlport zu legen, was zu der bekannten Fehlermeldung führt. Angehängt findet ihr einen Patch der dieses Problem umgeht, indem er den Stream einfach auf einen anderen Port legt.
Bis dann...
Thomas
Code: Alles auswählen
diff -Nur tuxbox-cvs.orig/apps/tuxbox/neutrino/data/locale/deutsch.locale tuxbox-cvs/apps/tuxbox/neutrino/data/locale/deutsch.locale
--- tuxbox-cvs.orig/apps/tuxbox/neutrino/data/locale/deutsch.locale 2005-05-08 16:01:37.000000000 +0200
+++ tuxbox-cvs/apps/tuxbox/neutrino/data/locale/deutsch.locale 2005-05-08 22:14:30.459027493 +0200
@@ -784,7 +784,8 @@
streamingmenu.off Deaktiviert
streamingmenu.on Aktiviert
streamingmenu.server_ip Streamingserver IP
-streamingmenu.server_port Streamingserver Port
+streamingmenu.server_control_port Server Controlport
+streamingmenu.server_stream_port Server Streamport
streamingmenu.streaming_audiorate Datenrate Audio
streamingmenu.streaming_force_avi_rawaudio Erzwinge AC3 bei avi
streamingmenu.streaming_force_transcode_video Transcod. auch mpg/vcd Video
diff -Nur tuxbox-cvs.orig/apps/tuxbox/neutrino/data/locale/english.locale tuxbox-cvs/apps/tuxbox/neutrino/data/locale/english.locale
--- tuxbox-cvs.orig/apps/tuxbox/neutrino/data/locale/english.locale 2005-05-08 16:01:37.000000000 +0200
+++ tuxbox-cvs/apps/tuxbox/neutrino/data/locale/english.locale 2005-05-08 22:14:30.460027220 +0200
@@ -784,7 +784,8 @@
streamingmenu.off Off
streamingmenu.on On
streamingmenu.server_ip Streamingserver IP
-streamingmenu.server_port Streamingserver Port
+streamingmenu.server_control_port Server Control Port
+streamingmenu.server_stream_port Server Stream Port
streamingmenu.streaming_audiorate Datarate Audio
streamingmenu.streaming_force_avi_rawaudio Force AC3 for AVI
streamingmenu.streaming_force_transcode_video Transcode MPG/VCD video
diff -Nur tuxbox-cvs.orig/apps/tuxbox/neutrino/src/gui/filebrowser.cpp tuxbox-cvs/apps/tuxbox/neutrino/src/gui/filebrowser.cpp
--- tuxbox-cvs.orig/apps/tuxbox/neutrino/src/gui/filebrowser.cpp 2005-05-08 16:01:38.000000000 +0200
+++ tuxbox-cvs/apps/tuxbox/neutrino/src/gui/filebrowser.cpp 2005-05-08 22:14:30.462026675 +0200
@@ -625,7 +625,7 @@
m_baseurl = "http://";
m_baseurl += g_settings.streaming_server_ip;
m_baseurl += ':';
- m_baseurl += g_settings.streaming_server_port;
+ m_baseurl += g_settings.streaming_server_control_port;
m_baseurl += "/admin/dboxfiles.html?dir=";
name = dirname;
diff -Nur tuxbox-cvs.orig/apps/tuxbox/neutrino/src/gui/movieplayer.cpp tuxbox-cvs/apps/tuxbox/neutrino/src/gui/movieplayer.cpp
--- tuxbox-cvs.orig/apps/tuxbox/neutrino/src/gui/movieplayer.cpp 2005-05-08 16:01:38.000000000 +0200
+++ tuxbox-cvs/apps/tuxbox/neutrino/src/gui/movieplayer.cpp 2005-05-08 22:19:00.748255830 +0200
@@ -374,7 +374,7 @@
std::string baseurl = "http://";
baseurl += g_settings.streaming_server_ip;
baseurl += ':';
- baseurl += g_settings.streaming_server_port;
+ baseurl += g_settings.streaming_server_control_port;
baseurl += '/';
// empty playlist
@@ -413,7 +413,7 @@
std::string baseurl = "http://";
baseurl += g_settings.streaming_server_ip;
baseurl += ':';
- baseurl += g_settings.streaming_server_port;
+ baseurl += g_settings.streaming_server_control_port;
baseurl += '/';
// add sout (URL encoded)
@@ -473,7 +473,7 @@
souturl += "}:";
}
souturl += "duplicate{dst=std{access=http,mux=ts,url=:";
- souturl += g_settings.streaming_server_port;
+ souturl += g_settings.streaming_server_stream_port;
souturl += "/dboxstream}}";
char *tmp = curl_escape (souturl.c_str (), 0);
@@ -500,7 +500,7 @@
std::string positionurl = "http://";
positionurl += g_settings.streaming_server_ip;
positionurl += ':';
- positionurl += g_settings.streaming_server_port;
+ positionurl += g_settings.streaming_server_control_port;
positionurl += "/admin/dboxfiles.html?stream_time=true";
printf("[movieplayer.cpp] positionurl=%s\n",positionurl.c_str());
std::string response = "";
@@ -520,7 +520,7 @@
std::string positionurl = "http://";
positionurl += g_settings.streaming_server_ip;
positionurl += ':';
- positionurl += g_settings.streaming_server_port;
+ positionurl += g_settings.streaming_server_control_port;
positionurl += "/admin/dboxfiles.html?stream_length=true";
printf("[movieplayer.cpp] positionurl=%s\n",positionurl.c_str());
std::string response = "";
@@ -588,7 +588,7 @@
const char *server = g_settings.streaming_server_ip.c_str ();
int port;
- sscanf (g_settings.streaming_server_port, "%d", &port);
+ sscanf (g_settings.streaming_server_stream_port, "%d", &port);
struct sockaddr_in servAddr;
servAddr.sin_family = AF_INET;
@@ -798,7 +798,7 @@
std::string baseurl = "http://";
baseurl += g_settings.streaming_server_ip;
baseurl += ':';
- baseurl += g_settings.streaming_server_port;
+ baseurl += g_settings.streaming_server_control_port;
baseurl += '/';
printf ("[movieplayer.cpp] mrl:%s\n", (char *) mrl);
diff -Nur tuxbox-cvs.orig/apps/tuxbox/neutrino/src/neutrino.cpp tuxbox-cvs/apps/tuxbox/neutrino/src/neutrino.cpp
--- tuxbox-cvs.orig/apps/tuxbox/neutrino/src/neutrino.cpp 2005-05-08 16:01:37.000000000 +0200
+++ tuxbox-cvs/apps/tuxbox/neutrino/src/neutrino.cpp 2005-05-08 22:14:30.469024765 +0200
@@ -671,7 +671,8 @@
//streaming (server)
g_settings.streaming_type = configfile.getInt32( "streaming_type", 0 );
g_settings.streaming_server_ip = configfile.getString("streaming_server_ip", "10.10.10.10");
- strcpy( g_settings.streaming_server_port, configfile.getString( "streaming_server_port", "8080").c_str() );
+ strcpy( g_settings.streaming_server_control_port, configfile.getString( "streaming_server_control_port", "8080").c_str() );
+ strcpy( g_settings.streaming_server_stream_port, configfile.getString( "streaming_server_stream_port", "8081").c_str() );
strcpy( g_settings.streaming_server_cddrive, configfile.getString("streaming_server_cddrive", "D:").c_str() );
strcpy( g_settings.streaming_videorate, configfile.getString("streaming_videorate", "1000").c_str() );
strcpy( g_settings.streaming_audiorate, configfile.getString("streaming_audiorate", "192").c_str() );
@@ -1003,7 +1004,8 @@
//streaming
configfile.setInt32 ( "streaming_type", g_settings.streaming_type );
configfile.setString( "streaming_server_ip", g_settings.streaming_server_ip );
- configfile.setString( "streaming_server_port", g_settings.streaming_server_port );
+ configfile.setString( "streaming_server_control_port", g_settings.streaming_server_control_port );
+ configfile.setString( "streaming_server_stream_port", g_settings.streaming_server_stream_port );
configfile.setString( "streaming_server_cddrive", g_settings.streaming_server_cddrive );
configfile.setString ( "streaming_videorate", g_settings.streaming_videorate );
configfile.setString ( "streaming_audiorate", g_settings.streaming_audiorate );
@@ -2255,20 +2257,22 @@
streamingSettings.addItem(GenericMenuSeparatorLine);
CIPInput * streamingSettings_server_ip = new CIPInput(LOCALE_STREAMINGMENU_SERVER_IP, g_settings.streaming_server_ip, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2);
- CStringInput * streamingSettings_server_port = new CStringInput(LOCALE_STREAMINGMENU_SERVER_PORT, g_settings.streaming_server_port, 6, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2,"0123456789 ");
+ CStringInput * streamingSettings_server_control_port = new CStringInput(LOCALE_STREAMINGMENU_SERVER_CONTROL_PORT, g_settings.streaming_server_control_port, 6, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2,"0123456789 ");
+ CStringInput * streamingSettings_server_stream_port = new CStringInput(LOCALE_STREAMINGMENU_SERVER_STREAM_PORT, g_settings.streaming_server_stream_port, 6, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2,"0123456789 ");
CStringInputSMS * cddriveInput = new CStringInputSMS(LOCALE_STREAMINGMENU_STREAMING_SERVER_CDDRIVE, g_settings.streaming_server_cddrive, 20, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789!""§$%&/()=?-:\\ ");
CStringInput * streamingSettings_videorate = new CStringInput(LOCALE_STREAMINGMENU_STREAMING_VIDEORATE, g_settings.streaming_videorate, 5, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2,"0123456789 ");
CStringInput * streamingSettings_audiorate = new CStringInput(LOCALE_STREAMINGMENU_STREAMING_AUDIORATE, g_settings.streaming_audiorate, 5, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2,"0123456789 ");
CStringInputSMS * startdirInput = new CStringInputSMS(LOCALE_STREAMINGMENU_STREAMING_SERVER_STARTDIR, g_settings.streaming_server_startdir, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE,"abcdefghijklmnopqrstuvwxyz0123456789!""§$%&/()=?-:\\ ");
CMenuForwarder* mf1 = new CMenuForwarder(LOCALE_STREAMINGMENU_SERVER_IP , (g_settings.streaming_type==1), g_settings.streaming_server_ip , streamingSettings_server_ip);
- CMenuForwarder* mf2 = new CMenuForwarder(LOCALE_STREAMINGMENU_SERVER_PORT , (g_settings.streaming_type==1), g_settings.streaming_server_port , streamingSettings_server_port);
- CMenuForwarder* mf3 = new CMenuForwarder(LOCALE_STREAMINGMENU_STREAMING_SERVER_CDDRIVE , (g_settings.streaming_type==1), g_settings.streaming_server_cddrive , cddriveInput);
- CMenuForwarder* mf4 = new CMenuForwarder(LOCALE_STREAMINGMENU_STREAMING_VIDEORATE , (g_settings.streaming_type==1), g_settings.streaming_videorate , streamingSettings_videorate);
- CMenuForwarder* mf5 = new CMenuForwarder(LOCALE_STREAMINGMENU_STREAMING_AUDIORATE , (g_settings.streaming_type==1), g_settings.streaming_audiorate , streamingSettings_audiorate);
- CMenuForwarder* mf6 = new CMenuForwarder(LOCALE_STREAMINGMENU_STREAMING_SERVER_STARTDIR, (g_settings.streaming_type==1), g_settings.streaming_server_startdir, startdirInput);
- CMenuForwarder* mf7 = new CMenuForwarder(LOCALE_MOVIEPLAYER_DEFDIR, true, g_settings.network_nfs_moviedir,this,"moviedir");
- CMenuForwarder* mf8 = new CMenuForwarder(LOCALE_MOVIEPLAYER_DEFPLUGIN, true, g_settings.movieplayer_plugin,this,"movieplugin");
+ CMenuForwarder* mf2 = new CMenuForwarder(LOCALE_STREAMINGMENU_SERVER_CONTROL_PORT , (g_settings.streaming_type==1), g_settings.streaming_server_control_port , streamingSettings_server_control_port);
+ CMenuForwarder* mf3 = new CMenuForwarder(LOCALE_STREAMINGMENU_SERVER_STREAM_PORT , (g_settings.streaming_type==1), g_settings.streaming_server_stream_port , streamingSettings_server_stream_port);
+ CMenuForwarder* mf4 = new CMenuForwarder(LOCALE_STREAMINGMENU_STREAMING_SERVER_CDDRIVE , (g_settings.streaming_type==1), g_settings.streaming_server_cddrive , cddriveInput);
+ CMenuForwarder* mf5 = new CMenuForwarder(LOCALE_STREAMINGMENU_STREAMING_VIDEORATE , (g_settings.streaming_type==1), g_settings.streaming_videorate , streamingSettings_videorate);
+ CMenuForwarder* mf6 = new CMenuForwarder(LOCALE_STREAMINGMENU_STREAMING_AUDIORATE , (g_settings.streaming_type==1), g_settings.streaming_audiorate , streamingSettings_audiorate);
+ CMenuForwarder* mf7 = new CMenuForwarder(LOCALE_STREAMINGMENU_STREAMING_SERVER_STARTDIR, (g_settings.streaming_type==1), g_settings.streaming_server_startdir, startdirInput);
+ CMenuForwarder* mf8 = new CMenuForwarder(LOCALE_MOVIEPLAYER_DEFDIR, true, g_settings.network_nfs_moviedir,this,"moviedir");
+ CMenuForwarder* mf9 = new CMenuForwarder(LOCALE_MOVIEPLAYER_DEFPLUGIN, true, g_settings.movieplayer_plugin,this,"movieplugin");
CMenuOptionChooser* oj1 = new CMenuOptionChooser(LOCALE_STREAMINGMENU_STREAMING_TRANSCODE_AUDIO , &g_settings.streaming_transcode_audio , MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true);
CMenuOptionChooser* oj2 = new CMenuOptionChooser(LOCALE_STREAMINGMENU_STREAMING_FORCE_AVI_RAWAUDIO , &g_settings.streaming_force_avi_rawaudio , MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true);
@@ -2285,21 +2289,22 @@
streamingSettings.addItem(new CMenuOptionChooser(LOCALE_STREAMINGMENU_STREAMING_TYPE , &g_settings.streaming_type , STREAMINGMENU_STREAMING_TYPE_OPTIONS, STREAMINGMENU_STREAMING_TYPE_OPTION_COUNT, true, StreamingNotifier));
streamingSettings.addItem(GenericMenuSeparatorLine);
streamingSettings.addItem( mf1); //Server IP
- streamingSettings.addItem( mf2); //Server Port
- streamingSettings.addItem( mf3); //CD-Drive
- streamingSettings.addItem( mf6); //Startdir
+ streamingSettings.addItem( mf2); //Server Control Port
+ streamingSettings.addItem( mf3); //Server Stream Port
+ streamingSettings.addItem( mf4); //CD-Drive
+ streamingSettings.addItem( mf7); //Startdir
streamingSettings.addItem(GenericMenuSeparatorLine);
- streamingSettings.addItem( mf4); //Video-Rate
+ streamingSettings.addItem( mf5); //Video-Rate
streamingSettings.addItem( oj3);
streamingSettings.addItem( oj4);
streamingSettings.addItem( oj5);
streamingSettings.addItem(GenericMenuSeparatorLine);
- streamingSettings.addItem( mf5); //Audiorate
+ streamingSettings.addItem( mf6); //Audiorate
streamingSettings.addItem( oj1);
streamingSettings.addItem( oj2);
streamingSettings.addItem(GenericMenuSeparatorLine);
- streamingSettings.addItem( mf7); //default dir
- streamingSettings.addItem( mf8); //default movieplugin
+ streamingSettings.addItem( mf8); //default dir
+ streamingSettings.addItem( mf9); //default movieplugin
}
diff -Nur tuxbox-cvs.orig/apps/tuxbox/neutrino/src/system/locals.h tuxbox-cvs/apps/tuxbox/neutrino/src/system/locals.h
--- tuxbox-cvs.orig/apps/tuxbox/neutrino/src/system/locals.h 2005-05-08 16:01:38.000000000 +0200
+++ tuxbox-cvs/apps/tuxbox/neutrino/src/system/locals.h 2005-05-08 22:14:30.472023946 +0200
@@ -810,8 +807,9 @@
LOCALE_STREAMINGMENU_MPEG2,
LOCALE_STREAMINGMENU_OFF,
LOCALE_STREAMINGMENU_ON,
+ LOCALE_STREAMINGMENU_SERVER_CONTROL_PORT,
LOCALE_STREAMINGMENU_SERVER_IP,
- LOCALE_STREAMINGMENU_SERVER_PORT,
+ LOCALE_STREAMINGMENU_SERVER_STREAM_PORT,
LOCALE_STREAMINGMENU_STREAMING_AUDIORATE,
LOCALE_STREAMINGMENU_STREAMING_FORCE_AVI_RAWAUDIO,
LOCALE_STREAMINGMENU_STREAMING_FORCE_TRANSCODE_VIDEO,
diff -Nur tuxbox-cvs.orig/apps/tuxbox/neutrino/src/system/locals_intern.h tuxbox-cvs/apps/tuxbox/neutrino/src/system/locals_intern.h
--- tuxbox-cvs.orig/apps/tuxbox/neutrino/src/system/locals_intern.h 2005-05-08 16:01:38.000000000 +0200
+++ tuxbox-cvs/apps/tuxbox/neutrino/src/system/locals_intern.h 2005-05-08 22:14:30.474023401 +0200
@@ -810,8 +807,9 @@
"streamingmenu.mpeg2",
"streamingmenu.off",
"streamingmenu.on",
+ "streamingmenu.server_control_port",
"streamingmenu.server_ip",
- "streamingmenu.server_port",
+ "streamingmenu.server_stream_port",
"streamingmenu.streaming_audiorate",
"streamingmenu.streaming_force_avi_rawaudio",
"streamingmenu.streaming_force_transcode_video",
diff -Nur tuxbox-cvs.orig/apps/tuxbox/neutrino/src/system/settings.h tuxbox-cvs/apps/tuxbox/neutrino/src/system/settings.h
--- tuxbox-cvs.orig/apps/tuxbox/neutrino/src/system/settings.h 2005-05-08 16:01:38.000000000 +0200
+++ tuxbox-cvs/apps/tuxbox/neutrino/src/system/settings.h 2005-05-08 22:14:30.474023401 +0200
@@ -175,7 +175,8 @@
//streaming
int streaming_type;
std::string streaming_server_ip;
- char streaming_server_port[10];
+ char streaming_server_control_port[10];
+ char streaming_server_stream_port[10];
char streaming_server_cddrive[21];
char streaming_videorate[6];
char streaming_audiorate[6];